Skip to content

Commit 9ae2a60

Browse files
authored
fix: handle raw identifier in field (#3621)
1 parent 2b7ab44 commit 9ae2a60

File tree

3 files changed

+24
-1
lines changed

3 files changed

+24
-1
lines changed

CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,9 @@
103103

104104
### Fixed
105105

106+
* Fixed `wasm_bindgen` macro to handle raw identifiers in field names.
107+
[#3621](https://github.com/rustwasm/wasm-bindgen/pull/3621)
108+
106109
* Fixed bindings and comments for `Atomics.wait`.
107110
[#3509](https://github.com/rustwasm/wasm-bindgen/pull/3509)
108111

crates/macro-support/src/parser.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ use backend::util::{ident_ty, ShortHash};
88
use backend::Diagnostic;
99
use proc_macro2::{Ident, Span, TokenStream, TokenTree};
1010
use quote::ToTokens;
11+
use syn::ext::IdentExt;
1112
use syn::parse::{Parse, ParseStream, Result as SynResult};
1213
use syn::spanned::Spanned;
1314
use syn::{ItemFn, Lit, MacroDelimiter, ReturnType};
@@ -420,7 +421,7 @@ impl<'a> ConvertToAst<(&ast::Program, BindgenAttrs)> for &'a mut syn::ItemStruct
420421
_ => continue,
421422
}
422423
let (js_field_name, member) = match &field.ident {
423-
Some(ident) => (ident.to_string(), syn::Member::Named(ident.clone())),
424+
Some(ident) => (ident.unraw().to_string(), syn::Member::Named(ident.clone())),
424425
None => (i.to_string(), syn::Member::Unnamed(i.into())),
425426
};
426427

tests/wasm/getters_and_setters.rs

+19
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ extern "C" {
2020
fn _12_js(rules: Rules) -> Rules;
2121
fn _13_js(rules: Rules) -> Rules;
2222

23+
fn raw_identifer(rules: RulesWithRawField) -> RulesWithRawField;
24+
2325
fn test_getter_compute(x: GetterCompute);
2426
fn test_setter_compute(x: SetterCompute);
2527
fn test_statics(x: Statics);
@@ -32,6 +34,23 @@ pub struct Rules {
3234
pub field: i32,
3335
}
3436

37+
#[wasm_bindgen]
38+
pub struct RulesWithRawField {
39+
pub r#mod: i32,
40+
}
41+
42+
#[wasm_bindgen]
43+
impl RulesWithRawField {
44+
#[wasm_bindgen]
45+
pub fn get_field_value(&self) -> i32 {
46+
self.r#mod
47+
}
48+
#[wasm_bindgen]
49+
pub fn set_field_value(&mut self, value: i32) {
50+
self.r#mod = value;
51+
}
52+
}
53+
3554
#[wasm_bindgen]
3655
#[allow(non_snake_case)]
3756
impl Rules {

0 commit comments

Comments
 (0)