about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2022-06-13 21:36:00 +0200
committerGitHub <noreply@github.com>2022-06-13 21:36:00 +0200
commit68cb0a7c0be9af6f130674ac70bd1a59844fe642 (patch)
tree31e943b57f9558507909c6dc7c7ea03f63fb9551 /src
parent3f17cd7cbbdecad5c76b9876096d3cfaf0740476 (diff)
parentaf8c1e303f16b032655eaa15587adbdccaac7f3e (diff)
downloadrust-68cb0a7c0be9af6f130674ac70bd1a59844fe642.tar.gz
rust-68cb0a7c0be9af6f130674ac70bd1a59844fe642.zip
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`
Diffstat (limited to 'src')
-rw-r--r--src/bootstrap/native.rs14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs
index 79f2338b7ab..2b0b7f65b07 100644
--- a/src/bootstrap/native.rs
+++ b/src/bootstrap/native.rs
@@ -179,13 +179,13 @@ fn download_ci_llvm(builder: &Builder<'_>, llvm_sha: &str) {
     let filename = format!("rust-dev-nightly-{}.tar.xz", builder.build.build.triple);
     let tarball = rustc_cache.join(&filename);
     if !tarball.exists() {
-        let help_on_error = "error: failed to download llvm from ci\n
-\nhelp: old builds get deleted after a certain time
-\nhelp: if trying to compile an old commit of rustc, disable `download-ci-llvm` in config.toml:
-\n
-\n[llvm]
-\ndownload-ci-llvm = false
-\n
+        let help_on_error = "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
 ";
         builder.download_component(base, &format!("{}/{}", url, filename), &tarball, help_on_error);
     }