[PATCH v5 10/13] scripts: generate_rust_analyzer.py: define host crates

Tamir Duberstein
2025-03-25T20:06:56Z

Define host crates used by the `macros` crate separately from target
crates, now that we can uniquely identify crates with the same name.

This avoids rust-analyzer thinking the host `core` crate has our target
configs applied to it.

Suggested-by: Miguel Ojeda <ojeda@kernel.org>
Link: https://lore.kernel.org/all/CANiq72mw83RmLYeFFoJW6mUUygoyiA_f1ievSC2pmBESsQew+w@mail.gmail.com/
Reviewed-by: Fiona Behrens <me@kloenk.dev>
Reviewed-by: Daniel Almeida <daniel.almeida@collabora.com>
Tested-by: Daniel Almeida <daniel.almeida@collabora.com>
Signed-off-by: Tamir Duberstein <tamird@gmail.com>
---
scripts/generate_rust_analyzer.py | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/scripts/generate_rust_analyzer.py b/scripts/generate_rust_analyzer.py
index 09f5f40d689a..ea4dd68d0dd9 100755
--- a/scripts/generate_rust_analyzer.py
+++ b/scripts/generate_rust_analyzer.py
@@ -162,10 +162,16 @@ def generate_crates(
# 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)`.
+ host_core = append_sysroot_crate("core", deps=[], cfg=[])
+ host_alloc = append_sysroot_crate("alloc", deps=[host_core], cfg=[])
+ host_std = append_sysroot_crate("std", deps=[host_alloc, host_core], cfg=[])
+ host_proc_macro = append_sysroot_crate(
+ "proc_macro",
+ deps=[host_core, host_std],
+ cfg=[],
+ )
+
core = append_sysroot_crate("core", deps=[], cfg=crates_cfgs["core"])
- alloc = append_sysroot_crate("alloc", deps=[core], cfg=[])
- std = append_sysroot_crate("std", deps=[alloc, core], cfg=[])
- proc_macro = append_sysroot_crate("proc_macro", deps=[core, std], cfg=[])

compiler_builtins = append_crate(
"compiler_builtins",
@@ -177,7 +183,7 @@ def generate_crates(
macros = append_proc_macro_crate(
"macros",
srctree / "rust" / "macros" / "lib.rs",
- deps=[std, proc_macro],
+ deps=[host_std, host_proc_macro],
cfg=[],
)

--
2.49.0