From: Gary Guo <gary@garyguo.net>
To: "Qingsong Chen" <changxian.cqs@antgroup.com>
Cc: linux-kernel@vger.kernel.org, 田洪亮 <tate.thl@antgroup.com>,
"Miguel Ojeda" <ojeda@kernel.org>,
"Alex Gaynor" <alex.gaynor@gmail.com>,
"Wedson Almeida Filho" <wedsonaf@gmail.com>,
"Boqun Feng" <boqun.feng@gmail.com>,
"Björn Roy Baron" <bjorn3_gh@protonmail.com>,
"Benno Lossin" <benno.lossin@proton.me>,
"Sergio González Collado" <sergio.collado@gmail.com>,
rust-for-linux@vger.kernel.org
Subject: Re: [PATCH v3] rust: macros: vtable: fix `HAS_*` redefinition (`gen_const_name`)
Date: Wed, 9 Aug 2023 19:48:02 +0100 [thread overview]
Message-ID: <20230809194802.46aa18d0.gary@garyguo.net> (raw)
In-Reply-To: <20230808025404.2053471-1-changxian.cqs@antgroup.com>
On Tue, 08 Aug 2023 10:54:01 +0800
"Qingsong Chen" <changxian.cqs@antgroup.com> wrote:
> If we define the same function name twice in a trait (using `#[cfg]`),
> the `vtable` macro will redefine its `gen_const_name`, e.g. this will
> define `HAS_BAR` twice:
>
> #[vtable]
> pub trait Foo {
> #[cfg(CONFIG_X)]
> fn bar();
>
> #[cfg(not(CONFIG_X))]
> fn bar(x: usize);
> }
>
> Fixes: b44becc5ee80 ("rust: macros: add `#[vtable]` proc macro")
> Signed-off-by: Qingsong Chen <changxian.cqs@antgroup.com>
Reviewed-by: Gary Guo <gary@garyguo.net>
> ---
> v1 -> v2:
> - Use `BTreeSet` and existing `consts` as suggested by Alice and Gary.
> - Reword commit messages as suggested by Miguel.
> v2 -> v3:
> - No need to replace `HashSet` with `BTreeSet`, since `consts` is never
> iterated on.
>
> rust/macros/vtable.rs | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/rust/macros/vtable.rs b/rust/macros/vtable.rs
> index 34d5e7fb5768..ee06044fcd4f 100644
> --- a/rust/macros/vtable.rs
> +++ b/rust/macros/vtable.rs
> @@ -74,6 +74,7 @@ pub(crate) fn vtable(_attr: TokenStream, ts: TokenStream) -> TokenStream {
> const {gen_const_name}: bool = false;",
> )
> .unwrap();
> + consts.insert(gen_const_name);
> }
> } else {
> const_items = "const USE_VTABLE_ATTR: () = ();".to_owned();
next prev parent reply other threads:[~2023-08-09 18:48 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-08 2:54 [PATCH v3] rust: macros: vtable: fix `HAS_*` redefinition (`gen_const_name`) Qingsong Chen
2023-08-09 18:48 ` Gary Guo [this message]
2023-08-09 19:03 ` Andreas Hindborg (Samsung)
2023-08-09 19:05 ` Sergio González Collado
2023-08-09 19:28 ` Miguel Ojeda
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=20230809194802.46aa18d0.gary@garyguo.net \
--to=gary@garyguo.net \
--cc=alex.gaynor@gmail.com \
--cc=benno.lossin@proton.me \
--cc=bjorn3_gh@protonmail.com \
--cc=boqun.feng@gmail.com \
--cc=changxian.cqs@antgroup.com \
--cc=linux-kernel@vger.kernel.org \
--cc=ojeda@kernel.org \
--cc=rust-for-linux@vger.kernel.org \
--cc=sergio.collado@gmail.com \
--cc=tate.thl@antgroup.com \
--cc=wedsonaf@gmail.com \
/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