diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2025-02-16 17:14:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-16 17:14:07 +0100 |
| commit | e802a8cc015436382fc8b125dddc56016fe5e490 (patch) | |
| tree | 0f738690da4ba43604d6e4d121f218d28605dec2 /src | |
| parent | 73744391113ad2b9d0a47e5da1a6b2cd73e1bd1b (diff) | |
| parent | 56f8f48e05a0635f28fa293557aa10c0162b8526 (diff) | |
| download | rust-e802a8cc015436382fc8b125dddc56016fe5e490.tar.gz rust-e802a8cc015436382fc8b125dddc56016fe5e490.zip | |
Rollup merge of #137119 - onur-ozkan:fix-broken-core, r=jieyouxu
fix broken `x {doc, build} core`
Fixes #137115
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/src/core/build_steps/compile.rs | 2 | ||||
| -rw-r--r-- | src/bootstrap/src/core/build_steps/doc.rs | 5 | ||||
| -rw-r--r-- | src/bootstrap/src/core/builder/mod.rs | 12 |
3 files changed, 10 insertions, 9 deletions
diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs index 479327d6369..84cf99b5540 100644 --- a/src/bootstrap/src/core/build_steps/compile.rs +++ b/src/bootstrap/src/core/build_steps/compile.rs @@ -95,7 +95,7 @@ impl Step for Std { const DEFAULT: bool = true; fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> { - run.crate_or_deps("sysroot").path("library").alias("core") + run.crate_or_deps("sysroot").path("library") } fn make_run(run: RunConfig<'_>) { diff --git a/src/bootstrap/src/core/build_steps/doc.rs b/src/bootstrap/src/core/build_steps/doc.rs index dedcc139ae1..23bb47dcc58 100644 --- a/src/bootstrap/src/core/build_steps/doc.rs +++ b/src/bootstrap/src/core/build_steps/doc.rs @@ -572,10 +572,7 @@ impl Step for Std { fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> { let builder = run.builder; - run.crate_or_deps("sysroot") - .path("library") - .alias("core") - .default_condition(builder.config.docs) + run.crate_or_deps("sysroot").path("library").default_condition(builder.config.docs) } fn make_run(run: RunConfig<'_>) { diff --git a/src/bootstrap/src/core/builder/mod.rs b/src/bootstrap/src/core/builder/mod.rs index ecec589fc32..52876c3fb3f 100644 --- a/src/bootstrap/src/core/builder/mod.rs +++ b/src/bootstrap/src/core/builder/mod.rs @@ -127,10 +127,14 @@ impl RunConfig<'_> { pub fn cargo_crates_in_set(&self) -> Vec<String> { let mut crates = Vec::new(); for krate in &self.paths { - let path = krate.assert_single_path(); - let Some(crate_name) = self.builder.crate_paths.get(&path.path) else { - panic!("missing crate for path {}", path.path.display()) - }; + let path = &krate.assert_single_path().path; + + let crate_name = self + .builder + .crate_paths + .get(path) + .unwrap_or_else(|| panic!("missing crate for path {}", path.display())); + crates.push(crate_name.to_string()); } crates |