diff options
| author | Josh Stone <jistone@redhat.com> | 2022-06-28 12:28:01 -0700 |
|---|---|---|
| committer | Josh Stone <jistone@redhat.com> | 2022-06-28 12:28:01 -0700 |
| commit | c6f362a7c53c0f824e96eb8039baaa52dc4b2db0 (patch) | |
| tree | 4b1994a5bdf93a0d8aea8b032b86297e8da4cfaf | |
| parent | 00ebeb87ac87a492bd59ace6bd43d6ad1629ca4e (diff) | |
| download | rust-c6f362a7c53c0f824e96eb8039baaa52dc4b2db0.tar.gz rust-c6f362a7c53c0f824e96eb8039baaa52dc4b2db0.zip | |
Let rust-analyzer ship on stable, non-preview
| -rw-r--r-- | src/bootstrap/dist.rs | 6 | ||||
| -rw-r--r-- | src/tools/build-manifest/src/main.rs | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 8182d2bf8fb..74ec9cab5ca 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -1044,12 +1044,6 @@ impl Step for RustAnalyzer { } fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> { - // This prevents rust-analyzer from being built for "dist" or "install" - // on the stable/beta channels. It is a nightly-only tool and should - // not be included. - if !builder.build.unstable_features() { - return None; - } let compiler = self.compiler; let target = self.target; diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs index 6338e467055..efe3f2b618b 100644 --- a/src/tools/build-manifest/src/main.rs +++ b/src/tools/build-manifest/src/main.rs @@ -184,7 +184,7 @@ static PKG_INSTALLERS: &[&str] = &["x86_64-apple-darwin", "aarch64-apple-darwin" static MINGW: &[&str] = &["i686-pc-windows-gnu", "x86_64-pc-windows-gnu"]; -static NIGHTLY_ONLY_COMPONENTS: &[&str] = &["miri-preview", "rust-analyzer-preview"]; +static NIGHTLY_ONLY_COMPONENTS: &[&str] = &["miri-preview"]; macro_rules! t { ($e:expr) => { @@ -403,6 +403,7 @@ impl Builder { rename("rustfmt", "rustfmt-preview"); rename("clippy", "clippy-preview"); rename("miri", "miri-preview"); + rename("rust-analyzer", "rust-analyzer-preview"); } fn rust_package(&mut self, manifest: &Manifest) -> Package { |