Rollup merge of #105661 - lcnr:evaluate-new, r=compiler-errors

[rust.git] / src / bootstrap / download.rs

diff --git a/src/bootstrap/download.rs b/src/bootstrap/download.rs
index 430b3496d007c7b0c0cffccacd4fbcfd1b7693a3..6ae283f32a5f3a9080edd104a4cf46bc01b3376d 100644 (file)
--- a/src/bootstrap/download.rs
+++ b/src/bootstrap/download.rs
@@ -326,8 +326,6 @@ pub(crate) fn maybe_download_rustfmt(&self) -> Option<PathBuf> {
         }
 
         let filename = format!("rustfmt-{version}-{build}.tar.xz", build = host.triple);
-        // cfg(bootstrap): will need to be changed from `rustfmt-preview` to `rustfmt` the next time you run `bump-stage0`.
-        // See <https://github.com/rust-lang/rust/pull/103648>
         self.download_component(DownloadSource::Dist, filename, "rustfmt-preview", &date, "stage0");
 
         self.fix_bin_or_dylib(&bin_root.join("bin").join("rustfmt"));
@@ -362,6 +360,7 @@ pub(crate) fn download_ci_rustc(&self, commit: &str) {
 
             self.fix_bin_or_dylib(&bin_root.join("bin").join("rustc"));
             self.fix_bin_or_dylib(&bin_root.join("bin").join("rustdoc"));
+            self.fix_bin_or_dylib(&bin_root.join("libexec").join("rust-analyzer-proc-macro-srv"));
             let lib_dir = bin_root.join("lib");
             for lib in t!(fs::read_dir(&lib_dir), lib_dir.display().to_string()) {
                 let lib = t!(lib);