* Re: [PATCH v3] rust: macros: vtable: fix `HAS_*` redefinition (`gen_const_name`)
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
2023-08-09 19:03 ` Andreas Hindborg (Samsung)
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Gary Guo @ 2023-08-09 18:48 UTC (permalink / raw)
To: Qingsong Chen
Cc: linux-kernel, 田洪亮, Miguel Ojeda, Alex Gaynor,
Wedson Almeida Filho, Boqun Feng, Björn Roy Baron,
Benno Lossin, Sergio González Collado, rust-for-linux
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();
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v3] rust: macros: vtable: fix `HAS_*` redefinition (`gen_const_name`)
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
@ 2023-08-09 19:03 ` Andreas Hindborg (Samsung)
2023-08-09 19:05 ` Sergio González Collado
2023-08-09 19:28 ` Miguel Ojeda
3 siblings, 0 replies; 5+ messages in thread
From: Andreas Hindborg (Samsung) @ 2023-08-09 19:03 UTC (permalink / raw)
To: Qingsong Chen
Cc: linux-kernel, 田洪亮, Miguel Ojeda, Alex Gaynor,
Wedson Almeida Filho, Boqun Feng, Gary Guo, Björn Roy Baron,
Benno Lossin, Sergio González Collado, rust-for-linux
"Qingsong Chen" <changxian.cqs@antgroup.com> writes:
> 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: Andreas Hindborg <a.hindborg@samsung.com>
> ---
> 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();
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v3] rust: macros: vtable: fix `HAS_*` redefinition (`gen_const_name`)
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
2023-08-09 19:03 ` Andreas Hindborg (Samsung)
@ 2023-08-09 19:05 ` Sergio González Collado
2023-08-09 19:28 ` Miguel Ojeda
3 siblings, 0 replies; 5+ messages in thread
From: Sergio González Collado @ 2023-08-09 19:05 UTC (permalink / raw)
To: Qingsong Chen
Cc: linux-kernel, 田洪亮, Miguel Ojeda, Alex Gaynor,
Wedson Almeida Filho, Boqun Feng, Gary Guo, Björn Roy Baron,
Benno Lossin, rust-for-linux
On Tue, 8 Aug 2023 at 04:54, 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: Sergio González Collado<sergio.collado@gmail.com>
> ---
> 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();
> --
> 2.40.1
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v3] rust: macros: vtable: fix `HAS_*` redefinition (`gen_const_name`)
2023-08-08 2:54 [PATCH v3] rust: macros: vtable: fix `HAS_*` redefinition (`gen_const_name`) Qingsong Chen
` (2 preceding siblings ...)
2023-08-09 19:05 ` Sergio González Collado
@ 2023-08-09 19:28 ` Miguel Ojeda
3 siblings, 0 replies; 5+ messages in thread
From: Miguel Ojeda @ 2023-08-09 19:28 UTC (permalink / raw)
To: Qingsong Chen
Cc: linux-kernel, 田洪亮, Miguel Ojeda, Alex Gaynor,
Wedson Almeida Filho, Boqun Feng, Gary Guo, Björn Roy Baron,
Benno Lossin, Sergio González Collado, rust-for-linux
On Tue, Aug 8, 2023 at 4:54 AM 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>
Applied to `rust-fixes`, thanks everyone!
Cheers,
Miguel
^ permalink raw reply [flat|nested] 5+ messages in thread