Skip to content

Commit c6f362a

Browse files
committed
Let rust-analyzer ship on stable, non-preview
1 parent 00ebeb8 commit c6f362a

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

Diff for: 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

Diff for: 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)