> On 22 Mar 2025, at 10:23, Tamir Duberstein <tamird@gmail.com> wrote:
>
> 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>
> Signed-off-by: Tamir Duberstein <tamird@gmail.com>
> ---
> scripts/generate_rust_analyzer.py | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/scripts/generate_rust_analyzer.py b/scripts/generate_rust_analyzer.py
> index de1193117161..bd6e321a6aa5 100755
> --- a/scripts/generate_rust_analyzer.py
> +++ b/scripts/generate_rust_analyzer.py
> @@ -143,10 +143,12 @@ 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", [])
> + host_alloc = append_sysroot_crate("alloc", [host_core])
> + host_std = append_sysroot_crate("std", [host_alloc, host_core])
> + host_proc_macro = append_sysroot_crate("proc_macro", [host_core, host_std])
> +
> core = append_sysroot_crate("core", [], cfg=crates_cfgs.get("core", []))
> - alloc = append_sysroot_crate("alloc", [core])
> - std = append_sysroot_crate("std", [alloc, core])
> - proc_macro = append_sysroot_crate("proc_macro", [core, std])
>
> compiler_builtins = append_crate(
> "compiler_builtins",
> @@ -157,7 +159,7 @@ def generate_crates(
> macros = append_proc_macro_crate(
> "macros",
> srctree / "rust" / "macros" / "lib.rs",
> - [std, proc_macro],
> + [host_std, host_proc_macro],
> )
>
> build_error = append_crate(
>
> --
> 2.48.1
>
>
Reviewed-by: Daniel Almeida <daniel.almeida@collabora.com>