diff options
| author | bors <bors@rust-lang.org> | 2025-03-19 12:39:34 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-03-19 12:39:34 +0000 |
| commit | a7fc463dd8fbeca800d4b3efc501069502cffe64 (patch) | |
| tree | 097c6944fd8660666094e1c1f7adfca493dd37dc /src/bootstrap | |
| parent | c4b38a596767c9c6275c937cf3a2d4b9612b4875 (diff) | |
| parent | 3b7faca09c7a2e86390e354e83cb1acac6b3a1fd (diff) | |
| download | rust-a7fc463dd8fbeca800d4b3efc501069502cffe64.tar.gz rust-a7fc463dd8fbeca800d4b3efc501069502cffe64.zip | |
Auto merge of #138693 - matthiaskrgr:rollup-ejq8mwp, r=matthiaskrgr
Rollup of 10 pull requests
Successful merges:
- #136177 (clarify BufRead::{fill_buf, consume} docs)
- #138654 (Remove the regex dependency from coretests)
- #138655 (rustc-dev-guide sync)
- #138656 (Remove double nesting in post-merge workflow)
- #138658 (CI: mirror alpine and centos images to ghcr)
- #138659 (coverage: Don't store a body span in `FunctionCoverageInfo`)
- #138661 (Revert: Add *_value methods to proc_macro lib)
- #138670 (Remove existing AFIDT implementation)
- #138674 (Various codegen_llvm cleanups)
- #138684 (use then in docs for `fuse` to enhance readability)
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/src/core/builder/tests.rs | 2 | ||||
| -rw-r--r-- | src/bootstrap/src/core/metadata.rs | 5 | ||||
| -rw-r--r-- | src/bootstrap/src/lib.rs | 2 |
3 files changed, 2 insertions, 7 deletions
diff --git a/src/bootstrap/src/core/builder/tests.rs b/src/bootstrap/src/core/builder/tests.rs index 343fbcc0286..b062781e68a 100644 --- a/src/bootstrap/src/core/builder/tests.rs +++ b/src/bootstrap/src/core/builder/tests.rs @@ -655,7 +655,7 @@ mod dist { let mut builder = Builder::new(&build); builder.run_step_descriptions( &Builder::get_step_descriptions(Kind::Build), - &["compiler/rustc".into(), "std".into()], + &["compiler/rustc".into(), "library".into()], ); assert_eq!(builder.config.stage, 2); diff --git a/src/bootstrap/src/core/metadata.rs b/src/bootstrap/src/core/metadata.rs index 3720602dc77..2706aba5ffc 100644 --- a/src/bootstrap/src/core/metadata.rs +++ b/src/bootstrap/src/core/metadata.rs @@ -62,11 +62,6 @@ pub fn build(build: &mut Build) { let relative_path = krate.local_path(build); build.crates.insert(name.clone(), krate); let existing_path = build.crate_paths.insert(relative_path, name); - // `literal-escaper` is both a dependency of `compiler/rustc_lexer` and of - // `library/proc-macro`, making it appear multiple times in the workspace. - if existing_path.as_deref() == Some("literal-escaper") { - continue; - } assert!( existing_path.is_none(), "multiple crates with the same path: {}", diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs index 1943d0299b9..1fba17dcf30 100644 --- a/src/bootstrap/src/lib.rs +++ b/src/bootstrap/src/lib.rs @@ -716,7 +716,7 @@ impl Build { features.push("llvm"); } // keep in sync with `bootstrap/compile.rs:rustc_cargo_env` - if self.config.rust_randomize_layout && check("rustc_randomized_layouts") { + if self.config.rust_randomize_layout { features.push("rustc_randomized_layouts"); } |
