[legacy] Allow other attributes in #[pin_data] structs

Cargo.toml

@@ -32,6 +32,7 @@ trybuild = { version = "1.0", features = ["diff"] }
 macrotest = "1.0"
 # needed for macrotest, have to enable verbatim feature to be able to format `&raw` expressions.
 prettyplease = { version = "0.2", features = ["verbatim"] }
+test_dummy_only = { path = "./test_dummy_only" }
 
 [lints.rust]
 non_ascii_idents = "deny"

src/macros.rs

@@ -779,8 +779,9 @@ macro_rules! __pin_data {
         @ty_generics($($ty_generics:tt)*),
         @decl_generics($($decl_generics:tt)*),
         @where($($whr:tt)*),
-        // Some other attribute, just put it into `$accum`.
-        @fields_munch(#[$($attr:tt)*] $($rest:tt)*),
+        // The #[cfg] attribute needs to be kept for our fields to make sense,
+        // so put it into `$accum`.
+        @fields_munch(#[cfg $($attr:tt)*] $($rest:tt)*),
         @pinned($($pinned:tt)*),
         @not_pinned($($not_pinned:tt)*),
         @fields($($fields:tt)*),
@@ -800,7 +801,42 @@ macro_rules! __pin_data {
             @pinned($($pinned)*),
             @not_pinned($($not_pinned)*),
             @fields($($fields)*),
-            @accum($($accum)* #[$($attr)*]),
+            @accum($($accum)* #[cfg $($attr)*]),
+            @is_pinned($($is_pinned)?),
+            @pinned_drop($($pinned_drop)?),
+        );
+    };
+    (find_pinned_fields:
+        @struct_attrs($($struct_attrs:tt)*),
+        @vis($vis:vis),
+        @name($name:ident),
+        @impl_generics($($impl_generics:tt)*),
+        @ty_generics($($ty_generics:tt)*),
+        @decl_generics($($decl_generics:tt)*),
+        @where($($whr:tt)*),
+        // Some other attribute, we only need to keep it for the original
+        // struct, just put it into `$fields`.
+        @fields_munch(#[$($attr:tt)*] $($rest:tt)*),
+        @pinned($($pinned:tt)*),
+        @not_pinned($($not_pinned:tt)*),
+        @fields($($fields:tt)*),
+        @accum($($accum:tt)*),
+        @is_pinned($($is_pinned:ident)?),
+        @pinned_drop($($pinned_drop:ident)?),
+    ) => {
+        $crate::__pin_data!(find_pinned_fields:
+            @struct_attrs($($struct_attrs)*),
+            @vis($vis),
+            @name($name),
+            @impl_generics($($impl_generics)*),
+            @ty_generics($($ty_generics)*),
+            @decl_generics($($decl_generics)*),
+            @where($($whr)*),
+            @fields_munch($($rest)*),
+            @pinned($($pinned)*),
+            @not_pinned($($not_pinned)*),
+            @fields($($fields)* #[$($attr)*]),
+            @accum($($accum)*),
             @is_pinned($($is_pinned)?),
             @pinned_drop($($pinned_drop)?),
         );

test_dummy_only/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "test_dummy_only"
+version = "0.0.1"
+edition = "2021"
+
+authors = ["y86-dev"]
+license = "MIT OR Apache-2.0"
+description = "Proc macro only for test reproduction."
+
+publish = false
+
+[lib]
+proc-macro = true

test_dummy_only/src/lib.rs

@@ -0,0 +1,4 @@
+#[proc_macro_derive(Dummy, attributes(dummy_attr))]
+pub fn derive_device(_: proc_macro::TokenStream) -> proc_macro::TokenStream {
+    proc_macro::TokenStream::new()
+}

tests/extra_attrs.rs

@@ -0,0 +1,23 @@
+#![cfg_attr(not(RUSTC_LINT_REASONS_IS_STABLE), feature(lint_reasons))]
+
+use pinned_init::*;
+use test_dummy_only::Dummy;
+
+#[pin_data]
+#[derive(Dummy)]
+struct Pointless {
+    #[pin]
+    #[dummy_attr]
+    #[cfg(test)]
+    member: i8,
+    #[pin]
+    #[dummy_attr]
+    #[cfg(not(test))]
+    member: u8,
+}
+
+#[test]
+fn multiple_attributes() {
+    stack_pin_init!(let p = init!(Pointless { member: 0 }));
+    println!("{}", p.member);
+}