Skip to content

Commit 68cb0a7

Browse files
authored
Rollup merge of #98054 - ferrocene:pa-fix-llvm-download-spaces, r=jyn514
Fix error message for `download-ci-llvm` The error message when `download-ci-llvm` fails includes too many newlines right now: ``` curl: (22) The requested URL returned error: 404 error: failed to download llvm from ci help: old builds get deleted after a certain time help: if trying to compile an old commit of rustc, disable `download-ci-llvm` in config.toml: [llvm] download-ci-llvm = false Build completed unsuccessfully in 0:01:15 ``` This PR fixes the message to include the right amount of newlines: ``` curl: (22) The requested URL returned error: 404 error: failed to download llvm from ci help: old builds get deleted after a certain time help: if trying to compile an old commit of rustc, disable `download-ci-llvm` in config.toml: [llvm] download-ci-llvm = false Build completed unsuccessfully in 0:00:07 ``` r? `@jyn514`
2 parents 3f17cd7 + af8c1e3 commit 68cb0a7

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/bootstrap/native.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -179,13 +179,13 @@ fn download_ci_llvm(builder: &Builder<'_>, llvm_sha: &str) {
179179
let filename = format!("rust-dev-nightly-{}.tar.xz", builder.build.build.triple);
180180
let tarball = rustc_cache.join(&filename);
181181
if !tarball.exists() {
182-
let help_on_error = "error: failed to download llvm from ci\n
183-
\nhelp: old builds get deleted after a certain time
184-
\nhelp: if trying to compile an old commit of rustc, disable `download-ci-llvm` in config.toml:
185-
\n
186-
\n[llvm]
187-
\ndownload-ci-llvm = false
188-
\n
182+
let help_on_error = "error: failed to download llvm from ci
183+
184+
help: old builds get deleted after a certain time
185+
help: if trying to compile an old commit of rustc, disable `download-ci-llvm` in config.toml:
186+
187+
[llvm]
188+
download-ci-llvm = false
189189
";
190190
builder.download_component(base, &format!("{}/{}", url, filename), &tarball, help_on_error);
191191
}

0 commit comments

Comments
 (0)