diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-11-25 10:44:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-25 10:44:37 +0100 |
| commit | a9313e9077aa594afe80da8e423de614cada9040 (patch) | |
| tree | 0fd5cab2f4c4cc415968cd1506c5c82abaacdb1c /src/bootstrap | |
| parent | 41e0363055ade59584cff667c79f64937e6ef3f9 (diff) | |
| parent | fb3e724d7602675f147a9b80e70fb6bd6512738c (diff) | |
| download | rust-a9313e9077aa594afe80da8e423de614cada9040.tar.gz rust-a9313e9077aa594afe80da8e423de614cada9040.zip | |
Rollup merge of #103648 - jyn514:no-preview, r=Mark-Simulacrum
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. Based on https://github.com/rust-lang/rust/pull/102565.
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/dist.rs | 4 | ||||
| -rw-r--r-- | src/bootstrap/download.rs | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 2fef7f65827..a274d7b9aa1 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -1191,7 +1191,6 @@ impl Step for Clippy { 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"); @@ -1289,7 +1288,6 @@ impl Step for Rustfmt { .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"); @@ -1550,8 +1548,6 @@ impl Step for Extended { 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 d0f389df973..430b3496d00 100644 --- a/src/bootstrap/download.rs +++ b/src/bootstrap/download.rs @@ -326,6 +326,8 @@ impl Config { } 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")); |