Add support for cfg_attr for struct fields #4351
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fl0rek
force-pushed
the
feat/cfg_attr-structs-rel
branch
from
0fd7da9 to
b172100
Compare
fl0rek
force-pushed
the
feat/cfg_attr-structs-rel
branch
from
b172100 to
71a9eca
Compare
fl0rek
force-pushed
the
feat/cfg_attr-structs-rel
branch
from
d84f3d8 to
e1034d4
Compare
daxpedda
requested changes
Dec 15, 2024
Comment on lines
+31
to
+58
| s.attrs.insert( | ||
| 0, | ||
| syn::Attribute { | ||
| pound_token: Default::default(), | ||
| style: syn::AttrStyle::Outer, | ||
| bracket_token: Default::default(), | ||
| meta: syn::parse_quote! { | ||
| derive(wasm_bindgen::prelude::BindgenedStruct) | ||
| }, | ||
| }, | ||
| ); | ||
| if !attr.is_empty() { | ||
| s.attrs.insert( | ||
| 1, | ||
| syn::Attribute { | ||
| pound_token: Default::default(), | ||
| style: syn::AttrStyle::Outer, | ||
| bracket_token: Default::default(), | ||
| meta: syn::parse_quote! { | ||
| wasm_bindgen(#attr) | ||
| }, | ||
| }, | ||
| ); | ||
| } | ||
|
|
||
| let mut tokens = proc_macro2::TokenStream::new(); | ||
| s.to_tokens(&mut tokens); | ||
| return Ok(tokens); |
There was a problem hiding this comment.
Lets just quote here instead.
| if !self.generics.params.is_empty() { | ||
| bail_span!( | ||
| self.generics, | ||
| "structs with #[wasm_bindgen] cannot have lifetime or \ | ||
| type parameters currently" | ||
| ); | ||
| } | ||
| let struct_attrs = BindgenAttrs::find(&mut self.attrs)?; |
There was a problem hiding this comment.
Suggested change
| let struct_attrs = BindgenAttrs::find(&mut self.attrs)?; | |
| let attrs = BindgenAttrs::find(&mut self.attrs)?; |
Lets just keep it as attrs, or was there a reason for the rename?
| @@ -480,6 +480,19 @@ fn renamed_field() { | |||
| js_renamed_field(); | |||
| } | |||
|
|
|||
| #[cfg_attr( | |||
| target_arch = "wasm32", | |||
| wasm_bindgen(inspectable, js_name = "ConditionalSkipClass") | |||
There was a problem hiding this comment.
Suggested change
| wasm_bindgen(inspectable, js_name = "ConditionalSkipClass") | |
| wasm_bindgen(js_name = "ConditionalSkipClass") |
Or is there some reason this is here?
| wasm_bindgen(inspectable, js_name = "ConditionalSkipClass") | ||
| )] | ||
| pub struct ConditionalSkip { | ||
| #[cfg_attr(target_arch = "wasm32", wasm_bindgen(skip))] |
There was a problem hiding this comment.
We should check on the JS side if this is properly applied.
Comment on lines
+491
to
+493
| /// cfg_attr annotated field | ||
| #[cfg_attr(target_arch = "wasm32", wasm_bindgen(getter_with_clone))] | ||
| pub needs_clone: String, |
There was a problem hiding this comment.
We might want to say in the comment instead that this wouldn't compile otherwise, to explain how we are testing this.
| @@ -101,6 +101,7 @@ pub mod prelude { | |||
| pub use crate::JsCast; | |||
| pub use crate::JsValue; | |||
| pub use crate::UnwrapThrowExt; | |||
| pub use wasm_bindgen_macro::BindgenedStruct; | |||
There was a problem hiding this comment.
Lets put it in __rt instead. It shouldn't be visible after all.
| style: syn::AttrStyle::Outer, | ||
| bracket_token: Default::default(), | ||
| meta: syn::parse_quote! { | ||
| derive(wasm_bindgen::prelude::BindgenedStruct) |
There was a problem hiding this comment.
We have to parse the attributes to extract the #[wasm_bindgen(wasm_bindgen = <path>)] attribute and use it here.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
closes #2703
Overview