diff options
| author | Ariel Ben-Yehuda <arielb1@mail.tau.ac.il> | 2017-08-29 21:41:02 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-29 21:41:02 +0000 |
| commit | 294ce22f768b0e5941331fc949d56e3d864bee4a (patch) | |
| tree | 03c98f321e2e2c54b4d7c81e6734e0c5cffd87ff | |
| parent | 588f83324d90bf46ee72b06efdcfc6ce2c01211d (diff) | |
| parent | d66f0c2072d164c182d4eaf8d1db33864936fbd7 (diff) | |
| download | rust-294ce22f768b0e5941331fc949d56e3d864bee4a.tar.gz rust-294ce22f768b0e5941331fc949d56e3d864bee4a.zip | |
Rollup merge of #44141 - nrc:rls-preview-beta, r=alexcrichton
Rename the rls component to rls-preview on beta/stable Background is that we will have automatic renaming with the next rustup release. We'll then rename rls to rls-preview. In the meantime, this ensures beta/stable users will always have rls-preview. r? @alexcrichton
| -rw-r--r-- | src/tools/build-manifest/src/main.rs | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs index 7a09ae48b91..e2be021e7cc 100644 --- a/src/tools/build-manifest/src/main.rs +++ b/src/tools/build-manifest/src/main.rs @@ -239,7 +239,12 @@ impl Builder { self.package("rust-std", &mut manifest.pkg, TARGETS); self.package("rust-docs", &mut manifest.pkg, TARGETS); self.package("rust-src", &mut manifest.pkg, &["*"]); - self.package("rls", &mut manifest.pkg, HOSTS); + let rls_package_name = if self.rust_release == "nightly" { + "rls" + } else { + "rls-preview" + }; + self.package(rls_package_name, &mut manifest.pkg, HOSTS); self.package("rust-analysis", &mut manifest.pkg, TARGETS); let mut pkg = Package { @@ -276,7 +281,7 @@ impl Builder { } extensions.push(Component { - pkg: "rls".to_string(), + pkg: rls_package_name.to_string(), target: host.to_string(), }); extensions.push(Component { @@ -353,7 +358,7 @@ impl Builder { format!("rust-src-{}.tar.gz", self.rust_release) } else if component == "cargo" { format!("cargo-{}-{}.tar.gz", self.cargo_release, target) - } else if component == "rls" { + } else if component == "rls" || component == "rls-preview" { format!("rls-{}-{}.tar.gz", self.rls_release, target) } else { format!("{}-{}-{}.tar.gz", component, self.rust_release, target) @@ -363,7 +368,7 @@ impl Builder { fn cached_version(&self, component: &str) -> &str { if component == "cargo" { &self.cargo_version - } else if component == "rls" { + } else if component == "rls" || component == "rls-preview" { &self.rls_version } else { &self.rust_version |