| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20250322-rust-analyzer-host-v4-7-1f51f9c907eb@gmail.com>
Date: Sat, 22 Mar 2025 09:23:42 -0400
From: Tamir Duberstein <tamird@...il.com>
To: Miguel Ojeda <ojeda@...nel.org>, Alex Gaynor <alex.gaynor@...il.com>,
Boqun Feng <boqun.feng@...il.com>, Gary Guo <gary@...yguo.net>,
Björn Roy Baron <bjorn3_gh@...tonmail.com>,
Benno Lossin <benno.lossin@...ton.me>,
Andreas Hindborg <a.hindborg@...nel.org>, Alice Ryhl <aliceryhl@...gle.com>,
Trevor Gross <tmgross@...ch.edu>, Danilo Krummrich <dakr@...nel.org>,
Boris-Chengbiao Zhou <bobo1239@....de>, Kees Cook <kees@...nel.org>,
Fiona Behrens <me@...enk.dev>
Cc: rust-for-linux@...r.kernel.org, linux-kernel@...r.kernel.org,
Lukas Wirth <lukas.wirth@...rous-systems.com>,
Tamir Duberstein <tamird@...il.com>
Subject: [PATCH v4 07/11] scripts: generate_rust_analyzer.py: identify
crates explicitly
Use the return of `append_crate` to declare dependency on that crate.
This allows multiple crates with the same display_name be defined, which
we'll use to define host crates separately from target crates.
Reviewed-by: Fiona Behrens <me@...enk.dev>
Signed-off-by: Tamir Duberstein <tamird@...il.com>
---
scripts/generate_rust_analyzer.py | 70 +++++++++++++++++++--------------------
1 file changed, 34 insertions(+), 36 deletions(-)
diff --git a/scripts/generate_rust_analyzer.py b/scripts/generate_rust_analyzer.py
index 1ee079c6d916..de1193117161 100755
--- a/scripts/generate_rust_analyzer.py
+++ b/scripts/generate_rust_analyzer.py
@@ -68,17 +68,14 @@ def generate_crates(
line = line.replace("\n", "")
cfg.append(line)
- # Now fill the crates list -- dependencies need to come first.
- #
- # Avoid O(n^2) iterations by keeping a map of indexes.
+ # Now fill the crates list.
crates: List[Crate] = []
- crates_indexes: Dict[str, int] = {}
crates_cfgs = args_crates_cfgs(cfgs)
def build_crate(
display_name: str,
root_module: pathlib.Path,
- deps: List[str],
+ deps: List[Dependency],
cfg: List[str] = [],
is_workspace_member: bool = True,
) -> Crate:
@@ -86,7 +83,7 @@ def generate_crates(
"display_name": display_name,
"root_module": str(root_module),
"is_workspace_member": is_workspace_member,
- "deps": [{"crate": crates_indexes[dep], "name": dep} for dep in deps],
+ "deps": deps,
"cfg": cfg,
"edition": "2021",
"env": {
@@ -94,27 +91,28 @@ def generate_crates(
},
}
- def register_crate(crate: Crate) -> None:
- crates_indexes[crate["display_name"]] = len(crates)
+ def register_crate(crate: Crate) -> Dependency:
+ index = len(crates)
crates.append(crate)
+ return {"crate": index, "name": crate["display_name"]}
def append_crate(
display_name: str,
root_module: pathlib.Path,
- deps: List[str],
+ deps: List[Dependency],
cfg: List[str] = [],
is_workspace_member: bool = True,
- ) -> None:
- register_crate(
+ ) -> Dependency:
+ return register_crate(
build_crate(display_name, root_module, deps, cfg, is_workspace_member)
)
def append_proc_macro_crate(
display_name: str,
root_module: pathlib.Path,
- deps: List[str],
+ deps: List[Dependency],
cfg: List[str] = [],
- ) -> None:
+ ) -> Dependency:
crate = build_crate(display_name, root_module, deps, cfg)
proc_macro_dylib_name = subprocess.check_output(
[os.environ["RUSTC"], "--print", "file-names", "--crate-name", display_name, "--crate-type", "proc-macro", "-"],
@@ -125,14 +123,14 @@ def generate_crates(
"is_proc_macro": True,
"proc_macro_dylib_path": str(objtree / "rust" / proc_macro_dylib_name),
}
- register_crate(proc_macro_crate)
+ return register_crate(proc_macro_crate)
def append_sysroot_crate(
display_name: str,
- deps: List[str],
+ deps: List[Dependency],
cfg: List[str] = [],
- ) -> None:
- register_crate(
+ ) -> Dependency:
+ return register_crate(
build_crate(
display_name,
sysroot_src / display_name / "src" / "lib.rs",
@@ -145,47 +143,47 @@ 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)`.
- append_sysroot_crate("core", [], cfg=crates_cfgs.get("core", []))
- append_sysroot_crate("alloc", ["core"])
- append_sysroot_crate("std", ["alloc", "core"])
- append_sysroot_crate("proc_macro", ["core", "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])
- append_crate(
+ compiler_builtins = append_crate(
"compiler_builtins",
srctree / "rust" / "compiler_builtins.rs",
[],
)
- append_proc_macro_crate(
+ macros = append_proc_macro_crate(
"macros",
srctree / "rust" / "macros" / "lib.rs",
- ["std", "proc_macro"],
+ [std, proc_macro],
)
- append_crate(
+ build_error = append_crate(
"build_error",
srctree / "rust" / "build_error.rs",
- ["core", "compiler_builtins"],
+ [core, compiler_builtins],
)
- append_proc_macro_crate(
+ pin_init_internal = append_proc_macro_crate(
"pin_init_internal",
srctree / "rust" / "pin-init" / "internal" / "src" / "lib.rs",
[],
cfg=["kernel"],
)
- append_crate(
+ pin_init = append_crate(
"pin_init",
srctree / "rust" / "pin-init" / "src" / "lib.rs",
- ["core", "pin_init_internal", "macros"],
+ [core, pin_init_internal, macros],
cfg=["kernel"],
)
def append_crate_with_generated(
display_name: str,
- deps: List[str],
- ) -> None:
+ deps: List[Dependency],
+ ) -> Dependency:
crate = build_crate(
display_name,
srctree / "rust" / display_name / "lib.rs",
@@ -203,11 +201,11 @@ def generate_crates(
"exclude_dirs": [],
}
}
- register_crate(crate_with_generated)
+ return register_crate(crate_with_generated)
- append_crate_with_generated("bindings", ["core"])
- append_crate_with_generated("uapi", ["core"])
- append_crate_with_generated("kernel", ["core", "macros", "build_error", "bindings", "pin_init", "uapi"])
+ bindings = append_crate_with_generated("bindings", [core])
+ uapi = append_crate_with_generated("uapi", [core])
+ kernel = append_crate_with_generated("kernel", [core, macros, build_error, bindings, pin_init, uapi])
def is_root_crate(build_file: pathlib.Path, target: str) -> bool:
try:
@@ -237,7 +235,7 @@ def generate_crates(
append_crate(
name,
path,
- ["core", "kernel"],
+ [core, kernel],
cfg=cfg,
)
--
2.48.1
Powered by blists - more mailing lists