Skip to content

Commit fb3e724

Browse files
committed
Don't set is_preview for clippy and rustfmt
These have been shipped on stable for many years now and it would be very disruptive to ever remove them. Remove the `-preview` suffix from their dist components.
1 parent bebd57a commit fb3e724

File tree

4 files changed

+5
-7
lines changed

4 files changed

+5
-7
lines changed

src/bootstrap/dist.rs

-4
Original file line numberDiff line numberDiff line change
@@ -1153,7 +1153,6 @@ impl Step for Clippy {
11531153

11541154
let mut tarball = Tarball::new(builder, "clippy", &target.triple);
11551155
tarball.set_overlay(OverlayKind::Clippy);
1156-
tarball.is_preview(true);
11571156
tarball.add_file(clippy, "bin", 0o755);
11581157
tarball.add_file(cargoclippy, "bin", 0o755);
11591158
tarball.add_legal_and_readme_to("share/doc/clippy");
@@ -1251,7 +1250,6 @@ impl Step for Rustfmt {
12511250
.expect("cargo fmt expected to build - essential tool");
12521251
let mut tarball = Tarball::new(builder, "rustfmt", &target.triple);
12531252
tarball.set_overlay(OverlayKind::Rustfmt);
1254-
tarball.is_preview(true);
12551253
tarball.add_file(rustfmt, "bin", 0o755);
12561254
tarball.add_file(cargofmt, "bin", 0o755);
12571255
tarball.add_legal_and_readme_to("share/doc/rustfmt");
@@ -1512,8 +1510,6 @@ impl Step for Extended {
15121510
format!("{}-{}", name, target.triple)
15131511
} else if name == "rust-analyzer" {
15141512
"rust-analyzer-preview".to_string()
1515-
} else if name == "clippy" {
1516-
"clippy-preview".to_string()
15171513
} else if name == "rust-demangler" {
15181514
"rust-demangler-preview".to_string()
15191515
} else if name == "miri" {

src/bootstrap/download.rs

+2
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,8 @@ impl Config {
326326
}
327327

328328
let filename = format!("rustfmt-{version}-{build}.tar.xz", build = host.triple);
329+
// cfg(bootstrap): will need to be changed from `rustfmt-preview` to `rustfmt` the next time you run `bump-stage0`.
330+
// See <https://github.com/rust-lang/rust/pull/103648>
329331
self.download_component(DownloadSource::Dist, filename, "rustfmt-preview", &date, "stage0");
330332

331333
self.fix_bin_or_dylib(&bin_root.join("bin").join("rustfmt"));

src/tools/build-manifest/src/versions.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ pkg_type! {
4949
Cargo = "cargo",
5050
HtmlDocs = "rust-docs",
5151
RustAnalysis = "rust-analysis",
52+
Clippy = "clippy",
53+
Rustfmt = "rustfmt",
5254
Rls = "rls"; preview = true,
5355
RustAnalyzer = "rust-analyzer"; preview = true,
54-
Clippy = "clippy"; preview = true,
55-
Rustfmt = "rustfmt"; preview = true,
5656
LlvmTools = "llvm-tools"; preview = true,
5757
Miri = "miri"; preview = true,
5858
JsonDocs = "rust-docs-json"; preview = true,

src/tools/bump-stage0/src/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use std::convert::TryInto;
66

77
const PATH: &str = "src/stage0.json";
88
const COMPILER_COMPONENTS: &[&str] = &["rustc", "rust-std", "cargo"];
9-
const RUSTFMT_COMPONENTS: &[&str] = &["rustfmt-preview"];
9+
const RUSTFMT_COMPONENTS: &[&str] = &["rustfmt"];
1010

1111
struct Tool {
1212
config: Config,

0 commit comments

Comments
 (0)