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.
This commit is contained in:
commit
a9313e9077
4 changed files with 5 additions and 7 deletions
|
@ -1191,7 +1191,6 @@ impl Step for Clippy {
|
||||||
|
|
||||||
let mut tarball = Tarball::new(builder, "clippy", &target.triple);
|
let mut tarball = Tarball::new(builder, "clippy", &target.triple);
|
||||||
tarball.set_overlay(OverlayKind::Clippy);
|
tarball.set_overlay(OverlayKind::Clippy);
|
||||||
tarball.is_preview(true);
|
|
||||||
tarball.add_file(clippy, "bin", 0o755);
|
tarball.add_file(clippy, "bin", 0o755);
|
||||||
tarball.add_file(cargoclippy, "bin", 0o755);
|
tarball.add_file(cargoclippy, "bin", 0o755);
|
||||||
tarball.add_legal_and_readme_to("share/doc/clippy");
|
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");
|
.expect("cargo fmt expected to build - essential tool");
|
||||||
let mut tarball = Tarball::new(builder, "rustfmt", &target.triple);
|
let mut tarball = Tarball::new(builder, "rustfmt", &target.triple);
|
||||||
tarball.set_overlay(OverlayKind::Rustfmt);
|
tarball.set_overlay(OverlayKind::Rustfmt);
|
||||||
tarball.is_preview(true);
|
|
||||||
tarball.add_file(rustfmt, "bin", 0o755);
|
tarball.add_file(rustfmt, "bin", 0o755);
|
||||||
tarball.add_file(cargofmt, "bin", 0o755);
|
tarball.add_file(cargofmt, "bin", 0o755);
|
||||||
tarball.add_legal_and_readme_to("share/doc/rustfmt");
|
tarball.add_legal_and_readme_to("share/doc/rustfmt");
|
||||||
|
@ -1550,8 +1548,6 @@ impl Step for Extended {
|
||||||
format!("{}-{}", name, target.triple)
|
format!("{}-{}", name, target.triple)
|
||||||
} else if name == "rust-analyzer" {
|
} else if name == "rust-analyzer" {
|
||||||
"rust-analyzer-preview".to_string()
|
"rust-analyzer-preview".to_string()
|
||||||
} else if name == "clippy" {
|
|
||||||
"clippy-preview".to_string()
|
|
||||||
} else if name == "rust-demangler" {
|
} else if name == "rust-demangler" {
|
||||||
"rust-demangler-preview".to_string()
|
"rust-demangler-preview".to_string()
|
||||||
} else if name == "miri" {
|
} else if name == "miri" {
|
||||||
|
|
|
@ -326,6 +326,8 @@ impl Config {
|
||||||
}
|
}
|
||||||
|
|
||||||
let filename = format!("rustfmt-{version}-{build}.tar.xz", build = host.triple);
|
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.download_component(DownloadSource::Dist, filename, "rustfmt-preview", &date, "stage0");
|
||||||
|
|
||||||
self.fix_bin_or_dylib(&bin_root.join("bin").join("rustfmt"));
|
self.fix_bin_or_dylib(&bin_root.join("bin").join("rustfmt"));
|
||||||
|
|
|
@ -49,10 +49,10 @@ pkg_type! {
|
||||||
Cargo = "cargo",
|
Cargo = "cargo",
|
||||||
HtmlDocs = "rust-docs",
|
HtmlDocs = "rust-docs",
|
||||||
RustAnalysis = "rust-analysis",
|
RustAnalysis = "rust-analysis",
|
||||||
|
Clippy = "clippy",
|
||||||
|
Rustfmt = "rustfmt",
|
||||||
Rls = "rls"; preview = true,
|
Rls = "rls"; preview = true,
|
||||||
RustAnalyzer = "rust-analyzer"; preview = true,
|
RustAnalyzer = "rust-analyzer"; preview = true,
|
||||||
Clippy = "clippy"; preview = true,
|
|
||||||
Rustfmt = "rustfmt"; preview = true,
|
|
||||||
LlvmTools = "llvm-tools"; preview = true,
|
LlvmTools = "llvm-tools"; preview = true,
|
||||||
Miri = "miri"; preview = true,
|
Miri = "miri"; preview = true,
|
||||||
JsonDocs = "rust-docs-json"; preview = true,
|
JsonDocs = "rust-docs-json"; preview = true,
|
||||||
|
|
|
@ -6,7 +6,7 @@ use std::convert::TryInto;
|
||||||
|
|
||||||
const PATH: &str = "src/stage0.json";
|
const PATH: &str = "src/stage0.json";
|
||||||
const COMPILER_COMPONENTS: &[&str] = &["rustc", "rust-std", "cargo"];
|
const COMPILER_COMPONENTS: &[&str] = &["rustc", "rust-std", "cargo"];
|
||||||
const RUSTFMT_COMPONENTS: &[&str] = &["rustfmt-preview"];
|
const RUSTFMT_COMPONENTS: &[&str] = &["rustfmt"];
|
||||||
|
|
||||||
struct Tool {
|
struct Tool {
|
||||||
config: Config,
|
config: Config,
|
||||||
|
|
Loading…
Add table
Reference in a new issue