Rollup of 10 pull requests

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);
     }