From nobody Tue Sep 29 06:59:45 2026 Received: from LO0P265CU003.outbound.protection.outlook.com (mail-uksouthazon11022105.outbound.protection.outlook.com [52.101.96.105]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DFA9A442FB6; Tue, 11 Aug 2026 12:26:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.96.105 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786451168; cv=fail; b=A7fEGpDp2a9g3bGeQXQ7yEIW6WthPArZPy26ynQtHKiP366HUdb4DnL+cwXugETKWhWMHRCqN2g1hc790scRv77F0nRpAubp8Ju5GZub7Fkgc73IpN4Nv61Th7Q1AP11kW9Xp5eWpxDDmQrtKkH3xfDatjD2ZgeXSRpwL3YuAUQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786451168; c=relaxed/simple; bh=v2UMKMHfSJEXuVgNPjWQ3u38FxUfCwt+vLZTqmbuOTE=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=rDbLIDlQMPqky92LvSude/ArUC04z5jo+6/aq4XKGn56pZhT+EY3n9huGJjGf2RVKhgpQcP1vOMkrlp6yw77CmMX5lD66A9kGg5ORkZrje9M4xMLegpwOhVM1Axj35W2NRkaADgVMj43/i8O8WF5HglXABykxXQ8hqsaWkkTUcs= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=garyguo.net; spf=pass smtp.mailfrom=garyguo.net; dkim=pass (1024-bit key) header.d=garyguo.net header.i=@garyguo.net header.b=O8FvfuTd; arc=fail smtp.client-ip=52.101.96.105 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=garyguo.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=garyguo.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=garyguo.net header.i=@garyguo.net header.b="O8FvfuTd" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=SIYY6d+LCUghQ4f/gVjQK++HA1g7Gsw3m2hXbADJKf5a+/hG9+B9+bTv6GEsCNJh9MQ4YrufN8Xy0FWElSKE2e9mivaWwMKvtY8UNUD4liF1CzbS+S2NXJU+16Cz8Z8sDYKU1pXirMMDpg1KyHHnSyprKH/qebhu/5bF+CbitK06G9zSuzq0ewe0qsI6PbR8zjBCoKbQPxyciEkYTByOU07pQGlqlOruvmlwPoOmJstcbZOvvYbRuxFGtbTBXhpc/XENDA1uunNzOlRgqkgpSumJkmqWmFUP5agrTy8kvEcHjSpLtoCF2OgPllW7awAw9UPZXeVGey0ysZCiusyCbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=sgvLZ6xDFD1RJ3xRe9d0EaAnwnNocm7mK4OHTnRC8/0=; b=fcJwP7Kb+n7V3Th2A6OXvMMfk6IAFULQRwg4aFRVKK30r2yAvNFQNfSE5f6IYWz66XsRO9jVCF9Pk19OS72cG1ZHnZQbxy9H5sWZF0Ng5tfkIWdZjR6YGx0kuUfmDRlG7OZdshQSbss7eLqOydwazrB4aeY7rosVU0lGScgMv6yV8WTQbu1d2topzQ6fqE1nahhe1iD5KhYtpV6pYC9HbEXiQ1tlphMwbO645X0EMokSppy1U+KCb/n2ihIchm+XnkuobTr3vl67ZZH7O3hz9dtVPFN91h60hmDTgxF4zTi+/zLzL149qIrKg1TrOMNn5aowgS8PEn08teMKRZVzcw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=garyguo.net; dmarc=pass action=none header.from=garyguo.net; dkim=pass header.d=garyguo.net; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=garyguo.net; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sgvLZ6xDFD1RJ3xRe9d0EaAnwnNocm7mK4OHTnRC8/0=; b=O8FvfuTdVekqOXDYs/5+UVcbHvtLnJoZobc2b4r2AtD80dbKKvJZOivIQsPftgz/Ae8V8bw3rlaWiRD9wcmbD5bqREmmpiT5sP1lFcNSrk1aYxHjk7p+pkwfaJTWvXYeaiYEwufDWYxjod49UiTdfUWitWHzTkdfw3BWx3o6QYw= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=garyguo.net; Received: from LOAP265MB8560.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:4ab::19) by LO0P265MB5094.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:282::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.315.11; Tue, 11 Aug 2026 12:26:00 +0000 Received: from LOAP265MB8560.GBRP265.PROD.OUTLOOK.COM ([fe80::f60b:1537:68d7:4fc1]) by LOAP265MB8560.GBRP265.PROD.OUTLOOK.COM ([fe80::f60b:1537:68d7:4fc1%4]) with mapi id 15.21.0292.024; Tue, 11 Aug 2026 12:26:00 +0000 From: Gary Guo Date: Tue, 11 Aug 2026 13:25:53 +0100 Subject: [PATCH 1/4] rust: macros: add `#[macro_export_scoped]` Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260811-macro_export_scoped-v1-1-e7782b102819@garyguo.net> References: <20260811-macro_export_scoped-v1-0-e7782b102819@garyguo.net> In-Reply-To: <20260811-macro_export_scoped-v1-0-e7782b102819@garyguo.net> To: Miguel Ojeda , Boqun Feng , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Daniel Almeida , Tamir Duberstein , Alexandre Courbot , =?utf-8?q?Onur_=C3=96zkan?= , Breno Leitao , Luis Chamberlain , Russ Weight , Lyude Paul Cc: linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, driver-core@lists.linux.dev, Gary Guo X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1786451159; l=3645; i=gary@garyguo.net; s=20221204; h=from:subject:message-id; bh=v2UMKMHfSJEXuVgNPjWQ3u38FxUfCwt+vLZTqmbuOTE=; b=pPvL+PBkatQMQk9gvOG0RLuZBfSjRz5vS0dPo0QpYaJNx5b1CXLkERGCngLnWVeXyV9bFP69O Wm7r5w5wX0GAYw6w1vL5bV829J4ahM86KEzRERQtPTeCY9Gs6/XJQQ0 X-Developer-Key: i=gary@garyguo.net; a=ed25519; pk=vB3uIX95SM4eVrIqo1DWNWKDKD2xzB+yLLLr0yOPYMo= X-ClientProxiedBy: LO6P123CA0059.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:310::17) To LOAP265MB8560.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:4ab::19) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: LOAP265MB8560:EE_|LO0P265MB5094:EE_ X-MS-Office365-Filtering-Correlation-Id: 728d64c3-bf98-43c6-3241-08def7a3b3ff X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|7416014|366016|10070799003|376014|23010399003|18002099003|22082099003|56012099006|5023799004|10067099003|921020; X-Microsoft-Antispam-Message-Info: nJ0uaG2WHIrxtfFyGKm4CrGBSZ8GPRjZP5EGBOEE3FYE1i2+IVgqxoiaZS27ZuRrifCyge2T2vi3Ye7spfBSEDeeeE4w1SRbhDVmwf8Z2DvmCH884Ep0whExArDP02NC0JL1XBYsNY1wYd6wgDwSUXXtc8XeZA+t7hPoSDIuaCacavni0P5mpg9slsc/hKGso0/VfVgXcfpIVJBGlIw2w7TazwZALJGjz39JS22rvurmKfbMRvhB5Qemw2GFIuRO31KVfyaAITcFxVY1PydudAQgYtZ+8hfcx9z/HieRuO0shLdlP6mE3IC1AdozXXOekueev+IbTHHQGKlau2CsjtuZtAipieZagmfSTHuf2jBEzVLqU3wb6EHtKHwxo3TyiP/8dnPOcZnsNdg8CJQ0/bgnhlh5n21HGEMPJUDnHPRw0QATTRDsCtNuWnsyusBJkyyXcU2rZFd/APN5Lsm+kJrS3bmIVANeisyNdaIVXofuqLjFS+0J8K1oREclyayEyhDh0StLoOMxZuznoaVulIyCdJuOrUcEVFxLHrxCYZa001zW+wv4ym/e/4d5mbUL5yyw/THiDh7jiTHLauXz6bDVYSZKlB1ZSgnEWLYp5WhxJNBTZ6Unh63MO2E/nBp7EQYMmMVYqxc24yJtg2yRVy+nxZQWVSu0iyMASMgMVMfKbVLMwiN1ULHX/XMZX1qTyTUGVa/v+UbvTARk6Rm/9g== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:LOAP265MB8560.GBRP265.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(7416014)(366016)(10070799003)(376014)(23010399003)(18002099003)(22082099003)(56012099006)(5023799004)(10067099003)(921020);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?d0s3SURaK2RwN0JVZ1NZVEpybzZzdUg5MlltRlUwcFZrc1BqNWVvNUIvTWVk?= =?utf-8?B?MldnNTlycWpFTHZxT2NPaUpYSXRGRFNlaGllZloxR2xTVkRCMWNmaG9jQk9m?= =?utf-8?B?bkdaQ2RHTWJFTE1zTUphTHd6cmZNcnoxeG0vVVZBTWtEUlRlbkNwRnBJcmND?= =?utf-8?B?VTluengvbjdoKy9XRGJlU2VCbFlMY3hmcmdLZGh0RHRrYjlwcHFjSEtJc0RY?= =?utf-8?B?d21XRDVIQi9vaGNQajNWejdZWUgvL0dhWlNjS3prU2wvOUdJcURXZGVVb3dC?= =?utf-8?B?c1ovZjJZT1Y0ekpiU21ycDhYMlFFN2RVZkM4Qlh5UmZyRGZkbVI0VnJDanB5?= =?utf-8?B?ZEhhQnlIbFpRMVFrWGFvQnBINkt6VjZSUXVuMlYzVFpjeEFkOUdFZjhsLzla?= =?utf-8?B?TkxNKzdBaWhhVnRnUnBJWjQzNkhNc29oTEdlNmJsMDVDUkpIYllDYkJjd0Ra?= =?utf-8?B?alNzUzBKN2V0S0g5ZkJWMXI0Uzc3ZDJ3bXZqL3pGalVaeFZOSHRmTHl0RDky?= =?utf-8?B?RFhtUTRnUVhndWVNbW1PRFN2VE9HTW9WK3J1bUFUVjVTTHNwVXZQa0xZV3Vu?= =?utf-8?B?Rm5pZnEzbThtVUpMcDV3RktybXRzYk9ZSUkxR3Q0S2ZOTy9TN1VaMVRwbk9z?= =?utf-8?B?RDVTNEhDbVo4dXEzNDZ3SnVsdmI0WmpCYyt6Z1RXbFk2dnVoZEZVaG5HWHhN?= =?utf-8?B?V1hRNmlqQ0R4Qm41c0N2VE9lalpTalZZQlY0TFFMajhSOEZ1Q1ZqMldzS25s?= =?utf-8?B?cXgrSHVuZzd6NW4wdElNNlRUZHlIQjEyZ2pMTlRsWFVtbGViTUdLZldrYXFw?= =?utf-8?B?MElSb0UvZXE1ekU4dFdTbEhOU0RLcG5uOHBhdzBQdDZOVW5MWjlyU1RCV2tn?= =?utf-8?B?OVFyV1BuaUJYYmNlUkxDVTdsSjBlNDZWdldTcG51c3JFcGhLSjhrazlTbnVO?= =?utf-8?B?NXY2OW1TWi9oLzd2OE9tRlJDbDBnK2c4eURhT2o3aGRXbGZhaktIeDB5NlB0?= =?utf-8?B?QmxjNjRrTTVrMjA3SkxOeXo3N01UbWZSNVQ3aEt2M09YNytNUU9HMGt6cDF0?= =?utf-8?B?RThqRWQzSU1SUEJaQmlXTTZuZzFnYUhiNDEySDN6elo1LzlQRFlGdXVMSGxq?= =?utf-8?B?SGtlOS9uSEFYbENRemN0U0dSK3k0YjBxazlLZ2ZsZlpSbldPK1VVTHc5NFZK?= =?utf-8?B?NFFMaDZVQjZEb00rWlM0dVBjWFpQdHNDNWErc3J3K09JTng2WGFucEtDQ2Yw?= =?utf-8?B?UDFsSW9oU2V1Tk1pMTQ0RGozWlNIRUszek45VWhwMnhuZ0lWTHVHOVp0dDlL?= =?utf-8?B?TXp1WHZGRDZ6blRja09wQVNTM2ozME5RQXJCa2NudEV6WUdqYWg0SlN4KzJP?= =?utf-8?B?RjJVNFJnZ2h5dnNGSmNDanE4M2NWZlpYRlRtNXdEVUw3aUM2d04rTWk4R3dG?= =?utf-8?B?V0QwSC9CVnhZaHFhOW1zNXVpVys0SGxWWW1pOWhCMXJyUWlLaVVyZWVuVklh?= =?utf-8?B?amlCdGVSY09udTRUcTlzM2I2bktzcVhUQVF6VkhCUTZjdFZJS1ZwNEh3ZWlG?= =?utf-8?B?eGVXazVZRis5TVlUZGhzcUZjZzhTVlR5b04wUFlEbVkzZ1pJYlhjV0JvdldK?= =?utf-8?B?UHVzU1VsZmNUK3AwWmx4QTllSlJLVGlGNWtLK1NJZ3ZqYjVZMlJNTHRleHhZ?= =?utf-8?B?WGxLakdkS1UybzVpbGNhaW9qZitnVzhxdDNPdzY5RE5IaHd1QVZ0YWhES29M?= =?utf-8?B?VVVnYUVnY1lkMWhsNlB6NFZ2ZVk0dmtEZHhvM05iTWhKZ1l4QkhlVmtKMlpy?= =?utf-8?B?REFBYjNoaEpHYVFqSFE0SVoraERLU2NSQkM0c0p4RVlrMVp5Vjk2R01hVUVQ?= =?utf-8?B?dGZxTEV2dXZtazFMbkdHRXlSYVA0YjFidGpKREJhWDBuNjk0ajAxdXZSRkc4?= =?utf-8?B?L08xZ0wxNmc0VFBmUUkyZ2lSdzdrNlh5RXlHdGZLU2svQUpsb1J4NytEcXpR?= =?utf-8?B?MkNXVkJiL1U0N0VzNVAzOTE0ODhDODkwRWVOTzhjUi9iMXdTR1NzTkZmcFpR?= =?utf-8?B?ajUrbysvbTFFNjZMOUYrS01BdUt0bW1qR2tnbjl5bTd1SDl2OGNTeEZtZ3RI?= =?utf-8?B?L0ZxUi9XMVF2NVc1MGF6aTdWQmR1S0RsM1dOeGo4SFpWcWhJQVZXTVlNSFh3?= =?utf-8?B?YXlCcGxqSHptMHJ4MmJrMUErWkpiTlpYVnRmMHhQdkZ6T2dvcEZ3c2RQMTh1?= =?utf-8?B?VURNRjFRRTNuNTJiY3hoK0ZwQllkaTQrajl4aEZzbGs0bjA2eHFFWm5MWHlS?= =?utf-8?B?T3FHMWpoeHFYYVdQVjdXSGZTTllDdm9idWFaZHNicmw1bzgrRGdzQT09?= X-OriginatorOrg: garyguo.net X-MS-Exchange-CrossTenant-Network-Message-Id: 728d64c3-bf98-43c6-3241-08def7a3b3ff X-MS-Exchange-CrossTenant-AuthSource: LOAP265MB8560.GBRP265.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2026 12:26:00.6912 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bbc898ad-b10f-4e10-8552-d9377b823d45 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 2sneAazSp/Ir+kksJYNjDdi82fk/rOQd4ykQ5rMl4Ub++YATan0iZ2amopcQh38jYjlkFaIF3bQW/pB9Nq5EcA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: LO0P265MB5094 Due to Rust macro scoping rules, macros that are exported with `#[macro_export_scoped]` gets added to the crate root, and this causes the crate root to get crowded with various macros. We used a trick of `#[doc(hidden)]` + `#[doc(inline)] pub use` to make these macros to appear to be only defined in the documentation, but this does not actually prevent them from being referenced from crate root. Create a macro `#[macro_export_scoped]`, that automates these definition and re-export and also give these macro unique and non-guessable names. Signed-off-by: Gary Guo --- rust/macros/lib.rs | 25 ++++++++++++++++++ rust/macros/macro_export_scoped.rs | 53 ++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 78 insertions(+) diff --git a/rust/macros/lib.rs b/rust/macros/lib.rs index 0514fc7c0a55..6f8ef9043255 100644 --- a/rust/macros/lib.rs +++ b/rust/macros/lib.rs @@ -20,6 +20,7 @@ mod for_lt; mod helpers; mod kunit; +mod macro_export_scoped; mod module; mod paste; mod vtable; @@ -320,6 +321,30 @@ pub fn concat_idents(input: TokenStream) -> TokenStrea= m { concat_idents::concat_idents(parse_macro_input!(input)).into() } =20 +/// Export a macro publicly, but from the current module instead of crate = root. +/// +/// # Examples +/// +/// ``` +/// mod foo { +/// #[kernel::macros::macro_export_scoped] +/// macro_rules! my_macro { +/// () =3D> {} +/// } +/// } +/// +/// foo::my_macro!(); +/// ``` +#[doc(hidden)] +#[proc_macro_attribute] +#[allow(non_snake_case)] +pub fn macro_export_scoped(attr: TokenStream, input: TokenStream) -> Token= Stream { + parse_macro_input!(attr as syn::parse::Nothing); + macro_export_scoped::macro_export_scoped(parse_macro_input!(input)) + .unwrap_or_else(|e| e.into_compile_error()) + .into() +} + /// Paste identifiers together. /// /// Within the `paste!` macro, identifiers inside `[<` and `>]` are concat= enated together to form a diff --git a/rust/macros/macro_export_scoped.rs b/rust/macros/macro_export_= scoped.rs new file mode 100644 index 000000000000..a14ee51d2d93 --- /dev/null +++ b/rust/macros/macro_export_scoped.rs @@ -0,0 +1,53 @@ +// SPDX-License-Identifier: GPL-2.0 + +use std::hash::{ + DefaultHasher, + Hash, + Hasher, // +}; + +use proc_macro2::TokenStream; +use quote::{ + format_ident, + quote, // +}; +use syn::{ + Error, + ItemMacro, + Result, // +}; + +pub(crate) fn macro_export_scoped(mut input: ItemMacro) -> Result { + if !input.mac.path.is_ident("macro_rules") { + return Err(Error::new_spanned( + input, + "#[macro_export_scoped] can only be used on `macro_rules!`", + )); + } + + let Some(name) =3D input.ident else { + Err(Error::new_spanned( + input, + "`macro_rules!` definition missing an identifier", + ))? + }; + + // Hash together file name and macro name to create a hash that is lik= ely to be unique. Use + // `DefaultHasher::new` which is free from RNG so the build is still r= eproducible. + let mut hasher =3D DefaultHasher::new(); + crate::helpers::file().hash(&mut hasher); + name.hash(&mut hasher); + let hash =3D hasher.finish(); + + let unique_name =3D format_ident!("macro_{name}_{hash:x}"); + input.ident =3D Some(unique_name.clone()); + + Ok(quote!( + #[doc(hidden)] + #[macro_export] + #input + + #[doc(inline)] + pub use #unique_name as #name; + )) +} --=20 2.54.0 From nobody Tue Sep 29 06:59:45 2026 Received: from LO0P265CU003.outbound.protection.outlook.com (mail-uksouthazon11022105.outbound.protection.outlook.com [52.101.96.105]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2C408443ABF; Tue, 11 Aug 2026 12:26:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.96.105 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786451175; cv=fail; b=l99LJXAf3gUx35Or6zdZu55VD203l94DFmsb69xVBdEfBUeL+jkGiuVZllLo6Dqwb0x7S4LbLz+9b2trdLV2ODPGKhikSzFtFwht+s6iFQlqCwZqBSOkb5tNRLP2cdURf0X5/tdu71i6ETO9fOdrY+Rc9peKKMkcrvAyvEvn1R4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786451175; c=relaxed/simple; bh=c7Vqsvcoc8OnSyvYMgKpVECJwsPIwEmR2UQewrFaEzI=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=NAtSoZJW6cBpK1TOwGaqdOzfHqT+MjuRSofGEtVdcunctkw9OCFi/VMlU1mJh+SwWRelu3kMU67mYXKS68fkedw96IBx7ZMzuIZsI9S0eELZJSJHYT9vBviHM/pRPTjBSLHbkpR/dN5Xzr9xglE/VEQOX226KTb4A3StO1omrt4= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=garyguo.net; spf=pass smtp.mailfrom=garyguo.net; dkim=pass (1024-bit key) header.d=garyguo.net header.i=@garyguo.net header.b=0Vj6Be36; arc=fail smtp.client-ip=52.101.96.105 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=garyguo.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=garyguo.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=garyguo.net header.i=@garyguo.net header.b="0Vj6Be36" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=WdL8csXPISMmsmcHkGpAKmlnE/KbMul+ehfwOUrmHf2/qGbB9px5i/HT/yFtCWHdrjNDSGZ0K55IXy9+OcYycjAKgO3TSqOXDDByzp2DdoDr/blFos6X1QSWKBdbEuWJs8pwiwe+sViKfgG3l34YHdk7vqjxknUHK3WEnNgo3/SaIjj+GE/fTVx7uCSRU7nivBq3C6uQNwGdKRZiFVOS0cutA5ZtVzFwmbzcNt3ZsJPozFyMKo4io47FR9e3ZnSvP794pIDsLGjg0506kjVhWTKb4N2V2M0G8td4wJ+Xzyt5tR5BIHC40EDYFvocz7pAsPpixAhkoniDtJcJuQHO3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=pTNgZlD8grl5uIoPnLtbtWimYE/SM48DQQ9214qdvws=; b=fQSLs1pwEAX58n7BXIfRVBrgAyhV40DJtG+c2so0XPe5DzqMn1uDy2Z/TSEfOkdWD90JwOaRlT148zb9W3L/ZByLcCWZYJObenZSHTamwl9T+1oon2B/pPqGn1bTtRjsiDu475MtJFRR6U/QvebIdW7xHIGvnQ3epib4+HWynyX1/KuIqNt0417X53ywJTklT4hpJZ/l0Z0r99rPKiby63CKK/GhQA5VJQ0OZ8kdZUwbxu8SH38UOrrESn9Hq1TGa+kEKy8uVr2dHSJMfvFc7jr8VCuvTd4ULD0+4ogWa3rYz+KI3qad+gOWD6Q60I8spNOByuM6uyKZzJztzVVNxg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=garyguo.net; dmarc=pass action=none header.from=garyguo.net; dkim=pass header.d=garyguo.net; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=garyguo.net; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pTNgZlD8grl5uIoPnLtbtWimYE/SM48DQQ9214qdvws=; b=0Vj6Be36/+O5g/lHUQI6GwDE/clnITApcFf+U8InVEOc7OponHv2Jj30Nve3ZddmPDiEyzHA1G/Ga9cVXTf8EaSMbv0znBgtEqX6ZySokJLDOXkrOmcvwSMUpfvA+UHuuqq1gLHi/OQYkJADfUhnEuKk69hR9GCRaPL7nqynQ9w= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=garyguo.net; Received: from LOAP265MB8560.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:4ab::19) by LO0P265MB5094.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:282::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.315.11; Tue, 11 Aug 2026 12:26:01 +0000 Received: from LOAP265MB8560.GBRP265.PROD.OUTLOOK.COM ([fe80::f60b:1537:68d7:4fc1]) by LOAP265MB8560.GBRP265.PROD.OUTLOOK.COM ([fe80::f60b:1537:68d7:4fc1%4]) with mapi id 15.21.0292.024; Tue, 11 Aug 2026 12:26:01 +0000 From: Gary Guo Date: Tue, 11 Aug 2026 13:25:54 +0100 Subject: [PATCH 2/4] rust: build_assert: remove macro from crate root Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260811-macro_export_scoped-v1-2-e7782b102819@garyguo.net> References: <20260811-macro_export_scoped-v1-0-e7782b102819@garyguo.net> In-Reply-To: <20260811-macro_export_scoped-v1-0-e7782b102819@garyguo.net> To: Miguel Ojeda , Boqun Feng , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Daniel Almeida , Tamir Duberstein , Alexandre Courbot , =?utf-8?q?Onur_=C3=96zkan?= , Breno Leitao , Luis Chamberlain , Russ Weight , Lyude Paul Cc: linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, driver-core@lists.linux.dev, Gary Guo X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1786451159; l=5402; i=gary@garyguo.net; s=20221204; h=from:subject:message-id; bh=c7Vqsvcoc8OnSyvYMgKpVECJwsPIwEmR2UQewrFaEzI=; b=D6H8R10mgivbZYUTagHK3MJB2SJ8vbDovF10EQ3cEX9RcVvizNTvdf3tD79xr3Z00tayT4VNB Qona0oruVprBhkV4Xar5is1QbR+3pCafHponcM3dmLrQ6Xlo0hS1B0T X-Developer-Key: i=gary@garyguo.net; a=ed25519; pk=vB3uIX95SM4eVrIqo1DWNWKDKD2xzB+yLLLr0yOPYMo= X-ClientProxiedBy: LO6P123CA0059.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:310::17) To LOAP265MB8560.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:4ab::19) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: LOAP265MB8560:EE_|LO0P265MB5094:EE_ X-MS-Office365-Filtering-Correlation-Id: 6702f3c8-9248-40df-963e-08def7a3b47b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|7416014|366016|10070799003|376014|23010399003|18002099003|22082099003|56012099006|5023799004|10067099003|921020; X-Microsoft-Antispam-Message-Info: usCUW2bwW3Qf5zoLDM2D/mubbCI8Y1XqsjJcX38SlGybqPm9+SImwBKk3wzXmANSpUuUyubkAhV7KDBD7osyCs4u8BU7pavBIhKIzHNbK3bFtLb2Z2v2aS1ZltnawI4t+Ql1dak94VHON9mVHkfe95Kjml1zm3AJk+gvN1dAalPkd+dHbUM9KGMl+dwmRAFsfB0UA9zKheFo5hC2JmTorVa1bEOEB7EFlMbLGd1CIuzEI/N7EYSN+EBLs4LGVJpJAkEDwJEi0bAFSDqTnG67dR10isevsWsJvBV3Ji9Tijbs3hIral0Rt3wuHIMQvWMsLKKGhrpqEX3D4Q39ye1Tjo6sdepUtsgWfU59fG3be4Q3MoxQvllgpdk2n7kWU8Bfhu/P7hPc2U1ioGrJpnWl2FLOC3XiEScpeKwIq5TQTDSYErhszlVNLHvTiAxLiotUPt4xEf1R6wTonXPO3zGvF1V11Oy3DpK6Qoyo2PzbwP2a+XSh2OpJzP4Smf7oWQIA9ldKY6Kuk6OyJxT1cq9jf/lgGCftXzU3zLn+htGdIEaK61CJKk/Ga6Mo3ZhCNj6d+LGND21F201mq5RdqtISdKeQeNhKTS1ndNJLG5KLmwj/D71nvdNngSzczGbctWqSwlrc2S/mnjbdUWkQhRZm/zeSq973xgyX3oUIvapoSoTMf0PfsNxfe1alntdJRjeduEmYibJ3wW5DhDkRTuOSxw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:LOAP265MB8560.GBRP265.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(7416014)(366016)(10070799003)(376014)(23010399003)(18002099003)(22082099003)(56012099006)(5023799004)(10067099003)(921020);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?clUwcnQwN0dXOEVSUHNEWUpwdGkxNldRQWNpckw3RUk1K2phdjZLell2S2VV?= =?utf-8?B?M1dqYUhjdWR0ZG9zN1BjYmhXN2FpUC9UUVorcTRPYWxmL0pmd00raTdsNnZN?= =?utf-8?B?V2lLRTQrY1B5NWZUVGwxVGZEdmxxV2xsZG1vWGpqdytQZVowUVIrQTBWeHl1?= =?utf-8?B?QU90UzZnNTdmZEVETWVrS0VHcFZTMzdvN2g5eDVTL3NtUC92TjdPU2xodE0v?= =?utf-8?B?MmRyN2J5ZFlPQXBzdGNqZE05OW80ejFYQUpFZEh5ZnpwcnpEZ3pmd09UQUZp?= =?utf-8?B?bFkvT1V1aXZPSVlHSFBmWk84ZGo1elNrdCtFajJ6ZGxHYlJsdkU5aXZ3bGdE?= =?utf-8?B?aDR5bTRqSXRXNWJ2aU9VRy9SWFBaRFlvajViVUtLR3o5UHVFd1F0b1VvNGtm?= =?utf-8?B?RzlrK2Ezd1d1akZwZzhYc1BrUUtsbGdER3cwZm1rLzZrQVRRbGQyMUViSTBC?= =?utf-8?B?eUhjaDgwN0toRXpPNjZFdnJ2VW5GdytpcHg0aW9Wc25aWDBueEYrNUV6QlF0?= =?utf-8?B?bXJJdWFCTDZDeHlIUVdmNFJwUTROdXBUWHlraFFHVVFxdkdLcjJjM1ZjQlVn?= =?utf-8?B?UlFSK1VNN0pyeWtzajFSRFZaUjFtY2NqcTZ6ZTdJYTJXN0hQYUNJL3JtcUY2?= =?utf-8?B?T1kzYW8wVFRsNnN6SjN5RTdaSmIxS0JBc0NlRW15TzgzQ0pWYnVLSzh0cW15?= =?utf-8?B?U3lwS1kxQ0cveWpzYW8wVVpYRUNEY3I0T21mSHpLVnZWbnc1cjc3NWlvdWw5?= =?utf-8?B?UGxjZ1Q0YkFibm5IL3dkNUdqbUdXSE1aREFxV3hpM3VuQTVRY2lXK3JvNGRh?= =?utf-8?B?QThEcDc0NU11ZmpwK3Q4U1ZyRGF6b3hMNDkxdXhxZ2R0UmdtMGxseCtKVVdm?= =?utf-8?B?MEVRS2dyUlhIak9kZEZtVHV2QUgyZi9xSzRnV0dSWVdUdnhpc1M5TXlmV2tY?= =?utf-8?B?MGVCM1B0M3p5SlM4bjdaSFVJVFJtaThXeHFTYXlxb0Y4TXE4YlBRTXdySkRF?= =?utf-8?B?L3JiVzVZaUF0aytSOTlXb1NMdHB2d2E3OEdXZjJFRjdNajFHeTZZRm5YQXUr?= =?utf-8?B?elpEUUpNUmY3d25jZThpQ2hPWDYvcHJVVDNadXU2bFN0QWFNUzRQWDBINGRW?= =?utf-8?B?TFY5Y2lBSzdsUDNMTDNqV1kwRlB1MmtjdkRyUW1vUFZlUmk4YU1Ud2FWRDJI?= =?utf-8?B?eVR4eisrdmZFV1hiNHdSYm1WTHpkQlpBZDdBOHJ5Z3hJTzZVTzR6VTZRMkY0?= =?utf-8?B?UTVWa3dDdlB0RUVFVDFiK1BuZWJTSnhmZk9OajhrVis0bnZaSTFCMlFqY1o5?= =?utf-8?B?L2l5a1hab1R5dk5CQzhmc2NiaDNoS2F1M0ROL2J1Y1ZQS2pmbHhQYlZHTjJF?= =?utf-8?B?ckQxcFZHZEg4c3FzOHhYOGdWazhsVkJYa3lxZCtSUVJzRVFvbzhVRTV4SWcx?= =?utf-8?B?QmRpbERvZk1QM3hORHNPZ2g5RXpyV2R6ZTVvRTRoWlBOUkNsZnJsSXM0N2xT?= =?utf-8?B?MHQrb3dJWGJVL0pqak9nemtPU3RvNXJoVEg2QmZmTnJXNTBRQ25jSlNpZnEz?= =?utf-8?B?NVcrVFVGK0V4OC95ekxlUHJibFVBV3JMMFI5NmljT2hiQjBSNGhjbXNBVUJO?= =?utf-8?B?aFg2aUJEUTZlcTlsdko2bERuMmtybmJ2MGhaQnJLU2FlUmE4Y3BWZjVOZnN1?= =?utf-8?B?ODgyR3NBUFo1UDZPNjJOOGNMRUZkdDhneUxuUFFGcGlodzVLdW1Vb1kzeDFW?= =?utf-8?B?UEVLL3RJZVdST25HblZEK2FKYXZvdnJtb3AvdFc1TkJ5cmg0YVhrbTRiL3Zs?= =?utf-8?B?UlRHREd2a25XNEZHYWhZak1BWnJYOVk4VGhpNGpnaS85bUtQQUg3NURzVFZk?= =?utf-8?B?TW81Wmw3N2Y1a0ltM09MS0w5VVlJNDRSVEp5SFRGKzRCRC9UTGNSYXpkWHdN?= =?utf-8?B?MktDcGFTNzRqeG9mUG54UlN4UVRUQmorTVZoam50dFZEVHdMc1BiWmNjbWtw?= =?utf-8?B?RXRBN01PN3NZWDBRV21GVHNzU2x6MG1hd0tUVU9acFgyNFBrbHpIeGNYVXdY?= =?utf-8?B?UllRK1htSzhmOTNBZEJVaGpIc1JlYklwK3hNNlZlWXBWMGgvc29kMjRlOVA2?= =?utf-8?B?QlNjaFNTcUhEd0VPbkhNS3JxMUZJUTc5N0hqNmxjLzlNOFpLbDBHZUJDaDVW?= =?utf-8?B?am8vVVZ1NS9TaG5OeUgvT01sRnU2T3VNMkRmTVVvSERwNFpxQ1NyeWFyK3l3?= =?utf-8?B?Z0Y3bkdIcmV0cGtRK1Fpb0NPK1MwS1dTVTFDUHdxT0tlMVBGWHZ6dm5IUDk1?= =?utf-8?B?SGphUFZBZjNGaE45SlJPVFozQVhNUGhWS1E1cXJkU3ByWGxNWDZMQT09?= X-OriginatorOrg: garyguo.net X-MS-Exchange-CrossTenant-Network-Message-Id: 6702f3c8-9248-40df-963e-08def7a3b47b X-MS-Exchange-CrossTenant-AuthSource: LOAP265MB8560.GBRP265.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2026 12:26:01.5314 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bbc898ad-b10f-4e10-8552-d9377b823d45 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: BaT9A0pMYsgJvKG3bV+s8rvszo6gLOZmcKyQf89jzpIrjtLpCUShozMkNCfO7ju8tbz3itf15gAz30PrRhR33g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: LO0P265MB5094 Convert `build_assert` to use `#[macro_export_scoped]`. This removes the macros from crate root of `kernel`. A few remaining mentions of the macros from crate root are removed. Signed-off-by: Gary Guo Acked-by: Andreas Hindborg --- rust/kernel/build_assert.rs | 24 +++++++----------------- rust/kernel/configfs.rs | 4 ++-- rust/kernel/firmware.rs | 4 ++-- rust/kernel/ptr.rs | 6 +----- rust/kernel/sync/atomic.rs | 2 +- 5 files changed, 13 insertions(+), 27 deletions(-) diff --git a/rust/kernel/build_assert.rs b/rust/kernel/build_assert.rs index c3acb9b68a65..4774c7fb6976 100644 --- a/rust/kernel/build_assert.rs +++ b/rust/kernel/build_assert.rs @@ -61,17 +61,11 @@ //! undefined symbols and linker errors, it is not developer friendly to d= ebug, so it is recommended //! to avoid it and prefer other two assertions where possible. =20 -#[doc(inline)] -pub use crate::{ - build_assert_macro as build_assert, - build_error, - const_assert, - static_assert, // -}; - #[doc(hidden)] pub use build_error::build_error as build_error_fn; =20 +use macros::macro_export_scoped; + /// Static assert (i.e. compile-time assert). /// /// Similar to C11 [`_Static_assert`] and C++11 [`static_assert`]. @@ -105,8 +99,7 @@ /// static_assert!(f(40) =3D=3D 42); /// static_assert!(f(40) =3D=3D 42, "f(x) must add 2 to the given input."); /// ``` -#[macro_export] -#[doc(hidden)] +#[macro_export_scoped] macro_rules! static_assert { ($condition:expr $(,$arg:literal)?) =3D> { const _: () =3D ::core::assert!($condition $(,$arg)?); @@ -134,8 +127,7 @@ macro_rules! static_assert { /// const_assert!(size_of::() > 0, "T cannot be ZST"); /// } /// ``` -#[macro_export] -#[doc(hidden)] +#[macro_export_scoped] macro_rules! const_assert { ($condition:expr $(,$arg:literal)?) =3D> { const { ::core::assert!($condition $(,$arg)?) }; @@ -159,8 +151,7 @@ macro_rules! const_assert { /// assert_eq!(foo(usize::MAX - 1), usize::MAX); // OK. /// // foo(usize::MAX); // Fails to compile. /// ``` -#[macro_export] -#[doc(hidden)] +#[macro_export_scoped] macro_rules! build_error { () =3D> {{ $crate::build_assert::build_error_fn("") @@ -203,9 +194,8 @@ macro_rules! build_error { /// /// const _: () =3D const_bar(2); /// ``` -#[macro_export] -#[doc(hidden)] -macro_rules! build_assert_macro { +#[macros::macro_export_scoped] +macro_rules! build_assert { ($cond:expr $(,)?) =3D> {{ if !$cond { $crate::build_assert::build_error_fn(concat!("assertion failed= : ", stringify!($cond))); diff --git a/rust/kernel/configfs.rs b/rust/kernel/configfs.rs index 2339c6467325..8660ce01d97f 100644 --- a/rust/kernel/configfs.rs +++ b/rust/kernel/configfs.rs @@ -511,7 +511,7 @@ pub trait GroupOperations { /// NOTE: "drop" in the name of this function is not related to the Ru= st drop term. Rather, the /// name is inherited from the callback name in the underlying C code. fn drop_item(&self, _child: ArcBorrow<'_, Group>) { - kernel::build_error!(kernel::error::VTABLE_DEFAULT_ERROR) + build_error!(kernel::error::VTABLE_DEFAULT_ERROR) } } =20 @@ -660,7 +660,7 @@ pub trait AttributeOperations { /// Implementations should parse the value from `page` and update inte= rnal /// state to reflect the parsed value. fn store(_data: &Self::Data, _page: &[u8]) -> Result { - kernel::build_error!(kernel::error::VTABLE_DEFAULT_ERROR) + build_error!(kernel::error::VTABLE_DEFAULT_ERROR) } } =20 diff --git a/rust/kernel/firmware.rs b/rust/kernel/firmware.rs index a18f8b84f3e3..1abc66b84ef2 100644 --- a/rust/kernel/firmware.rs +++ b/rust/kernel/firmware.rs @@ -325,7 +325,7 @@ const fn push_internal(mut self, bytes: &[u8]) -> Self { pub const fn push(self, s: &str) -> Self { // Check whether there has been an initial call to `next_entry()`. if N !=3D 0 && self.n =3D=3D 0 { - crate::build_error!("Must call next_entry() before push()."); + build_error!("Must call next_entry() before push()."); } =20 self.push_internal(s.as_bytes()) @@ -369,7 +369,7 @@ pub const fn new_entry(self) -> Self { if this.n =3D=3D N { this.buf } else { - crate::build_error!("Length mismatch."); + build_error!("Length mismatch."); } } } diff --git a/rust/kernel/ptr.rs b/rust/kernel/ptr.rs index 82acb531b17b..b6fb802c2e21 100644 --- a/rust/kernel/ptr.rs +++ b/rust/kernel/ptr.rs @@ -5,13 +5,9 @@ pub mod projection; pub use crate::project_pointer as project; =20 -use core::mem::{ - align_of, - size_of, // -}; use core::num::NonZero; =20 -use crate::const_assert; +use crate::prelude::*; =20 /// Type representing an alignment, which is always a power of two. /// diff --git a/rust/kernel/sync/atomic.rs b/rust/kernel/sync/atomic.rs index 9cd009d57e35..c62cb46798ff 100644 --- a/rust/kernel/sync/atomic.rs +++ b/rust/kernel/sync/atomic.rs @@ -25,7 +25,7 @@ =20 pub(crate) use internal::{AtomicArithmeticOps, AtomicBasicOps, AtomicExcha= ngeOps}; =20 -use crate::build_error; +use crate::build_assert::build_error; use internal::AtomicRepr; use ordering::OrderingType; =20 --=20 2.54.0 From nobody Tue Sep 29 06:59:45 2026 Received: from LO0P265CU003.outbound.protection.outlook.com (mail-uksouthazon11022105.outbound.protection.outlook.com [52.101.96.105]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DC77F443E28; Tue, 11 Aug 2026 12:26:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.96.105 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786451170; cv=fail; b=gQbwZGyOipA2kbG2ogHARTvJNGD2eT1qV1J0491d+SRUVALi3OBUyrQbCN8k2Ucyr7S+2U7ixyAQawoVdT0MZ60cafMMWUzRRXYFjd0Rb+D1lSNeRzLC96vb4J6AT9rXVqa8yxpNjudpmOfglW6j7rogwtWPgrXqqoz4oiBWF1Q= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786451170; c=relaxed/simple; bh=twVmf1gqdSItYVB8lMaKXevqTsaZig2JJM8Oz3yKbjU=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=pGP/HRU5n4xH17tn8qFqj0SHNc5vOkc8IqczsEwJNf90nsNZCc+2UE7zrG/cQa+5oPb4QWwIDiEaQ0YWgU42siKFw0JnDp/JSGW1UYWh+0444WPx7oS4xVT1uq8rmpUMiicAWVBU8ESx6PChuthkC+99f5TB6X7wUh1RSfTWGu4= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=garyguo.net; spf=pass smtp.mailfrom=garyguo.net; dkim=pass (1024-bit key) header.d=garyguo.net header.i=@garyguo.net header.b=IJ4Xb21u; arc=fail smtp.client-ip=52.101.96.105 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=garyguo.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=garyguo.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=garyguo.net header.i=@garyguo.net header.b="IJ4Xb21u" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=IY6QM8NwI7CWCsKm5O9DqXmF37pSV8+X5Gqfd1WBb1k/TylVbVI/7TiKCzcYg9zQqDL53vduYUH9BXXIdt/J/XSwDX/FCwglpHLaXBT+3qySAvOIEl3zFHBh/EaL0VNrghSbvO8UNQ0cpzzQYhcI7qqjmBf43R8e1d8WcZCZZW1ny3d4Opj3ybVq8TfR7juGDnhz9TkNwKK7FHpwDmT+6H873iLWCO29FbVepkf9htsNiY7kJREYAbGyuLC9Um5xqSlDG4+WGe3sx8FzwmgJSiXMCxi+OOBgJ+hrm+euyjbceThTLwa9pmxDgsK7YyUnRzaXKPGPtY76lPXgbTDSiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=afEaqejI+jxmciuw2HHxAJx0YuTzGwiLZIx+jMcSG4o=; b=HOjL/IdDizX7TT6/S6D2N+KBAn6lJj0yVIEJ+UtV/S8NKOILv4Lmbn5iy/bmBnN1i6Knf6PRPtE4XsXR9KVQPWcCGKHmmoHsVq9uxVRrSsIwEuWHExsrc/ThVW2AaX4fyeDHhJYSx+KywydT/riH7WYxeX8iJutzdjKFqp3AZzQ4GfbRmXz9kv8VJRcwG70LOD0tEMPcbYhhdU0GuC5o6Gdr5Gd6PGVtMJhWJXmKWdeP3+oTqRnfIBUtuB2qyxIx8iIPsmuow6Y8JnOH2a1fBPDDyPDjpRmUtS8plr2L8Gy3oQf8gvr/kfTYl123oFMIW+bnxKPt7tYFmyt9HKS+NA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=garyguo.net; dmarc=pass action=none header.from=garyguo.net; dkim=pass header.d=garyguo.net; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=garyguo.net; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=afEaqejI+jxmciuw2HHxAJx0YuTzGwiLZIx+jMcSG4o=; b=IJ4Xb21uQKfyMd2mTph+BZCaXeTf4s809BzHMTFteN/UyC1sh49bGvq1wH3hcfsvJSVqrjOgkm8OuKJ4q1gbJCGea8SfbLg49tPOtZyK3nQ+p/t443AVoGpgCvMVCfQSWjifg+DzSMyP4OYCEYSPlPoe/7EIW/dcm40J7R11HH8= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=garyguo.net; Received: from LOAP265MB8560.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:4ab::19) by LO0P265MB5094.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:282::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.315.11; Tue, 11 Aug 2026 12:26:02 +0000 Received: from LOAP265MB8560.GBRP265.PROD.OUTLOOK.COM ([fe80::f60b:1537:68d7:4fc1]) by LOAP265MB8560.GBRP265.PROD.OUTLOOK.COM ([fe80::f60b:1537:68d7:4fc1%4]) with mapi id 15.21.0292.024; Tue, 11 Aug 2026 12:26:02 +0000 From: Gary Guo Date: Tue, 11 Aug 2026 13:25:55 +0100 Subject: [PATCH 3/4] rust: list: convert to use `#[macro_export_scoped]` Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260811-macro_export_scoped-v1-3-e7782b102819@garyguo.net> References: <20260811-macro_export_scoped-v1-0-e7782b102819@garyguo.net> In-Reply-To: <20260811-macro_export_scoped-v1-0-e7782b102819@garyguo.net> To: Miguel Ojeda , Boqun Feng , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Daniel Almeida , Tamir Duberstein , Alexandre Courbot , =?utf-8?q?Onur_=C3=96zkan?= , Breno Leitao , Luis Chamberlain , Russ Weight , Lyude Paul Cc: linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, driver-core@lists.linux.dev, Gary Guo X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1786451159; l=4119; i=gary@garyguo.net; s=20221204; h=from:subject:message-id; bh=twVmf1gqdSItYVB8lMaKXevqTsaZig2JJM8Oz3yKbjU=; b=HZQGhBYbPdkzqGhLgOsfEeKvQB0Lg20RqSKbpHFf+0f8b3vvrh3K++y54OgN0mNiWn4pnivzI SHsa/LoXuVlALuMEzWzBrBKCz4lQn0TZy0SR0TNGhGw79jqW6QeXsnl X-Developer-Key: i=gary@garyguo.net; a=ed25519; pk=vB3uIX95SM4eVrIqo1DWNWKDKD2xzB+yLLLr0yOPYMo= X-ClientProxiedBy: LO6P123CA0059.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:310::17) To LOAP265MB8560.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:4ab::19) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: LOAP265MB8560:EE_|LO0P265MB5094:EE_ X-MS-Office365-Filtering-Correlation-Id: 2a8fd98c-0389-4bd8-af9c-08def7a3b513 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|7416014|366016|10070799003|376014|23010399003|18002099003|22082099003|56012099006|5023799004|10067099003|921020; X-Microsoft-Antispam-Message-Info: Frv8bS26xAozldgheS0UVgpfSQ5RFdMfzOPd1IcVZwI3vxTbHrhNJxqwKM0iQyxyOoB4BphV7ENPLJr6w0el3xuPdtgLrONU3VazK6yrwdXqUR/k6xT5ueqWUunBAUeqy5d3Qnr2gQO74LnyLAeZUCcviLVSbsfWBNoizesMsSZoSh4BvhUdXv+2RGq39SdLMp5Yh2R2eXY5BFe3LtUSE+Xxru0d1f4224XT55t0RUdmEXzi7mjf3wy1VDxosogXE5ffxw93bHs/6x8DGhzKvwhKNLPnCUj/weL2q2HZC66tb+CibeZs//XPpWYxTjyu97NDATNx2e23ppTnY1Vmu23wyQJkL4ccrl/ExMZj1siuIE+LoKrmpyqIrWXUkIcygEdDq5KTVpME5SNZOfQH+P1xpVFcmFydn4iaZd+z/tq1vYLp8iZEHq+RTLp0s4hJ+1p34DLJ+V+aN0RDNWfHukCkDohDMd5TOnTfFxwopTmsOxFuzWSNtlVLV+wHxmP3mMrIj8Kt+2UJ8Z4UyX2vHkNBQ4altAmYX/8o8c5OLjl802SvCSIz1N5ZfkhEAaJI3dyoV3V544LiOqr3n8nf6sON8pCplixub+MkO7WuarmiTB2pDXGaFNtyt2c4n6jzBbAFeMf7l/Uhvh/uMTjqYd7gDN1mY+ariakWnVtPs5UjZRFXDsD+b1cJT0LvsSCCbuGfiwpbOHAE7YyPysQ5FQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:LOAP265MB8560.GBRP265.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(7416014)(366016)(10070799003)(376014)(23010399003)(18002099003)(22082099003)(56012099006)(5023799004)(10067099003)(921020);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?WGg3cHhCa2dzMElQYUI3V0RGRVdFNjJUWTlrMUlTblNTWUdYTXVnMzh1cTFt?= =?utf-8?B?Vnp5aytQKzhnbUJ5VTRQLzFtanFEaVkrUHoxQ2NCRDlTNDBaVzIzZ0FCTGly?= =?utf-8?B?OE5qcVZHR2hIZkM1dzdKTHRMc3RXem1jM1FnYU94UmUvVDhuQlpEUFl5eW0v?= =?utf-8?B?OW4rOEo0U0plNXh5SXQ4Mk14OFpPRDE5TU1XRWZ1ck5xcktqc2xocHZ6WWpH?= =?utf-8?B?R240azBCWFdsSU42SFpyVmV5dzRRNDdvQzRVOFF3UWEwWWNnMTdDTXBjSWt1?= =?utf-8?B?a3UycFE5Qkh5WXU5NXpjbWh4YS9qQUMyV3F6UEVPQ2hqVHQvRnc2cWhxT2JD?= =?utf-8?B?ZkVRa2Z2MDRMd2FPdGlDUG0yQXRYZU13RCttUHYxODIzeHR6N2thZzkrbmtM?= =?utf-8?B?RUppR3l2aGVVaWFQYStocFk4eHVuc0VGV3podWZjUCtISVpjUmcrbDJOM3lQ?= =?utf-8?B?MjFHTmh4RWhRa2o2UEIyTlhQb2I3ZVdZb3V4YzhseVloNCtjemhiSm9neUd6?= =?utf-8?B?QmFZbWp6QklnVFNuSzAwTWJ5SndTRldXcWIyTnBXUWczNm0rdkVEY0FZcWY1?= =?utf-8?B?a0NHL09nMFZjSDRSUDV5T1BKOUhxT0Q1aTRCUCt4Y1dabkpIcE54UTVWb2Nn?= =?utf-8?B?bjVpMXR3cjFmUjJaNVVld2Z5Qk1ia0lyODBWaUxGbDI3ZEVoQUVrVnBmUit1?= =?utf-8?B?SEVnU0ZEVWFVMXRwNC82bEErdTViOFl3SHVZakxzYmsvQjNBR3VNaUtPRG5H?= =?utf-8?B?dEFRMkpDY1BSYVdmWEpsZzlUc21ZdjluYkdtT2Z4WWs5aWxNSGdGQmFjOStG?= =?utf-8?B?TlIwRElxMEFFOExFK0o2YkpGK3F2YUxpb1FYdjl1dHU0ZUxzS1pRc2pNQjV5?= =?utf-8?B?NTYrbGROb0lrL2N5VUV6V2NhbWxjVUU0dVdUaWUxeDhMVitwRkRENytKWE9M?= =?utf-8?B?WjhXcUlSUmVrR2NjSnpwOFV3SmMwcmM5cS9LUSs4WGV2SjFNbHUxTFZyR0Za?= =?utf-8?B?dDYrYm43eEVxM0ZYN0pCUjlhRDJtMS9uUVVvWVhjWmZsTmc1STNPM0Zzb21n?= =?utf-8?B?TDhWUzF2Q3BSUFRHMVR1TFBMVU1SS3c0N0ZzejVidlJyalBIOXR2K3dWL2VU?= =?utf-8?B?MVFTWWwyMjdtSVF2MXJFVlpCYytsMVVQY3E4M0dYRWF3WmZEOGFCQjdjdkQ5?= =?utf-8?B?MFJWSDZBYXpwR0JCRFBwUlpOSjRIY1phUFJXeUluQ1VObVczTDJVVkhvMHpY?= =?utf-8?B?d0d0anM1K1MzRWNsRUFoRVcyVVhtVm9yUnVwd3JKTTl6RXM2ZGxjSzBYL3k0?= =?utf-8?B?bWhmNjgvRkJYaDVlckw0U0psNFlBUWZwVk5RLzJTc1B1UFJLYks1YWYxV29q?= =?utf-8?B?TGFzL0FVK1h0d0VlVVRiTG13Wi9DdlZQZjlqUVoxNVZjVkxVdGYwRjFQV2Zy?= =?utf-8?B?MkhDL1hVQ2lhb1UwelZoeXh6RlpMdVFTeUdYYW5rbnBWYVZzbUtsQXk5aHJl?= =?utf-8?B?d1R5Q0FOcldTYkJVdWZ6eXJOdlZIN0hId1NXVmUzMUlGWFVGL3BtVDlRT213?= =?utf-8?B?ZzNFOWdGQkdWbHQ0d2dzYU9rcTVVMGpqOFVRWmx2MzVKZzBKL1lMWXlOUWFu?= =?utf-8?B?dWlVWjA4ZlhzZjhTVm5NWE9xL3FVNWVQaHBnU3FLTVdxQ2ROMEFsTExUVG14?= =?utf-8?B?amlyYVR3Tmx4aHVod01KbjVPNVN3b2lnT2NUWTZXTjFKSTVFK3lVUndFWnBQ?= =?utf-8?B?NXRGdU52SldlaVYvR1FGdzZaVHVrRkhad214Y0pHeFgya3RyczRKT2pGQWs1?= =?utf-8?B?ajRBZzNiR25ob0dLUDN5S2UrQ0dLSXhzMzZyd0hQbUdzWnB3Y3l5bGwxblAy?= =?utf-8?B?VmM0amdtOHlaVHR4QUU2ZUpWMXJ6V0JoYUs4QnhmemlKcG80MjZzbEpHZHlk?= =?utf-8?B?emhFY3VXckJsdDJJcG84SFNMVjFEcHFvM3UvdnczNlNkYlJIUHdZUFpvZHhQ?= =?utf-8?B?alVqTWdqYStSdFo2emNnSDY1c0hGK25NUDdlNXRPdERqWm9CZkprUTlkZVYr?= =?utf-8?B?QkZrdUVYSDdtZ1VGRXBGZzVkQVI0R2dNZnJaVlJHenVGSzNBL3hJajZjSkVX?= =?utf-8?B?VnJjZ2hER2ErNzRXb2lrbDFLN3g1elpkbk5nNlJwN1J5bm1LUGIzWXQxelha?= =?utf-8?B?SmRNL1dOaVBTQW44b1krZFIrTllPSW1kcFdwSHE3U3ZsM2VxZHNXRE16YXVr?= =?utf-8?B?aUNzV1VwY0o1aGtqUW1hVU52WW1WbVdPb0RaM2ZrL2tKODVFdXp2VTRpK3h0?= =?utf-8?B?SDRSdWI2QUFNdkRnZS9TS3JuQ1Z2NUdPRGJsb1g0di9ORGFKNDdLZz09?= X-OriginatorOrg: garyguo.net X-MS-Exchange-CrossTenant-Network-Message-Id: 2a8fd98c-0389-4bd8-af9c-08def7a3b513 X-MS-Exchange-CrossTenant-AuthSource: LOAP265MB8560.GBRP265.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2026 12:26:02.5161 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bbc898ad-b10f-4e10-8552-d9377b823d45 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: W8Wh8cHq4Hxrd84jQVR5OssdLf/TG/b6BEKmS56JDQ66IpkxkLdvH/1GSoSxKY8a7xpd+QtF2SFsurPqsnnGmQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: LO0P265MB5094 Convert list macros that use `#[macro_export]` + `#[doc(hidden)]` trick to use the `#[macro_export_scoped]` macro. Signed-off-by: Gary Guo --- 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: List= ArcSafe { /// The `tracked_by` strategy is usually used by deferring to a field of t= ype /// [`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)*) =3D> { impl$(<$($generics)*>)? $crate::list::ListArcSafe<$num> for $t { @@ -127,7 +126,6 @@ fn try_new_list_arc(&self) -> bool { =20 () =3D> {}; } -pub use impl_list_arc_safe; =20 /// 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 { } =20 /// 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:iden= t } $($rest:tt)* @@ -94,4 +93,3 @@ macro_rules! define_list_arc_field_getter { =20 () =3D> {}; } -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 @@ =20 //! Helpers for implementing list traits safely. =20 +use macros::macro_export_scoped; + /// Declares that this type has a [`ListLinks`] field. /// /// This trait is only used to help implement [`ListItem`] safely. If [`Li= stItem`] is implemented @@ -28,8 +30,7 @@ pub unsafe trait HasListLinks { } =20 /// 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 $cra= te::list::ListLinks$(<$ } )*}; } -pub use impl_has_list_links; =20 /// Declares that the [`ListLinks`] field in this struct is inside a /// [`ListLinksSelfPtr`]. @@ -74,8 +74,7 @@ pub unsafe trait HasSelfPtr } =20 /// Implements the [`HasListLinks`] and [`HasSelfPtr`] traits for the give= n 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 $cra= te::list::ListLinks$(<$ } )*}; } -pub use impl_has_list_links_self_ptr; =20 /// Implements the [`ListItem`] trait for the given type. /// @@ -182,8 +180,7 @@ unsafe fn raw_get_list_links(ptr: *mut Self) -> *mut $c= rate::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; --=20 2.54.0 From nobody Tue Sep 29 06:59:45 2026 Received: from CWXP265CU009.outbound.protection.outlook.com (mail-ukwestazon11021100.outbound.protection.outlook.com [52.101.100.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E035C443E5E; Tue, 11 Aug 2026 12:26:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.100.100 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786451171; cv=fail; b=WNVP7lrriDn4EMCX80eRNtZYm8JiJjzPm1qsyQ7t+RZPDkTXlGKGHpm7n0FbGUoNYwnIkuNP/tC1M7gN/8DD8+lP7o24enJQiJuJH3kU/f943mffctEFE89ljBQRV0hrnRqBHMK5+ezodGFfZWgcX9B8kLQ1A/Wv99mQiJ28D4A= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786451171; c=relaxed/simple; bh=fKFOnxn9mkkggVQGQaR/veYiv80tVTzsKdheZZi86MU=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=pS7CCXlMmueQG8c/VrK+oQzgl38dI7zCqvZUKkeRJmW/GyKbUqSEXJP3BL5kWIvL/6VRPl8nzmdLR8M43DpBDdbHHjCLG9DF6j1q3hVcH521wtY6x5nVvvklVav/JN5zs+v2gu9TFq69cIcfX7dZQB4bSZMGde4Aq53/jLiREmo= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=garyguo.net; spf=pass smtp.mailfrom=garyguo.net; dkim=pass (1024-bit key) header.d=garyguo.net header.i=@garyguo.net header.b=VVI5H8y+; arc=fail smtp.client-ip=52.101.100.100 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=garyguo.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=garyguo.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=garyguo.net header.i=@garyguo.net header.b="VVI5H8y+" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=r7RbvF5xQhVLvF1t7RRCKJcB0X24zzoc+QpFivk3t38Xkx+XA12SN8P4QFtANoT//rmCOehKenYo89uLujw1X3TYwXp9kNbw8D1r926MnLDdN/Tk++uWPF2fiqpxPcdj9JkOsbdQUC3zcwtLXVZn4doxmemo9PU7751uJIqbCFCt9E/91B5plqFWNXKHik0fHahr+/ljlbzyTsKSGQeM14Bq1vob/44A+zXUz10JqH3HYkf9lw9NDfM6iDUtNoUscGpshH2nAj+9vmbJocC9kxwJPtN/fEScAjUvUwCDHXFAtn/rkLOidcivx6Yhg2n0oK0FRzD8Sutgaf8LOqJl7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=7LwhLqrH55STleNard3NJsgxxJJQAeVghmSaAGGwIMM=; b=NyPdVAuJFTGSq4S1Da9fsvQCOvTA956xhVQsHvzl4RzWDgP460lLXYs45gY9nMEylz4+KXAilxOY/PnJwxhweec0z1A6LNFpc0Lg81pisKFQglvo22xbXLYCGVmFE1JxGqMwTu39o5lt5vNtMmbseVhm1SdCYywzpPfmdPrvpvl7WDNiwZrpdn0W1UgBY48jrE6TnWLxf5Oekp240/PYKvf2xFAYmwSDdWn6QfiOLXj5PR3aLCnD762OSwQ95CULKzxviBqfQfDKP6Exvv9mXPWkanO+2FGEDEQ9a1B47N33Jb8uhXfEClzaqzsn9dwGHEJn/TFs5GNEWIdB+/U5pw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=garyguo.net; dmarc=pass action=none header.from=garyguo.net; dkim=pass header.d=garyguo.net; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=garyguo.net; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7LwhLqrH55STleNard3NJsgxxJJQAeVghmSaAGGwIMM=; b=VVI5H8y+9laY0sluchEgtfE5fQqxnaL3MHWBXDEto27KnG9klmu+82CFxSXjv3o55ihBVGuptyyiAgLBxjI2J8BT2BJ7QosVl3JYyECt1bACl5PS6eSS37zMTLVwtLnIetKW5GkVnX8tlXLyHK0oaZalpRmOQW6cewGbRE6SgUg= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=garyguo.net; Received: from LOAP265MB8560.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:4ab::19) by LO0P265MB2891.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:183::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.315.11; Tue, 11 Aug 2026 12:26:03 +0000 Received: from LOAP265MB8560.GBRP265.PROD.OUTLOOK.COM ([fe80::f60b:1537:68d7:4fc1]) by LOAP265MB8560.GBRP265.PROD.OUTLOOK.COM ([fe80::f60b:1537:68d7:4fc1%4]) with mapi id 15.21.0292.024; Tue, 11 Aug 2026 12:26:03 +0000 From: Gary Guo Date: Tue, 11 Aug 2026 13:25:56 +0100 Subject: [PATCH 4/4] rust: io: convert to use `#[macro_export_scoped]` Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260811-macro_export_scoped-v1-4-e7782b102819@garyguo.net> References: <20260811-macro_export_scoped-v1-0-e7782b102819@garyguo.net> In-Reply-To: <20260811-macro_export_scoped-v1-0-e7782b102819@garyguo.net> To: Miguel Ojeda , Boqun Feng , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Daniel Almeida , Tamir Duberstein , Alexandre Courbot , =?utf-8?q?Onur_=C3=96zkan?= , Breno Leitao , Luis Chamberlain , Russ Weight , Lyude Paul Cc: linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, driver-core@lists.linux.dev, Gary Guo X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1786451159; l=2784; i=gary@garyguo.net; s=20221204; h=from:subject:message-id; bh=fKFOnxn9mkkggVQGQaR/veYiv80tVTzsKdheZZi86MU=; b=T/GRomljQhLZxfVHgWKDfWcjN9R/SqT4CaePTNb+/IM86lZU4rtw+WHQY5mjNAO8/n4SFyAxB /ZNBgnxoSphAc3+mqXUJ2NcW3SDBOJFDXAgElTvHaP7YDL8CxYE/M0n X-Developer-Key: i=gary@garyguo.net; a=ed25519; pk=vB3uIX95SM4eVrIqo1DWNWKDKD2xzB+yLLLr0yOPYMo= X-ClientProxiedBy: LO6P123CA0059.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:310::17) To LOAP265MB8560.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:4ab::19) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: LOAP265MB8560:EE_|LO0P265MB2891:EE_ X-MS-Office365-Filtering-Correlation-Id: 043ba8f0-89fa-4f6c-92fe-08def7a3b59a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|23010399003|376014|7416014|10070799003|1800799024|56012099006|5023799004|10067099003|18002099003|22082099003|921020; X-Microsoft-Antispam-Message-Info: xgKTxVhLTOiYXjqFwnfkkMFtS1MwVUtoZR0/WsddyHs52tIsqhJFyIV1mWqAHhn9y0OLMuU6hBIn6cwXxpRuuID2GIlP5UrhjS6CRTNw+b70lp1P2fZdk+8A2mdlBbVEmtrX1Kx6Z2Ci3ss9vTI3H8cZDy1v+LBgxzZgGtXYvz+BeRNpC6f3ofyishByVuBSiaslrb5oCsOlpRfwb7bcUT0ZtuoeKi22Am2x8y6OqgvOv4XrYtA0pzu3BSoGxCEGnNce5DBWsxV8GruSiADPVqY8T+H/hyEW/nX20z3ZDbmpMv5ukHAvQNCtTdDGX+5WBzrBuoj55VFsF+oFMQv70KyHkr6m5+xpsMuvFYvUdl6buPLeRQ5OUim8vHEsH2JtQIuS3RdAEHKmSZQP9iXpHqQtUlNezB8KkO3fnKLto4h3UHnN2wbAzv2/O0sTXm9foomYFevuBbA72C8mvAVingPGizsfXKdqDODHfLznAyL0ubNd36SneFZatZs2g09x0RdOFAyzEgbfWwgaii7C33LUkf+3Gem5ZEK8uIkGXgBE2PavFZLT6g0ZiD+QI1kiYvpgzdTa/ILc/1BCVdEdfvvHrOh7x1qSjOwsFCDqCJmvNDoz5OzcJjqcCAK7CGQgEclQvBQWTxgEYzKpeJH68tLy7oWF3+cyYgSooPFn1e7TlFWYrJkQDw8w3Fw0Rb96+vS6/OKdKDkopStYgs9TvA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:LOAP265MB8560.GBRP265.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(366016)(23010399003)(376014)(7416014)(10070799003)(1800799024)(56012099006)(5023799004)(10067099003)(18002099003)(22082099003)(921020);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?YUYrWStqMWw5dXlkeVo1S2Ziekg0R1ZFVFE2RTVuOWpDaWFjMXhUYW9rVFJs?= =?utf-8?B?cVkxTmZwS2FlNDJPWVZITzJhMU9hYjdMOEFJV2NnUWNqMi8wLy8yK3h1ZUd4?= =?utf-8?B?ODNycVJKTWpQT0o2S1Z2YXhVdkxhUFk5cDV3RmtoNXRaMGN2MncxNjVNbjlD?= =?utf-8?B?WFIzTEVteVlDZVluZjBuYkE1bk0zWnIzK1RoZDFtdWV0TUF2Rld6cmxmaktR?= =?utf-8?B?bGJiMmErWFZ0clJhUEJmdXZKNENZZnNNY2w2VVVsVUIzMkI1UVZvQlMydzhp?= =?utf-8?B?MEdRTklrTFdnOTJqRytQUHBuRlBUcWhzdjJvZkxLV1YyRzFNVW1tYjZ0Uml0?= =?utf-8?B?ZURNcW1OSFZNSmxOQkJtOXl0OExoNDRBaDNzT0xtcmJtNU1uSGd0RmxZUUlH?= =?utf-8?B?WFZBYlZXT3M0b2VWam5kS3EyaTZVOHZxNElrNTRDcTI0aXlPb3JXRk54TFVB?= =?utf-8?B?YWVmYlNvbGhFMm02bGJoZkFpRUlsbldjcW05VzR3M1lycUd1TlFMYXRKaW5k?= =?utf-8?B?TzJ5cTdGbWl5dzNWNkoyaGJ0VWJDRlJBdXBaQlZsWSsrSmltZUtBNkcrdzR4?= =?utf-8?B?MXJzTHdma3prS04zT2xndEp3SDFqVG5Xczh6WElJNTRERWJFMXpLaEhNdDA0?= =?utf-8?B?Ny9tQkdXUWp3eElpWSt3dy9leHB0OS9BOHhHbWg2SGxMTVVnVS92N1o4MjdY?= =?utf-8?B?c05qbm1pcHV6NEFGYUNiUjFCRG5aYmdWR25uNWVrN0lnS2tZdmFyMEprS2lT?= =?utf-8?B?M2dnUGdNcmJPOUdmYU5mSTNYTnZ4SXJpL2ovM0xFelFtcHYzeTlORUtaekpm?= =?utf-8?B?V1EzNXRFUy9JNzZQcWpsTk5kRWR5RVhvTktvZVd0WW1EeUV5YzVZVTJNZ0pl?= =?utf-8?B?RDZyVjVMSDFkbkhLLytTTEJEV2lkVm5MNmwrZk5qcytuTXE3UmM3cFdYai8y?= =?utf-8?B?M1Rxa3lVMzF0ckFwUUZMZDFhNVlvdWhTZTBMY3lKMEhoakFwSi93MVVueXhZ?= =?utf-8?B?bzJPQXRaOXBHeUF2a3doODhmcFI0Rk5ZMkQybVZsbzhlampmaTVQd1d3MGxy?= =?utf-8?B?MmxJSTJCbEo3dVVhWmRHSDZsSW5RRFRaRzhDL0JBQmowb0VRYTZrMUZMcEUv?= =?utf-8?B?QUxjNXRZdWMvZmdDL3JNS0VndzR3aGc1d2I5UkFHbEpuYUMvMllNbk00K0g4?= =?utf-8?B?RFI5cVBTcWJXMTFKTUpLcnVlNWgxM3dEaFNFRGRZeFZyRSs3WVdoNktVdzI4?= =?utf-8?B?ZE82Wk9pSTBSNW9zRllxWlpGM2k5eVphZ0trWGt1bk16ek4vVFQrdVU5ekRK?= =?utf-8?B?UUVYUDRSRk9LSHV6QmZGVHg2TlB4dGgyL3VGSVpjWWhQRGkzZnh3L2Y3aEs2?= =?utf-8?B?NXEzekNNRWV5NUdteGF0cWR4TVU5N05DdDFyUWU3M3RZY1JiT0E3MzBCSktT?= =?utf-8?B?akF6U3UzMFdYSHlYeFlxd3o1RWRGNWlTUVhrWGpWUkxWTElaeXVPWXNXaVVF?= =?utf-8?B?RTNXdlZtWlNGQldOeFlsRUdXSXVIcVFZQTRhbTZSbkFVbEpvVEZINTBQOUJW?= =?utf-8?B?N0dHQ3dhZG9veE1VS1hIMTJwdmF6VXFNczlSNmI5bEhnUmlkSjFSV0UvWml3?= =?utf-8?B?RUhRZHB5b1F4MEJIK0N5Tkw4OHQ5V3FacnAyS0Y0NExrcUFGbTk3MjNuS0FF?= =?utf-8?B?d0Q5azR1MVR0R2VtcHdhTDd4NzJkWlFOTmVGRlZhVitBTUNnUFdDKy9Td1ps?= =?utf-8?B?akhyM3ltaWN6SS9YWjRRQTVSYVd1U3AyaURKRW10SnhZK1pJVmZqSm9OZm41?= =?utf-8?B?bGtYL3FaY3RtbUJ1U3U1Wml6aVo3M25HSFRHUUZXN1Q2eTEzWmxiUW9oOGRh?= =?utf-8?B?RXVLMDlSdlcxSHZMalRYM3RYYlhqM1dLL0o2cm9KdzI2Wk45TWwrSU43L2hW?= =?utf-8?B?NzQ1T0doT05qcm5MeFZWWlZqWmVwRHViV0thdTlNWEgwanZmSEVIZUFSTFFS?= =?utf-8?B?TER3azBxdVNVM0VLK3dDK3c4aUdzTk9kWTZ3Y3p0MDlSWk8zUzd1WnhvU2g2?= =?utf-8?B?MmxOVEhGQmY4aXpHY1NIcE5WTURkU3M5SHc2bVkzMEhQM3dIMzlCMk5kbkZP?= =?utf-8?B?RVhBTENxbi95ZTkvWXo0NzltV1IxbThuWktMOHM5N0JmbXJWWXRaM3ljbWxH?= =?utf-8?B?YXlXYi9kbi9vbUlXcGd4cERGVlQweXEwYWNBTHpad0tpR1lqbDR4UmdzUjNy?= =?utf-8?B?ZmdDMkVUcUc5ZWZHWEkwcVVpUDQxNHVZaTM4TDlTVThxSjc2SUVwWmVOTVAv?= =?utf-8?B?YjAzVlpqNk0xYlNUZmtqZ2Q2UTVTWUgzcXpXeFNjdDlvN2pGeGJLUT09?= X-OriginatorOrg: garyguo.net X-MS-Exchange-CrossTenant-Network-Message-Id: 043ba8f0-89fa-4f6c-92fe-08def7a3b59a X-MS-Exchange-CrossTenant-AuthSource: LOAP265MB8560.GBRP265.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2026 12:26:03.3479 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bbc898ad-b10f-4e10-8552-d9377b823d45 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: VUSptJ4Ihc4U8TNY5bRG4w51tYUBpNqJQqFL6SZvWhAEpvTRl4rgFEm559eop2Zf8H+IPnFbh/qX4ExpFQNCMg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: LO0P265MB2891 Convert I/O macros that use `#[macro_export]` + `#[doc(hidden)]` trick to use the `#[macro_export_scoped]` macro. Signed-off-by: Gary Guo --- 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, // }; =20 +use macros::macro_export_scoped; + use crate::{ bindings, prelude::*, @@ -1673,8 +1675,7 @@ pub unsafe fn project_view( /// let nested: Mmio<'_, u32> =3D io_project!(whole, .field); /// # Ok::<(), Error>(()) } /// ``` -#[macro_export] -#[doc(hidden)] +#[macro_export_scoped] macro_rules! io_project { ($io:expr, $($proj:tt)*) =3D> {{ #[allow(unused)] @@ -1688,8 +1689,6 @@ macro_rules! io_project { unsafe { view.project_view(ptr) } }}; } -#[doc(inline)] -pub use crate::io_project; =20 /// Read from I/O memory. /// @@ -1707,15 +1706,12 @@ macro_rules! io_project { /// let field: u32 =3D 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)*) =3D> { - $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; =20 /// 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]) =3D> { - $crate::io::Io::write_val($crate::io_project!($io, $($proj)*), $va= l) + $crate::io::Io::write_val($crate::io::io_project!($io, $($proj)*),= $val) }; (@parse [$io:expr] [$($proj:tt)*] [.$field:tt $($rest:tt)*]) =3D> { - $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] $($res= t:tt)*]) =3D> { - $crate::io_write!(@parse [$io] [$($proj)* [$flavor: $index]] [$($r= est)*]) + $crate::io::io_write!(@parse [$io] [$($proj)* [$flavor: $index]] [= $($rest)*]) }; ($io:expr, $($rest:tt)*) =3D> { - $crate::io_write!(@parse [$io] [] [$($rest)*]) + $crate::io::io_write!(@parse [$io] [] [$($rest)*]) }; } -#[doc(inline)] -pub use crate::io_write; --=20 2.54.0