nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-28 09:44:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Let rust-analyzer ship on stable, non-preview

Browse Source
This commit is contained in:
Josh Stone 2022-06-28 12:28:01 -07:00
parent 00ebeb87ac
commit c6f362a7c5
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bootstrap/dist.rs
View File

@ -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;

3
src/tools/build-manifest/src/main.rs
View File

@ -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 {