diff options
| author | onur-ozkan <work@onurozkan.dev> | 2024-06-27 13:06:10 +0300 |
|---|---|---|
| committer | onur-ozkan <work@onurozkan.dev> | 2024-06-27 14:07:59 +0300 |
| commit | 3457ecc776e87550bc1b1bd4bb686bde8bd5c504 (patch) | |
| tree | 912d59ad506d2a674e5efc36a4d5904100458ca7 /src/bootstrap | |
| parent | 51f6e68559bdef1a1b16b3d026552eab51b5f389 (diff) | |
| download | rust-3457ecc776e87550bc1b1bd4bb686bde8bd5c504.tar.gz rust-3457ecc776e87550bc1b1bd4bb686bde8bd5c504.zip | |
remove unnecessary packages from `metadata::workspace_members`
Currently bootstrap doesn't use any inner paths from rust-analyzer and bootstrap with `ShouldRun::create_or_deps`. Signed-off-by: onur-ozkan <work@onurozkan.dev>
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/src/core/metadata.rs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/bootstrap/src/core/metadata.rs b/src/bootstrap/src/core/metadata.rs index 12867cb46b8..220eb5ba126 100644 --- a/src/bootstrap/src/core/metadata.rs +++ b/src/bootstrap/src/core/metadata.rs @@ -66,7 +66,10 @@ pub fn build(build: &mut Build) { } /// Invokes `cargo metadata` to get package metadata of each workspace member. -fn workspace_members(build: &Build) -> impl Iterator<Item = Package> { +/// +/// This is used to resolve specific crate paths in `fn should_run` to compile +/// particular crate (e.g., `x build sysroot` to build library/sysroot). +fn workspace_members(build: &Build) -> Vec<Package> { let collect_metadata = |manifest_path| { let mut cargo = Command::new(&build.initial_cargo); cargo @@ -85,9 +88,5 @@ fn workspace_members(build: &Build) -> impl Iterator<Item = Package> { }; // Collects `metadata.packages` from all workspaces. - let packages = collect_metadata("Cargo.toml"); - let ra_packages = collect_metadata("src/tools/rust-analyzer/Cargo.toml"); - let bootstrap_packages = collect_metadata("src/bootstrap/Cargo.toml"); - - packages.into_iter().chain(ra_packages).chain(bootstrap_packages) + collect_metadata("Cargo.toml") } |
