[PATCH 3/4] rust: list: convert to use `#[macro_export_scoped]`
Gary Guo <[email protected]>
| Newsgroups | org.kernel.vger.rust-for-linux,dev.linux.lists.driver-core,org.kernel.vger.linux-kernel |
|---|---|
| Message-ID | <[email protected]> |
Convert list macros that use `#[macro_export]` + `#[doc(hidden)]` trick to use the `#[macro_export_scoped]` macro. Signed-off-by: Gary Guo <[email protected]> --- rust/kernel/list/arc.rs | 4 +--- rust/kernel/list/arc_field.rs | 4 +--- rust/kernel/list/impl_list_item_mod.rs | 14 +++++--------- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/rust/kernel/list/arc.rs b/rust/kernel/list/arc.rs index 209b1173c826..9bb6d2e8104d 100644 --- a/rust/kernel/list/arc.rs +++ b/rust/kernel/list/arc.rs @@ -81,8 +81,7 @@ pub unsafe trait TryNewListArc<const ID: u64 = 0>: ListArcSafe<ID> { /// The `tracked_by` strategy is usually used by deferring to a field of type /// [`AtomicTracker`]. However, it is also possible to defer the tracking to another struct /// using also using this macro. -#[macro_export] -#[doc(hidden)] +#[macros::macro_export_scoped] macro_rules! impl_list_arc_safe { (impl$({$($generics:tt)*})? ListArcSafe<$num:tt> for $t:ty { untracked; } $($rest:tt)*) => { impl$(<$($generics)*>)? $crate::list::ListArcSafe<$num> for $t { @@ -127,7 +126,6 @@ fn try_new_list_arc(&self) -> bool { () => {}; } -pub use impl_list_arc_safe; /// A wrapper around [`Arc`] that's guaranteed unique for the given id. /// diff --git a/rust/kernel/list/arc_field.rs b/rust/kernel/list/arc_field.rs index 2ad8aea55993..b59e61e90fe1 100644 --- a/rust/kernel/list/arc_field.rs +++ b/rust/kernel/list/arc_field.rs @@ -65,8 +65,7 @@ pub unsafe fn assert_mut(&self) -> &mut T { } /// Defines getters for a [`ListArcField`]. -#[macro_export] -#[doc(hidden)] +#[macros::macro_export_scoped] macro_rules! define_list_arc_field_getter { ($pub:vis fn $name:ident(&self $(<$id:tt>)?) -> &$typ:ty { $field:ident } $($rest:tt)* @@ -94,4 +93,3 @@ macro_rules! define_list_arc_field_getter { () => {}; } -pub use define_list_arc_field_getter; diff --git a/rust/kernel/list/impl_list_item_mod.rs b/rust/kernel/list/impl_list_item_mod.rs index 5a3eac9f3cf0..e3ec79089696 100644 --- a/rust/kernel/list/impl_list_item_mod.rs +++ b/rust/kernel/list/impl_list_item_mod.rs @@ -4,6 +4,8 @@ //! Helpers for implementing list traits safely. +use macros::macro_export_scoped; + /// Declares that this type has a [`ListLinks<ID>`] field. /// /// This trait is only used to help implement [`ListItem`] safely. If [`ListItem`] is implemented @@ -28,8 +30,7 @@ pub unsafe trait HasListLinks<const ID: u64 = 0> { } /// Implements the [`HasListLinks`] trait for the given type. -#[macro_export] -#[doc(hidden)] +#[macro_export_scoped] macro_rules! impl_has_list_links { ($(impl$({$($generics:tt)*})? HasListLinks$(<$id:tt>)? @@ -55,7 +56,6 @@ unsafe fn raw_get_list_links(ptr: *mut Self) -> *mut $crate::list::ListLinks$(<$ } )*}; } -pub use impl_has_list_links; /// Declares that the [`ListLinks<ID>`] field in this struct is inside a /// [`ListLinksSelfPtr<T, ID>`]. @@ -74,8 +74,7 @@ pub unsafe trait HasSelfPtr<T: ?Sized, const ID: u64 = 0> } /// Implements the [`HasListLinks`] and [`HasSelfPtr`] traits for the given type. -#[macro_export] -#[doc(hidden)] +#[macro_export_scoped] macro_rules! impl_has_list_links_self_ptr { ($(impl$({$($generics:tt)*})? HasSelfPtr<$item_type:ty $(, $id:tt)?> @@ -98,7 +97,6 @@ unsafe fn raw_get_list_links(ptr: *mut Self) -> *mut $crate::list::ListLinks$(<$ } )*}; } -pub use impl_has_list_links_self_ptr; /// Implements the [`ListItem`] trait for the given type. /// @@ -182,8 +180,7 @@ unsafe fn raw_get_list_links(ptr: *mut Self) -> *mut $crate::list::ListLinks$(<$ /// } /// } /// ``` -#[macro_export] -#[doc(hidden)] +#[macro_export_scoped] macro_rules! impl_list_item { ( $(impl$({$($generics:tt)*})? ListItem<$num:tt> for $self:ty { @@ -358,4 +355,3 @@ unsafe fn post_remove(me: *mut $crate::list::ListLinks<$num>) -> *const Self { } )*}; } -pub use impl_list_item; -- 2.54.0