about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authoronur-ozkan <work@onurozkan.dev>2024-06-14 09:45:02 +0300
committeronur-ozkan <work@onurozkan.dev>2024-06-24 22:04:24 +0300
commit11acf83159edc94edeeafd75eff458d9d584b822 (patch)
treef99b8b0323eb8752da49b870ee9e94e03ba12070 /src/bootstrap
parent5a3e2a4e921097c8f2bf6ea7565f8abe878cdbd4 (diff)
downloadrust-11acf83159edc94edeeafd75eff458d9d584b822.tar.gz
rust-11acf83159edc94edeeafd75eff458d9d584b822.zip
bootstrap: exclude cargo from package metadata
Signed-off-by: onur-ozkan <work@onurozkan.dev>
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/src/core/metadata.rs9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/bootstrap/src/core/metadata.rs b/src/bootstrap/src/core/metadata.rs
index 08a96407a69..12867cb46b8 100644
--- a/src/bootstrap/src/core/metadata.rs
+++ b/src/bootstrap/src/core/metadata.rs
@@ -66,9 +66,6 @@ pub fn build(build: &mut Build) {
 }
 
 /// Invokes `cargo metadata` to get package metadata of each workspace member.
-///
-/// Note that `src/tools/cargo` is no longer a workspace member but we still
-/// treat it as one here, by invoking an additional `cargo metadata` command.
 fn workspace_members(build: &Build) -> impl Iterator<Item = Package> {
     let collect_metadata = |manifest_path| {
         let mut cargo = Command::new(&build.initial_cargo);
@@ -89,12 +86,8 @@ fn workspace_members(build: &Build) -> impl Iterator<Item = Package> {
 
     // Collects `metadata.packages` from all workspaces.
     let packages = collect_metadata("Cargo.toml");
-    let cargo_packages = collect_metadata("src/tools/cargo/Cargo.toml");
     let ra_packages = collect_metadata("src/tools/rust-analyzer/Cargo.toml");
     let bootstrap_packages = collect_metadata("src/bootstrap/Cargo.toml");
 
-    // We only care about the root package from `src/tool/cargo` workspace.
-    let cargo_package = cargo_packages.into_iter().find(|pkg| pkg.name == "cargo").into_iter();
-
-    packages.into_iter().chain(cargo_package).chain(ra_packages).chain(bootstrap_packages)
+    packages.into_iter().chain(ra_packages).chain(bootstrap_packages)
 }