From nobody Sun Feb 8 12:37:30 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 43AFA45104B; Tue, 20 Jan 2026 16:10:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768925425; cv=none; b=o65RION42NInXRB0G6y4xytdATrN96tuVcD75+S4UDQhJDUojvvSuVoZoxPXKiF/Yw41nGdJrzm24rvJwuxxyvhRwMBTXSMOJrxj+uiNQfiYT2UiPhu+aj3zPO0PiSflZJCQT8En1gFk4E/MunNx6cJ7jnlCIOO4Ct2k3odfLEE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768925425; c=relaxed/simple; bh=P2p3NqXP+ArKjNSdDe0MPI8oG8RpEk1GplpdfmV7IZM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jGa0+nrub1XB2O5ba6doVBtvYYkYSg58j8vw6QFybIT94IvqThGRXinuZPqaXiwDO7jNbxZd88nrP8r+STOjHEhLaSNawUDy8jSVmLXEpGjRtdMmgNPZHUiQu1TDpeJKVJrYOVS/yK+bJo+vRne3vDbMISeQIiOE/yoJoNLBF88= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=IWpfOe7g; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="IWpfOe7g" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7331EC16AAE; Tue, 20 Jan 2026 16:10:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1768925424; bh=P2p3NqXP+ArKjNSdDe0MPI8oG8RpEk1GplpdfmV7IZM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=IWpfOe7g3rCb1m2HRy6OKGQlWs+M+504DS625lWIFA6cFchRE7FWHs+FdbmXz/7U/ q3q7ZVokhITYZl5syPymv4VhKTIJpTFoiH/ZIxeZSpVs0y5mFd159sfHPjPqrj0RzX /k7Evs12d3Zti4Z9qFrFlmeMOsuslDeEgo6MRMpHdz+KsRG400jEECzxpFn0ZNhunD ikmsPj5eA2SSw7FUH1TjWDuYunkUi7aJgXH3AnMb+npppO5Btgzsrh07oUn0pZ6gOh T84Osron26VaEMreI0mE7nsr6PRG8K2pHe0LisnZ3To9WWuhS6AYNhoNb3t1VMbLCU YJrU7iyaKRqyg== From: Tamir Duberstein Date: Tue, 20 Jan 2026 11:10:11 -0500 Subject: [PATCH v2 2/2] scripts: generate_rust_analyzer.py: reduce cfg plumbing Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260120-rust-analyzer-pin-init-duplication-v2-2-a1c76f0d3bef@kernel.org> References: <20260120-rust-analyzer-pin-init-duplication-v2-0-a1c76f0d3bef@kernel.org> In-Reply-To: <20260120-rust-analyzer-pin-init-duplication-v2-0-a1c76f0d3bef@kernel.org> To: Miguel Ojeda , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Jesung Yang Cc: rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, Nathan Chancellor , Nicolas Schier , Linux Kbuild mailing list , Tamir Duberstein X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openssh-sha256; t=1768925419; l=3423; i=tamird@kernel.org; h=from:subject:message-id; bh=P2p3NqXP+ArKjNSdDe0MPI8oG8RpEk1GplpdfmV7IZM=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgtYz36g7iDMSkY5K7Ab51ksGX7hJgs MRt+XVZTrIzMVIAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QKVsFUjvvspVhVQGyxc4AfxPm60drQ+94NFqE4+L87EvsVgNEPRN7z2U/MiGNLSHeGqVRS+2xQG qz8isAv/7vww= X-Developer-Key: i=tamird@kernel.org; a=openssh; fpr=SHA256:264rPmnnrb+ERkS7DDS3tuwqcJss/zevJRzoylqMsbc 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 Reviewed-by: Jesung Yang --- 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_anal= yzer.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, extern= al_src, cfgs, core_edit crates_indexes =3D {} crates_cfgs =3D args_crates_cfgs(cfgs) =20 - def append_crate(display_name, root_module, deps, cfg=3D[], is_workspa= ce_member=3DTrue, is_proc_macro=3DFalse, edition=3D"2021"): + def append_crate(display_name, root_module, deps, cfg=3DNone, is_works= pace_member=3DTrue, is_proc_macro=3DFalse, edition=3D"2021"): + if cfg is None: + cfg =3D crates_cfgs.get(display_name, []) crate =3D { "display_name": display_name, "root_module": str(root_module), @@ -60,7 +62,7 @@ def generate_crates(srctree, objtree, sysroot_src, extern= al_src, cfgs, core_edit def append_sysroot_crate( display_name, deps, - cfg=3D[], + cfg=3DNone, edition=3D"2021", ): append_crate( @@ -75,7 +77,7 @@ def generate_crates(srctree, objtree, sysroot_src, extern= al_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 symbol= s. The sources of truth # for this dependency graph are `(sysroot_src / crate / "Cargo.toml" f= or crate in crates)`. - append_sysroot_crate("core", [], cfg=3Dcrates_cfgs.get("core", []), ed= ition=3Dcore_edition) + append_sysroot_crate("core", [], edition=3Dcore_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, exte= rnal_src, cfgs, core_edit "proc_macro2", srctree / "rust" / "proc-macro2" / "lib.rs", ["core", "alloc", "std", "proc_macro"], - cfg=3Dcrates_cfgs["proc_macro2"], ) =20 append_crate( "quote", srctree / "rust" / "quote" / "lib.rs", ["alloc", "proc_macro", "proc_macro2"], - cfg=3Dcrates_cfgs["quote"], ) =20 append_crate( "syn", srctree / "rust" / "syn" / "lib.rs", ["proc_macro", "proc_macro2", "quote"], - cfg=3Dcrates_cfgs["syn"], ) =20 append_crate( @@ -124,7 +123,6 @@ def generate_crates(srctree, objtree, sysroot_src, exte= rnal_src, cfgs, core_edit "pin_init_internal", srctree / "rust" / "pin-init" / "internal" / "src" / "lib.rs", [], - cfg=3D["kernel"], is_proc_macro=3DTrue, ) =20 @@ -132,7 +130,6 @@ def generate_crates(srctree, objtree, sysroot_src, exte= rnal_src, cfgs, core_edit "pin_init", srctree / "rust" / "pin-init" / "src" / "lib.rs", ["core", "pin_init_internal", "macros"], - cfg=3D["kernel"], ) =20 append_crate( --=20 2.52.0