diff options
| author | Jakub Beránek <berykubik@gmail.com> | 2025-08-20 17:09:02 +0200 |
|---|---|---|
| committer | Jakub Beránek <berykubik@gmail.com> | 2025-08-30 15:28:40 +0200 |
| commit | ef569d3ce36d18bbca01a42087f070da0cc58271 (patch) | |
| tree | b6ea5a85c608b73e028cb629f83b73c5dab9e5b8 | |
| parent | 0b3a13c9c05d09b93e6c82163e14108485d6c609 (diff) | |
| download | rust-ef569d3ce36d18bbca01a42087f070da0cc58271.tar.gz rust-ef569d3ce36d18bbca01a42087f070da0cc58271.zip | |
Fix spacing when testing individual crates
| -rw-r--r-- | src/bootstrap/src/core/builder/mod.rs | 2 | ||||
| -rw-r--r-- | src/bootstrap/src/core/builder/tests.rs | 5 | ||||
| -rw-r--r-- | src/bootstrap/src/lib.rs | 10 |
3 files changed, 11 insertions, 6 deletions
diff --git a/src/bootstrap/src/core/builder/mod.rs b/src/bootstrap/src/core/builder/mod.rs index b224a7e7322..627085df812 100644 --- a/src/bootstrap/src/core/builder/mod.rs +++ b/src/bootstrap/src/core/builder/mod.rs @@ -295,7 +295,7 @@ pub fn crate_description(crates: &[impl AsRef<str>]) -> String { return "".into(); } - let mut descr = String::from(" {"); + let mut descr = String::from("{"); descr.push_str(crates[0].as_ref()); for krate in &crates[1..] { descr.push_str(", "); diff --git a/src/bootstrap/src/core/builder/tests.rs b/src/bootstrap/src/core/builder/tests.rs index 921c4016654..687c2fdd7ba 100644 --- a/src/bootstrap/src/core/builder/tests.rs +++ b/src/bootstrap/src/core/builder/tests.rs @@ -2064,9 +2064,10 @@ mod snapshot { [test] CoverageRunRustdoc <host> [test] Pretty <host> [build] rustc 1 <host> -> std 1 <host> + [build] rustc 0 <host> -> std 0 <host> + [build] rustdoc 0 <host> [test] CrateLibrustc <host> [build] rustc 1 <host> -> rustc 2 <host> - [build] rustdoc 0 <host> [test] crate-bootstrap <host> src/tools/coverage-dump [test] crate-bootstrap <host> src/tools/jsondoclint [test] crate-bootstrap <host> src/tools/replace-version-placeholder @@ -2101,7 +2102,7 @@ mod snapshot { [doc] rustc (book) <host> [test] rustc 1 <host> -> lint-docs 2 <host> [doc] rustc 1 <host> -> std 1 <host> crates=[] - [test] rustc 1 <host> -> rustdoc-js-std 2 <host> + [test] rustdoc-js-std 1 <host> [build] rustc 0 <host> -> RustdocTheme 1 <host> [test] rustdoc-theme 1 <host> [test] RustdocUi <host> diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs index 1beeb16b44f..29d0eac670a 100644 --- a/src/bootstrap/src/lib.rs +++ b/src/bootstrap/src/lib.rs @@ -1144,14 +1144,18 @@ impl Build { }; let action = action.into().description(); - let msg = |fmt| format!("{action} stage{actual_stage} {what}{fmt}"); + let what = what.to_string(); + let msg = |fmt| { + let space = if !what.is_empty() { " " } else { "" }; + format!("{action} stage{actual_stage} {what}{space}{fmt}") + }; let msg = if let Some(target) = target.into() { let build_stage = host_and_stage.stage; let host = host_and_stage.host; if host == target { - msg(format_args!(" (stage{build_stage} -> stage{actual_stage}, {target})")) + msg(format_args!("(stage{build_stage} -> stage{actual_stage}, {target})")) } else { - msg(format_args!(" (stage{build_stage}:{host} -> stage{actual_stage}:{target})")) + msg(format_args!("(stage{build_stage}:{host} -> stage{actual_stage}:{target})")) } } else { msg(format_args!("")) |