From c80b484eff512f15c5c154ae50060901b856cd0d Mon Sep 17 00:00:00 2001 From: Joshua Nelson Date: Sat, 26 Nov 2022 15:23:53 -0500 Subject: [PATCH] Revert "Don't set `is_preview` for clippy and rustfmt" This reverts commit fb3e724d7602675f147a9b80e70fb6bd6512738c, which broke `rustup update` for anyone with clippy or rustfmt installed. --- src/bootstrap/dist.rs | 4 ++++ src/bootstrap/download.rs | 2 -- src/tools/build-manifest/src/versions.rs | 4 ++-- src/tools/bump-stage0/src/main.rs | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index a274d7b9aa1..2fef7f65827 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -1191,6 +1191,7 @@ fn run(self, builder: &Builder<'_>) -> Option { let mut tarball = Tarball::new(builder, "clippy", &target.triple); tarball.set_overlay(OverlayKind::Clippy); + tarball.is_preview(true); tarball.add_file(clippy, "bin", 0o755); tarball.add_file(cargoclippy, "bin", 0o755); tarball.add_legal_and_readme_to("share/doc/clippy"); @@ -1288,6 +1289,7 @@ fn run(self, builder: &Builder<'_>) -> Option { .expect("cargo fmt expected to build - essential tool"); let mut tarball = Tarball::new(builder, "rustfmt", &target.triple); tarball.set_overlay(OverlayKind::Rustfmt); + tarball.is_preview(true); tarball.add_file(rustfmt, "bin", 0o755); tarball.add_file(cargofmt, "bin", 0o755); tarball.add_legal_and_readme_to("share/doc/rustfmt"); @@ -1548,6 +1550,8 @@ fn filter(contents: &str, marker: &str) -> String { format!("{}-{}", name, target.triple) } else if name == "rust-analyzer" { "rust-analyzer-preview".to_string() + } else if name == "clippy" { + "clippy-preview".to_string() } else if name == "rust-demangler" { "rust-demangler-preview".to_string() } else if name == "miri" { diff --git a/src/bootstrap/download.rs b/src/bootstrap/download.rs index 430b3496d00..d0f389df973 100644 --- a/src/bootstrap/download.rs +++ b/src/bootstrap/download.rs @@ -326,8 +326,6 @@ pub(crate) fn maybe_download_rustfmt(&self) -> Option { } 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 self.download_component(DownloadSource::Dist, filename, "rustfmt-preview", &date, "stage0"); self.fix_bin_or_dylib(&bin_root.join("bin").join("rustfmt")); diff --git a/src/tools/build-manifest/src/versions.rs b/src/tools/build-manifest/src/versions.rs index 66e6982d6b4..dde9745afb7 100644 --- a/src/tools/build-manifest/src/versions.rs +++ b/src/tools/build-manifest/src/versions.rs @@ -49,10 +49,10 @@ pub(crate) fn all() -> &'static [PkgType] { Cargo = "cargo", HtmlDocs = "rust-docs", RustAnalysis = "rust-analysis", - Clippy = "clippy", - Rustfmt = "rustfmt", Rls = "rls"; preview = true, RustAnalyzer = "rust-analyzer"; preview = true, + Clippy = "clippy"; preview = true, + Rustfmt = "rustfmt"; preview = true, LlvmTools = "llvm-tools"; preview = true, Miri = "miri"; preview = true, JsonDocs = "rust-docs-json"; preview = true, diff --git a/src/tools/bump-stage0/src/main.rs b/src/tools/bump-stage0/src/main.rs index 388203ee463..aa346daf7e5 100644 --- a/src/tools/bump-stage0/src/main.rs +++ b/src/tools/bump-stage0/src/main.rs @@ -6,7 +6,7 @@ const PATH: &str = "src/stage0.json"; const COMPILER_COMPONENTS: &[&str] = &["rustc", "rust-std", "cargo"]; -const RUSTFMT_COMPONENTS: &[&str] = &["rustfmt"]; +const RUSTFMT_COMPONENTS: &[&str] = &["rustfmt-preview"]; struct Tool { config: Config, -- 2.44.0