Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
dummy = { path = "tests/dummy" }

[lints.rust]
non_ascii_idents = "deny"
Expand Down
41 changes: 38 additions & 3 deletions src/macros.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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] attributes are kept for those members that are not
// removed, so we need to keep them.
@fields_munch(#[cfg $($attr:tt)*] $($rest:tt)*),
@pinned($($pinned:tt)*),
@not_pinned($($not_pinned:tt)*),
@fields($($fields:tt)*),
Expand All @@ -800,7 +801,41 @@ 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, 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)?),
);
Expand Down
7 changes: 7 additions & 0 deletions tests/dummy/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions tests/dummy/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[package]
name = "dummy"
version = "0.0.0"
edition = "2024"

license = "MIT OR Apache-2.0"
description = "Proc macro only for test reproduction."

publish = false

[lib]
proc-macro = true
4 changes: 4 additions & 0 deletions tests/dummy/src/lib.rs
Original file line number Diff line number Diff line change
@@ -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()
}
23 changes: 23 additions & 0 deletions tests/extra_attrs.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#![cfg_attr(not(RUSTC_LINT_REASONS_IS_STABLE), feature(lint_reasons))]

use dummy::Dummy;
use pinned_init::*;

#[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);
}
Loading