From: Gary Guo <gary@garyguo.net>
To: "Miguel Ojeda" <ojeda@kernel.org>,
"Boqun Feng" <boqun@kernel.org>,
"Björn Roy Baron" <bjorn3_gh@protonmail.com>,
"Benno Lossin" <lossin@kernel.org>,
"Andreas Hindborg" <a.hindborg@kernel.org>,
"Alice Ryhl" <aliceryhl@google.com>,
"Trevor Gross" <tmgross@umich.edu>,
"Danilo Krummrich" <dakr@kernel.org>,
"Daniel Almeida" <daniel.almeida@collabora.com>,
"Tamir Duberstein" <tamird@kernel.org>,
"Alexandre Courbot" <acourbot@nvidia.com>,
"Onur Özkan" <work@onurozkan.dev>,
"Breno Leitao" <leitao@debian.org>,
"Luis Chamberlain" <mcgrof@kernel.org>,
"Russ Weight" <russ.weight@linux.dev>,
"Lyude Paul" <lyude@redhat.com>
Cc: linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org,
driver-core@lists.linux.dev, Gary Guo <gary@garyguo.net>
Subject: [PATCH 4/4] rust: io: convert to use `#[macro_export_scoped]`
Date: Tue, 11 Aug 2026 13:25:56 +0100 [thread overview]
Message-ID: <20260811-macro_export_scoped-v1-4-e7782b102819@garyguo.net> (raw)
In-Reply-To: <20260811-macro_export_scoped-v1-0-e7782b102819@garyguo.net>
Convert I/O macros that use `#[macro_export]` + `#[doc(hidden)]` trick to
use the `#[macro_export_scoped]` macro.
Signed-off-by: Gary Guo <gary@garyguo.net>
---
rust/kernel/io.rs | 27 ++++++++++-----------------
1 file changed, 10 insertions(+), 17 deletions(-)
diff --git a/rust/kernel/io.rs b/rust/kernel/io.rs
index 5ce9fd129068..891a27fe59b6 100644
--- a/rust/kernel/io.rs
+++ b/rust/kernel/io.rs
@@ -9,6 +9,8 @@
mem::MaybeUninit, //
};
+use macros::macro_export_scoped;
+
use crate::{
bindings,
prelude::*,
@@ -1673,8 +1675,7 @@ pub unsafe fn project_view<U: ?Sized + KnownSize>(
/// let nested: Mmio<'_, u32> = io_project!(whole, .field);
/// # Ok::<(), Error>(()) }
/// ```
-#[macro_export]
-#[doc(hidden)]
+#[macro_export_scoped]
macro_rules! io_project {
($io:expr, $($proj:tt)*) => {{
#[allow(unused)]
@@ -1688,8 +1689,6 @@ macro_rules! io_project {
unsafe { view.project_view(ptr) }
}};
}
-#[doc(inline)]
-pub use crate::io_project;
/// Read from I/O memory.
///
@@ -1707,15 +1706,12 @@ macro_rules! io_project {
/// let field: u32 = kernel::io::io_read!(mmio, [try: 2].field);
/// # Ok::<(), Error>(()) }
/// ```
-#[macro_export]
-#[doc(hidden)]
+#[macro_export_scoped]
macro_rules! io_read {
($io:expr, $($proj:tt)*) => {
- $crate::io::Io::read_val($crate::io_project!($io, $($proj)*))
+ $crate::io::Io::read_val($crate::io::io_project!($io, $($proj)*))
};
}
-#[doc(inline)]
-pub use crate::io_read;
/// Writes to I/O memory.
///
@@ -1734,21 +1730,18 @@ macro_rules! io_read {
/// kernel::io::io_write!(mmio, [try: 2].field, 10);
/// # Ok::<(), Error>(()) }
/// ```
-#[macro_export]
-#[doc(hidden)]
+#[macro_export_scoped]
macro_rules! io_write {
(@parse [$io:expr] [$($proj:tt)*] [, $val:expr]) => {
- $crate::io::Io::write_val($crate::io_project!($io, $($proj)*), $val)
+ $crate::io::Io::write_val($crate::io::io_project!($io, $($proj)*), $val)
};
(@parse [$io:expr] [$($proj:tt)*] [.$field:tt $($rest:tt)*]) => {
- $crate::io_write!(@parse [$io] [$($proj)* .$field] [$($rest)*])
+ $crate::io::io_write!(@parse [$io] [$($proj)* .$field] [$($rest)*])
};
(@parse [$io:expr] [$($proj:tt)*] [[$flavor:ident: $index:expr] $($rest:tt)*]) => {
- $crate::io_write!(@parse [$io] [$($proj)* [$flavor: $index]] [$($rest)*])
+ $crate::io::io_write!(@parse [$io] [$($proj)* [$flavor: $index]] [$($rest)*])
};
($io:expr, $($rest:tt)*) => {
- $crate::io_write!(@parse [$io] [] [$($rest)*])
+ $crate::io::io_write!(@parse [$io] [] [$($rest)*])
};
}
-#[doc(inline)]
-pub use crate::io_write;
--
2.54.0
prev parent reply other threads:[~2026-08-11 12:26 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-11 12:25 [PATCH 0/4] rust: add `#[macro_export_scoped]` for scoped declarative macro Gary Guo
2026-08-11 12:25 ` [PATCH 1/4] rust: macros: add `#[macro_export_scoped]` Gary Guo
2026-08-11 12:25 ` [PATCH 2/4] rust: build_assert: remove macro from crate root Gary Guo
2026-08-11 12:25 ` [PATCH 3/4] rust: list: convert to use `#[macro_export_scoped]` Gary Guo
2026-08-11 12:25 ` Gary Guo [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260811-macro_export_scoped-v1-4-e7782b102819@garyguo.net \
--to=gary@garyguo.net \
--cc=a.hindborg@kernel.org \
--cc=acourbot@nvidia.com \
--cc=aliceryhl@google.com \
--cc=bjorn3_gh@protonmail.com \
--cc=boqun@kernel.org \
--cc=dakr@kernel.org \
--cc=daniel.almeida@collabora.com \
--cc=driver-core@lists.linux.dev \
--cc=leitao@debian.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lossin@kernel.org \
--cc=lyude@redhat.com \
--cc=mcgrof@kernel.org \
--cc=ojeda@kernel.org \
--cc=russ.weight@linux.dev \
--cc=rust-for-linux@vger.kernel.org \
--cc=tamird@kernel.org \
--cc=tmgross@umich.edu \
--cc=work@onurozkan.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox