Skip to content

macros: Allow s! and s_no_extra_traits! to take private items #4783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 27, 2025
Merged

macros: Allow s! and s_no_extra_traits! to take private items #4783

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
60 changes: 49 additions & 11 deletions src/macros.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,16 +142,16 @@ macro_rules! prelude {
macro_rules! s {
($(
$(#[$attr:meta])*
pub $t:ident $i:ident { $($field:tt)* }
$pub:vis $t:ident $i:ident { $($field:tt)* }
)*) => ($(
s!(it: $(#[$attr])* pub $t $i { $($field)* });
s!(it: $(#[$attr])* $pub $t $i { $($field)* });
)*);

(it: $(#[$attr:meta])* pub union $i:ident { $($field:tt)* }) => (
(it: $(#[$attr:meta])* $pub:vis union $i:ident { $($field:tt)* }) => (
compile_error!("unions cannot derive extra traits, use s_no_extra_traits instead");
);

(it: $(#[$attr:meta])* pub struct $i:ident { $($field:tt)* }) => (
(it: $(#[$attr:meta])* $pub:vis struct $i:ident { $($field:tt)* }) => (
__item! {
#[repr(C)]
#[cfg_attr(
Expand All @@ -165,7 +165,7 @@ macro_rules! s {
)]
#[allow(deprecated)]
$(#[$attr])*
pub struct $i { $($field)* }
$pub struct $i { $($field)* }
}
);
}
Expand Down Expand Up @@ -202,17 +202,17 @@ macro_rules! s_paren {
macro_rules! s_no_extra_traits {
($(
$(#[$attr:meta])*
pub $t:ident $i:ident { $($field:tt)* }
$pub:vis $t:ident $i:ident { $($field:tt)* }
)*) => ($(
s_no_extra_traits!(it: $(#[$attr])* pub $t $i { $($field)* });
s_no_extra_traits!(it: $(#[$attr])* $pub $t $i { $($field)* });
)*);

(it: $(#[$attr:meta])* pub union $i:ident { $($field:tt)* }) => (
(it: $(#[$attr:meta])* $pub:vis union $i:ident { $($field:tt)* }) => (
__item! {
#[repr(C)]
#[::core::prelude::v1::derive(::core::clone::Clone, ::core::marker::Copy)]
$(#[$attr])*
pub union $i { $($field)* }
$pub union $i { $($field)* }
}

impl ::core::fmt::Debug for $i {
Expand All @@ -222,7 +222,7 @@ macro_rules! s_no_extra_traits {
}
);

(it: $(#[$attr:meta])* pub struct $i:ident { $($field:tt)* }) => (
(it: $(#[$attr:meta])* $pub:vis struct $i:ident { $($field:tt)* }) => (
__item! {
#[repr(C)]
#[::core::prelude::v1::derive(
Expand All @@ -231,7 +231,7 @@ macro_rules! s_no_extra_traits {
::core::fmt::Debug,
)]
$(#[$attr])*
pub struct $i { $($field)* }
$pub struct $i { $($field)* }
}
);
}
Expand Down Expand Up @@ -491,3 +491,41 @@ mod tests {
TypeId::of::<T>()
}
}

#[cfg(test)]
#[allow(unused)]
mod macro_checks {
s! {
pub struct S1 {
pub a: u32,
b: u32,
}

struct S1Priv {
pub a: u32,
b: u32,
}
}

s_no_extra_traits! {
pub struct S2 {
pub a: u32,
b: u32,
}

struct S2Priv {
pub a: u32,
b: u32,
}

pub union U2 {
pub a: u32,
b: f32,
}

union U2Priv {
pub a: u32,
b: f32,
}
}
}
Loading