[PATCH 0/3] scripts: generate_rust_analyzer: match rust/Makefile

[PATCH 0/3] scripts: generate_rust_analyzer: match rust/Makefile

[Tamir Duberstein]

Minor fixes in this series. The main one is fixing navigation in
pin_init_internal.

This is my first series using tamird@kernel.org; please excude any
hiccups.

Signed-off-by: Tamir Duberstein <tamird@kernel.org>
---
Tamir Duberstein (3):
      scripts: generate_rust_analyzer: Add compiler_builtins -> core dep
      scripts: generate_rust_analyzer: Add pin_init -> compiler_builtins dep
      scripts: generate_rust_analyzer: Add pin_init_internal deps

 scripts/generate_rust_analyzer.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
base-commit: dff64b072708ffef23c117fa1ee1ea59eb417807
change-id: 20250723-rust-analyzer-pin-init-925467269001

Best regards,
--  
Tamir Duberstein <tamird@kernel.org>

[PATCH 1/3] scripts: generate_rust_analyzer: Add compiler_builtins -> core dep

[Tamir Duberstein]

Add a dependency edge from `compiler_builtins` to `core` to
`scripts/generate_rust_analyzer.py` to match `rust/Makefile`. This has
been incorrect since commit 8c4555ccc55c ("scripts: add
`generate_rust_analyzer.py`")

Signed-off-by: Tamir Duberstein <tamird@kernel.org>
---
 scripts/generate_rust_analyzer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/generate_rust_analyzer.py b/scripts/generate_rust_analyzer.py
index 7c3ea2b55041..4639a756a932 100755
--- a/scripts/generate_rust_analyzer.py
+++ b/scripts/generate_rust_analyzer.py
@@ -83,7 +83,7 @@ def generate_crates(srctree, objtree, sysroot_src, external_src, cfgs, core_edit
     append_crate(
         "compiler_builtins",
         srctree / "rust" / "compiler_builtins.rs",
-        [],
+        ["core"],
     )
 
     append_crate(

-- 
2.50.1

[PATCH 2/3] scripts: generate_rust_analyzer: Add pin_init -> compiler_builtins dep

[Tamir Duberstein]

Add a dependency edge from `pin_init` to `compiler_builtins` to
`scripts/generate_rust_analyzer.py` to match `rust/Makefile`. This has
been incorrect since commit d7659acca7a3 ("rust: add pin-init crate
build infrastructure").

Signed-off-by: Tamir Duberstein <tamird@kernel.org>
---
 scripts/generate_rust_analyzer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/generate_rust_analyzer.py b/scripts/generate_rust_analyzer.py
index 4639a756a932..451d00dfc08d 100755
--- a/scripts/generate_rust_analyzer.py
+++ b/scripts/generate_rust_analyzer.py
@@ -110,7 +110,7 @@ def generate_crates(srctree, objtree, sysroot_src, external_src, cfgs, core_edit
     append_crate(
         "pin_init",
         srctree / "rust" / "pin-init" / "src" / "lib.rs",
-        ["core", "pin_init_internal", "macros"],
+        ["core", "compiler_builtins", "pin_init_internal", "macros"],
         cfg=["kernel"],
     )
 

-- 
2.50.1

[PATCH 3/3] scripts: generate_rust_analyzer: Add pin_init_internal deps

[Tamir Duberstein]

Commit d7659acca7a3 ("rust: add pin-init crate build infrastructure")
did not add dependencies to `pin_init_internal`, resulting in broken
navigation. Thus add them now.

Signed-off-by: Tamir Duberstein <tamird@kernel.org>
---
 scripts/generate_rust_analyzer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/generate_rust_analyzer.py b/scripts/generate_rust_analyzer.py
index 451d00dfc08d..229acd4cf1fb 100755
--- a/scripts/generate_rust_analyzer.py
+++ b/scripts/generate_rust_analyzer.py
@@ -102,7 +102,7 @@ def generate_crates(srctree, objtree, sysroot_src, external_src, cfgs, core_edit
     append_crate(
         "pin_init_internal",
         srctree / "rust" / "pin-init" / "internal" / "src" / "lib.rs",
-        [],
+        ["std", "proc_macro"],
         cfg=["kernel"],
         is_proc_macro=True,
     )

-- 
2.50.1

Re: [PATCH 0/3] scripts: generate_rust_analyzer: match rust/Makefile

[Tamir Duberstein]

@Benno would you mind having a look at this series?

On Wed, Jul 23, 2025 at 11:39 AM Tamir Duberstein <tamird@kernel.org> wrote:
>
> Minor fixes in this series. The main one is fixing navigation in
> pin_init_internal.
>
> This is my first series using tamird@kernel.org; please excude any
> hiccups.
>
> Signed-off-by: Tamir Duberstein <tamird@kernel.org>
> ---
> Tamir Duberstein (3):
>       scripts: generate_rust_analyzer: Add compiler_builtins -> core dep
>       scripts: generate_rust_analyzer: Add pin_init -> compiler_builtins dep
>       scripts: generate_rust_analyzer: Add pin_init_internal deps
>
>  scripts/generate_rust_analyzer.py | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> ---
> base-commit: dff64b072708ffef23c117fa1ee1ea59eb417807
> change-id: 20250723-rust-analyzer-pin-init-925467269001
>
> Best regards,
> --
> Tamir Duberstein <tamird@kernel.org>
>

Re: [PATCH 0/3] scripts: generate_rust_analyzer: match rust/Makefile

[Benno Lossin]

On Fri Jan 2, 2026 at 4:25 PM CET, Tamir Duberstein wrote:
> @Benno would you mind having a look at this series?

Oh wow this is an old series! Sorry for missing it.

I'm not maintaining the build system for pin-init, but from my side the
changes look okay. The commit messages are missing some context though:
why do we need these dependency edges? etc. If you fix that you can add

Acked-by: Benno Lossin <lossin@kernel.org>

Also note that this might be different in the new build system.

Cheers,
Benno

> On Wed, Jul 23, 2025 at 11:39 AM Tamir Duberstein <tamird@kernel.org> wrote:
>>
>> Minor fixes in this series. The main one is fixing navigation in
>> pin_init_internal.
>>
>> This is my first series using tamird@kernel.org; please excude any
>> hiccups.
>>
>> Signed-off-by: Tamir Duberstein <tamird@kernel.org>
>> ---
>> Tamir Duberstein (3):
>>       scripts: generate_rust_analyzer: Add compiler_builtins -> core dep
>>       scripts: generate_rust_analyzer: Add pin_init -> compiler_builtins dep
>>       scripts: generate_rust_analyzer: Add pin_init_internal deps
>>
>>  scripts/generate_rust_analyzer.py | 6 +++---
>>  1 file changed, 3 insertions(+), 3 deletions(-)
>> ---
>> base-commit: dff64b072708ffef23c117fa1ee1ea59eb417807
>> change-id: 20250723-rust-analyzer-pin-init-925467269001
>>
>> Best regards,
>> --
>> Tamir Duberstein <tamird@kernel.org>
>>

Re: [PATCH 0/3] scripts: generate_rust_analyzer: match rust/Makefile

[Tamir Duberstein]

On Fri, Jan 2, 2026 at 3:05 PM Benno Lossin <lossin@kernel.org> wrote:
>
> On Fri Jan 2, 2026 at 4:25 PM CET, Tamir Duberstein wrote:
> > @Benno would you mind having a look at this series?
>
> Oh wow this is an old series! Sorry for missing it.
>
> I'm not maintaining the build system for pin-init, but from my side the
> changes look okay. The commit messages are missing some context though:
> why do we need these dependency edges? etc. If you fix that you can add
>
> Acked-by: Benno Lossin <lossin@kernel.org>
>
> Also note that this might be different in the new build system.

Thanks for the review! I think the commits all include answers to
"why": the first two make RA match the actual build and the final one
does the same and also fixes navigation in pin_init_internal; before
this series, go-to-symbol from pin_init_internal to e.g.
proc_macro::TokenStream doesn't work.

Re: [PATCH 0/3] scripts: generate_rust_analyzer: match rust/Makefile

[Benno Lossin]

On Fri Jan 2, 2026 at 9:34 PM CET, Tamir Duberstein wrote:
> On Fri, Jan 2, 2026 at 3:05 PM Benno Lossin <lossin@kernel.org> wrote:
>>
>> On Fri Jan 2, 2026 at 4:25 PM CET, Tamir Duberstein wrote:
>> > @Benno would you mind having a look at this series?
>>
>> Oh wow this is an old series! Sorry for missing it.
>>
>> I'm not maintaining the build system for pin-init, but from my side the
>> changes look okay. The commit messages are missing some context though:
>> why do we need these dependency edges? etc. If you fix that you can add
>>
>> Acked-by: Benno Lossin <lossin@kernel.org>
>>
>> Also note that this might be different in the new build system.
>
> Thanks for the review! I think the commits all include answers to
> "why": the first two make RA match the actual build and the final one
> does the same and also fixes navigation in pin_init_internal; before
> this series, go-to-symbol from pin_init_internal to e.g.
> proc_macro::TokenStream doesn't work.

Ah I missed the explanation since its so few words.

Cheers,
Benno

Re: [PATCH 0/3] scripts: generate_rust_analyzer: match rust/Makefile

[Tamir Duberstein]

On Sat, Jan 3, 2026 at 4:59 AM Benno Lossin <lossin@kernel.org> wrote:
>
> On Fri Jan 2, 2026 at 9:34 PM CET, Tamir Duberstein wrote:
> > On Fri, Jan 2, 2026 at 3:05 PM Benno Lossin <lossin@kernel.org> wrote:
> >>
> >> On Fri Jan 2, 2026 at 4:25 PM CET, Tamir Duberstein wrote:
> >> > @Benno would you mind having a look at this series?
> >>
> >> Oh wow this is an old series! Sorry for missing it.
> >>
> >> I'm not maintaining the build system for pin-init, but from my side the
> >> changes look okay. The commit messages are missing some context though:
> >> why do we need these dependency edges? etc. If you fix that you can add
> >>
> >> Acked-by: Benno Lossin <lossin@kernel.org>
> >>
> >> Also note that this might be different in the new build system.
> >
> > Thanks for the review! I think the commits all include answers to
> > "why": the first two make RA match the actual build and the final one
> > does the same and also fixes navigation in pin_init_internal; before
> > this series, go-to-symbol from pin_init_internal to e.g.
> > proc_macro::TokenStream doesn't work.
>
> Ah I missed the explanation since its so few words.
>
> Cheers,
> Benno

Ack, thanks.

@Miguel could you please take this through rust-next? Assuming that is
OK with Benno, which is my interpretation of his earlier replies.

Re: [PATCH 0/3] scripts: generate_rust_analyzer: match rust/Makefile

[Miguel Ojeda]

On Sat, Jan 3, 2026 at 4:20 PM Tamir Duberstein <tamird@kernel.org> wrote:
>
> Ack, thanks.
>
> @Miguel could you please take this through rust-next? Assuming that is
> OK with Benno, which is my interpretation of his earlier replies.

Sounds good to me, of course.

Cc'ing Jesung, in case he didn't see this one and wants to give it a look/test.

Cheers,
Miguel

Re: [PATCH 1/3] scripts: generate_rust_analyzer: Add compiler_builtins -> core dep

[Jesung Yang]

On Thu Jul 24, 2025 at 12:39 AM KST, Tamir Duberstein wrote:
> Add a dependency edge from `compiler_builtins` to `core` to
> `scripts/generate_rust_analyzer.py` to match `rust/Makefile`. This has
> been incorrect since commit 8c4555ccc55c ("scripts: add
> `generate_rust_analyzer.py`")
>
> Signed-off-by: Tamir Duberstein <tamird@kernel.org>
> ---
>  scripts/generate_rust_analyzer.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/generate_rust_analyzer.py b/scripts/generate_rust_analyzer.py
> index 7c3ea2b55041..4639a756a932 100755
> --- a/scripts/generate_rust_analyzer.py
> +++ b/scripts/generate_rust_analyzer.py
> @@ -83,7 +83,7 @@ def generate_crates(srctree, objtree, sysroot_src, external_src, cfgs, core_edit
>      append_crate(
>          "compiler_builtins",
>          srctree / "rust" / "compiler_builtins.rs",
> -        [],
> +        ["core"],
>      )
>  
>      append_crate(

This looks good, but I think
`Fixes: 8c4555ccc55c ("scripts: add `generate_rust_analyzer.py`")` and
`Cc: stable` tags should be specified.

For the change itself,

Reviewed-by: Jesung Yang <y.j3ms.n@gmail.com>

Best regards,
Jesung

Re: [PATCH 2/3] scripts: generate_rust_analyzer: Add pin_init -> compiler_builtins dep

[Jesung Yang]

On Thu Jul 24, 2025 at 12:39 AM KST, Tamir Duberstein wrote:
> Add a dependency edge from `pin_init` to `compiler_builtins` to
> `scripts/generate_rust_analyzer.py` to match `rust/Makefile`. This has
> been incorrect since commit d7659acca7a3 ("rust: add pin-init crate
> build infrastructure").
>
> Signed-off-by: Tamir Duberstein <tamird@kernel.org>
> ---
>  scripts/generate_rust_analyzer.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/generate_rust_analyzer.py b/scripts/generate_rust_analyzer.py
> index 4639a756a932..451d00dfc08d 100755
> --- a/scripts/generate_rust_analyzer.py
> +++ b/scripts/generate_rust_analyzer.py
> @@ -110,7 +110,7 @@ def generate_crates(srctree, objtree, sysroot_src, external_src, cfgs, core_edit
>      append_crate(
>          "pin_init",
>          srctree / "rust" / "pin-init" / "src" / "lib.rs",
> -        ["core", "pin_init_internal", "macros"],
> +        ["core", "compiler_builtins", "pin_init_internal", "macros"],
>          cfg=["kernel"],
>      )
>  

Similar to above, these tags are needed:

+Fixes: d7659acca7a3 ("rust: add pin-init crate build infrastructure")
+Cc: <stable@...>

For the change itself,

Reviewed-by: Jesung Yang <y.j3ms.n@gmail.com>

Best regards,
Jesung

Re: [PATCH 3/3] scripts: generate_rust_analyzer: Add pin_init_internal deps

[Jesung Yang]

On Thu Jul 24, 2025 at 12:39 AM KST, Tamir Duberstein wrote:
> Commit d7659acca7a3 ("rust: add pin-init crate build infrastructure")
> did not add dependencies to `pin_init_internal`, resulting in broken
> navigation. Thus add them now.
>
> Signed-off-by: Tamir Duberstein <tamird@kernel.org>
> ---
>  scripts/generate_rust_analyzer.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/generate_rust_analyzer.py b/scripts/generate_rust_analyzer.py
> index 451d00dfc08d..229acd4cf1fb 100755
> --- a/scripts/generate_rust_analyzer.py
> +++ b/scripts/generate_rust_analyzer.py
> @@ -102,7 +102,7 @@ def generate_crates(srctree, objtree, sysroot_src, external_src, cfgs, core_edit
>      append_crate(
>          "pin_init_internal",
>          srctree / "rust" / "pin-init" / "internal" / "src" / "lib.rs",
> -        [],
> +        ["std", "proc_macro"],
>          cfg=["kernel"],
>          is_proc_macro=True,
>      )

The recent `syn` rewrite of pin-init [1] covers this as well. How do we
usually handle this kind of overlap?

[1] https://lore.kernel.org/rust-for-linux/20260111122554.2662175-4-lossin@kernel.org/

Best regards,
Jesung

Re: [PATCH 3/3] scripts: generate_rust_analyzer: Add pin_init_internal deps

[Miguel Ojeda]

On Wed, Jan 14, 2026 at 10:26 AM Jesung Yang <y.j3ms.n@gmail.com> wrote:
>
> The recent `syn` rewrite of pin-init [1] covers this as well. How do we
> usually handle this kind of overlap?
>
> [1] https://lore.kernel.org/rust-for-linux/20260111122554.2662175-4-lossin@kernel.org/

It should be fine, when applying that other series later on we will
get a conflict to be resolved, but that's it.

I wonder, though -- should these be applied as fixes? After all, even
the commit hash is provided there, so we could add a Fixes too. They
could also be backported if needed.

Thanks!

Cheers,
Miguel

Re: [PATCH 3/3] scripts: generate_rust_analyzer: Add pin_init_internal deps

[Miguel Ojeda]

On Wed, Jan 14, 2026 at 11:29 AM Miguel Ojeda
<miguel.ojeda.sandonis@gmail.com> wrote:
>
> I wonder, though -- should these be applied as fixes? After all, even
> the commit hash is provided there, so we could add a Fixes too. They
> could also be backported if needed.

Ah, yeah, you already said that in the other two.

In that case, we can take the three of them into `rust-fixes` directly.

Cheers,
Miguel

Re: [PATCH 3/3] scripts: generate_rust_analyzer: Add pin_init_internal deps

[Jesung Yang]

On Thu Jul 24, 2025 at 12:39 AM KST, Tamir Duberstein wrote:
> Commit d7659acca7a3 ("rust: add pin-init crate build infrastructure")
> did not add dependencies to `pin_init_internal`, resulting in broken
> navigation. Thus add them now.
>
> Signed-off-by: Tamir Duberstein <tamird@kernel.org>
> ---
>  scripts/generate_rust_analyzer.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/generate_rust_analyzer.py b/scripts/generate_rust_analyzer.py
> index 451d00dfc08d..229acd4cf1fb 100755
> --- a/scripts/generate_rust_analyzer.py
> +++ b/scripts/generate_rust_analyzer.py
> @@ -102,7 +102,7 @@ def generate_crates(srctree, objtree, sysroot_src, external_src, cfgs, core_edit
>      append_crate(
>          "pin_init_internal",
>          srctree / "rust" / "pin-init" / "internal" / "src" / "lib.rs",
> -        [],
> +        ["std", "proc_macro"],
>          cfg=["kernel"],
>          is_proc_macro=True,
>      )

Reviewed-by: Jesung Yang <y.j3ms.n@gmail.com>

Best regards,
Jesung

Re: [PATCH 3/3] scripts: generate_rust_analyzer: Add pin_init_internal deps

[Tamir Duberstein]

On Wed, Jan 14, 2026 at 5:32 AM Miguel Ojeda
<miguel.ojeda.sandonis@gmail.com> wrote:
>
> On Wed, Jan 14, 2026 at 11:29 AM Miguel Ojeda
> <miguel.ojeda.sandonis@gmail.com> wrote:
> >
> > I wonder, though -- should these be applied as fixes? After all, even
> > the commit hash is provided there, so we could add a Fixes too. They
> > could also be backported if needed.
>
> Ah, yeah, you already said that in the other two.
>
> In that case, we can take the three of them into `rust-fixes` directly.
>
> Cheers,
> Miguel

Sounds good to me. Miguel: do you need me to send a new version with
the Fixes tags, or can they be added in a reply or at apply time?

Re: [PATCH 3/3] scripts: generate_rust_analyzer: Add pin_init_internal deps

[Miguel Ojeda]

On Wed, Jan 14, 2026 at 3:57 PM Tamir Duberstein <tamird@kernel.org> wrote:
>
> Sounds good to me. Miguel: do you need me to send a new version with
> the Fixes tags, or can they be added in a reply or at apply time?

Yeah, they can be added in replies in general -- I will add them, no
worries, thanks!

Fixes: d7659acca7a3 ("rust: add pin-init crate build infrastructure")
Cc: stable@vger.kernel.org

Cheers,
Miguel

Re: [PATCH 0/3] scripts: generate_rust_analyzer: match rust/Makefile

[Miguel Ojeda]

On Wed, Jul 23, 2025 at 5:39 PM Tamir Duberstein <tamird@kernel.org> wrote:
>
> Minor fixes in this series. The main one is fixing navigation in
> pin_init_internal.
>
> This is my first series using tamird@kernel.org; please excude any
> hiccups.
>
> Signed-off-by: Tamir Duberstein <tamird@kernel.org>

Applied to `rust-fixes` (with Fixes and Cc stable) -- thanks everyone!

    [ Tamir elaborates:

      "before this series, go-to-symbol from pin_init_internal to e.g.
       proc_macro::TokenStream doesn't work."

         - Miguel ]

Cheers,
Miguel