From: "Jesung Yang" <y.j3ms.n@gmail.com>
To: "Tamir Duberstein" <tamird@kernel.org>,
"Miguel Ojeda" <ojeda@kernel.org>,
"Boqun Feng" <boqun.feng@gmail.com>,
"Gary Guo" <gary@garyguo.net>,
"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>,
"Jesung Yang" <y.j3ms.n@gmail.com>
Cc: <rust-for-linux@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
"Nathan Chancellor" <nathan@kernel.org>,
"Nicolas Schier" <nsc@kernel.org>,
"Linux Kbuild mailing list" <linux-kbuild@vger.kernel.org>
Subject: Re: [PATCH v2 2/2] scripts: generate_rust_analyzer.py: reduce cfg plumbing
Date: Wed, 21 Jan 2026 10:16:03 +0900 [thread overview]
Message-ID: <DFTVC1IH8KM0.VR14LX627BWD@gmail.com> (raw)
In-Reply-To: <20260120-rust-analyzer-pin-init-duplication-v2-2-a1c76f0d3bef@kernel.org>
On Wed Jan 21, 2026 at 1:10 AM KST, Tamir Duberstein wrote:
> Centralize `cfg` lookup in `append_crate` to avoid having to do so for
> each crate. Remove hardcoded `cfg`s for `pin-init{,-internal}` now that
> these are passed from `rust/Makefile`.
>
> Signed-off-by: Tamir Duberstein <tamird@kernel.org>
> ---
> scripts/generate_rust_analyzer.py | 13 +++++--------
> 1 file changed, 5 insertions(+), 8 deletions(-)
>
> diff --git a/scripts/generate_rust_analyzer.py b/scripts/generate_rust_analyzer.py
> index 147d0cc94068..b96d3cbe3df1 100755
> --- a/scripts/generate_rust_analyzer.py
> +++ b/scripts/generate_rust_analyzer.py
> @@ -35,7 +35,9 @@ def generate_crates(srctree, objtree, sysroot_src, external_src, cfgs, core_edit
> crates_indexes = {}
> crates_cfgs = args_crates_cfgs(cfgs)
>
> - def append_crate(display_name, root_module, deps, cfg=[], is_workspace_member=True, is_proc_macro=False, edition="2021"):
> + def append_crate(display_name, root_module, deps, cfg=None, is_workspace_member=True, is_proc_macro=False, edition="2021"):
> + if cfg is None:
> + cfg = crates_cfgs.get(display_name, [])
Could we add a brief comment explaining how the behavior of
`append_crate` changes according to the `cfg` parameter? Since `None`
and an empty list have different effects, documenting that distinction
would make the intended behavior clearer.
This would also help later when we add proper Python docstrings.
Thanks!
Best regards,
Jesung
> crate = {
> "display_name": display_name,
> "root_module": str(root_module),
> @@ -60,7 +62,7 @@ def generate_crates(srctree, objtree, sysroot_src, external_src, cfgs, core_edit
> def append_sysroot_crate(
> display_name,
> deps,
> - cfg=[],
> + cfg=None,
> edition="2021",
> ):
> append_crate(
> @@ -75,7 +77,7 @@ def generate_crates(srctree, objtree, sysroot_src, external_src, cfgs, core_edit
> # NB: sysroot crates reexport items from one another so setting up our transitive dependencies
> # here is important for ensuring that rust-analyzer can resolve symbols. The sources of truth
> # for this dependency graph are `(sysroot_src / crate / "Cargo.toml" for crate in crates)`.
> - append_sysroot_crate("core", [], cfg=crates_cfgs.get("core", []), edition=core_edition)
> + append_sysroot_crate("core", [], edition=core_edition)
> append_sysroot_crate("alloc", ["core"])
> append_sysroot_crate("std", ["alloc", "core"])
> append_sysroot_crate("proc_macro", ["core", "std"])
> @@ -90,21 +92,18 @@ def generate_crates(srctree, objtree, sysroot_src, external_src, cfgs, core_edit
> "proc_macro2",
> srctree / "rust" / "proc-macro2" / "lib.rs",
> ["core", "alloc", "std", "proc_macro"],
> - cfg=crates_cfgs["proc_macro2"],
> )
>
> append_crate(
> "quote",
> srctree / "rust" / "quote" / "lib.rs",
> ["alloc", "proc_macro", "proc_macro2"],
> - cfg=crates_cfgs["quote"],
> )
>
> append_crate(
> "syn",
> srctree / "rust" / "syn" / "lib.rs",
> ["proc_macro", "proc_macro2", "quote"],
> - cfg=crates_cfgs["syn"],
> )
>
> append_crate(
> @@ -124,7 +123,6 @@ def generate_crates(srctree, objtree, sysroot_src, external_src, cfgs, core_edit
> "pin_init_internal",
> srctree / "rust" / "pin-init" / "internal" / "src" / "lib.rs",
> [],
> - cfg=["kernel"],
> is_proc_macro=True,
> )
>
> @@ -132,7 +130,6 @@ def generate_crates(srctree, objtree, sysroot_src, external_src, cfgs, core_edit
> "pin_init",
> srctree / "rust" / "pin-init" / "src" / "lib.rs",
> ["core", "pin_init_internal", "macros"],
> - cfg=["kernel"],
> )
>
> append_crate(
next prev parent reply other threads:[~2026-01-21 1:16 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-20 16:10 [PATCH v2 0/2] rust: reduce duplicate information Tamir Duberstein
2026-01-20 16:10 ` [PATCH v2 1/2] rust: kbuild: extract configs for reuse Tamir Duberstein
2026-01-26 4:15 ` Miguel Ojeda
2026-01-20 16:10 ` [PATCH v2 2/2] scripts: generate_rust_analyzer.py: reduce cfg plumbing Tamir Duberstein
2026-01-21 1:16 ` Jesung Yang [this message]
2026-01-21 14:13 ` Tamir Duberstein
2026-01-21 23:12 ` Jesung Yang
2026-01-22 15:09 ` Tamir Duberstein
2026-01-20 19:27 ` [PATCH v2 0/2] rust: reduce duplicate information Benno Lossin
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=DFTVC1IH8KM0.VR14LX627BWD@gmail.com \
--to=y.j3ms.n@gmail.com \
--cc=a.hindborg@kernel.org \
--cc=aliceryhl@google.com \
--cc=bjorn3_gh@protonmail.com \
--cc=boqun.feng@gmail.com \
--cc=dakr@kernel.org \
--cc=gary@garyguo.net \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lossin@kernel.org \
--cc=nathan@kernel.org \
--cc=nsc@kernel.org \
--cc=ojeda@kernel.org \
--cc=rust-for-linux@vger.kernel.org \
--cc=tamird@kernel.org \
--cc=tmgross@umich.edu \
/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