Skip to content

Commit 399846d

Browse files
authored
Rollup merge of rust-lang#98640 - cuviper:stable-rust-analyzer, r=Mark-Simulacrum
Let rust-analyzer ship on stable, non-preview The consensus on rust-lang/rust-analyzer#12432 seems to be that we are ready for `rust-analyzer` to ship as a rustup component on the beta and stable channels. This won't always be the preferred distribution method, e.g. the VS Code extension will probably still independently update to its weekly releases, but it's still useful to have a component that follows the release train with the rest of the Rust toolchain. So this removes the nightly-only gating on the bundled component, and removes the "-preview" suffix as well by the usual renaming mechanism. cc `@rust-lang/wg-rls-2` `@rust-lang/release`
2 parents 7425fb2 + c29e584 commit 399846d

File tree

3 files changed

+3
-8
lines changed

3 files changed

+3
-8
lines changed

src/bootstrap/dist.rs

-6
Original file line numberDiff line numberDiff line change
@@ -1044,12 +1044,6 @@ impl Step for RustAnalyzer {
10441044
}
10451045

10461046
fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
1047-
// This prevents rust-analyzer from being built for "dist" or "install"
1048-
// on the stable/beta channels. It is a nightly-only tool and should
1049-
// not be included.
1050-
if !builder.build.unstable_features() {
1051-
return None;
1052-
}
10531047
let compiler = self.compiler;
10541048
let target = self.target;
10551049

src/bootstrap/tool.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -780,7 +780,7 @@ tool_extended!((self, builder),
780780
// and this is close enough for now.
781781
RustDemangler, rust_demangler, "src/tools/rust-demangler", "rust-demangler", stable=false, in_tree=true, tool_std=true, {};
782782
Rustfmt, rustfmt, "src/tools/rustfmt", "rustfmt", stable=true, in_tree=true, {};
783-
RustAnalyzer, rust_analyzer, "src/tools/rust-analyzer/crates/rust-analyzer", "rust-analyzer", stable=false, submodule="rust-analyzer", {};
783+
RustAnalyzer, rust_analyzer, "src/tools/rust-analyzer/crates/rust-analyzer", "rust-analyzer", stable=true, submodule="rust-analyzer", {};
784784
);
785785

786786
impl<'a> Builder<'a> {

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ static PKG_INSTALLERS: &[&str] = &["x86_64-apple-darwin", "aarch64-apple-darwin"
184184

185185
static MINGW: &[&str] = &["i686-pc-windows-gnu", "x86_64-pc-windows-gnu"];
186186

187-
static NIGHTLY_ONLY_COMPONENTS: &[&str] = &["miri-preview", "rust-analyzer-preview"];
187+
static NIGHTLY_ONLY_COMPONENTS: &[&str] = &["miri-preview"];
188188

189189
macro_rules! t {
190190
($e:expr) => {
@@ -403,6 +403,7 @@ impl Builder {
403403
rename("rustfmt", "rustfmt-preview");
404404
rename("clippy", "clippy-preview");
405405
rename("miri", "miri-preview");
406+
rename("rust-analyzer", "rust-analyzer-preview");
406407
}
407408

408409
fn rust_package(&mut self, manifest: &Manifest) -> Package {

0 commit comments

Comments
 (0)