diff options
author | Josh Stone <jistone@redhat.com> | 2019-10-07 15:49:51 -0700 |
---|---|---|
committer | Mark Rousskov <mark.simulacrum@gmail.com> | 2019-10-15 18:38:18 -0400 |
commit | 4c906dc84ec78fad35405d5c0f2b2d58f9f26288 (patch) | |
tree | cc756ca37581404bb0a4bc8d765f8d2497ef162d | |
parent | 3a05616cb6b6df75fc54094de7f3d4b161ed8521 (diff) | |
download | rust-4c906dc84ec78fad35405d5c0f2b2d58f9f26288.tar.gz |
Add rustc-dev to nightly default and complete profiles
-rw-r--r-- | src/tools/build-manifest/src/main.rs | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs index 97e758f9b82..c0d2deab2f8 100644 --- a/src/tools/build-manifest/src/main.rs +++ b/src/tools/build-manifest/src/main.rs @@ -427,6 +427,13 @@ impl Builder { "rls-preview", "rust-src", "llvm-tools-preview", "lldb-preview", "rust-analysis", "miri-preview" ]); + + // The compiler libraries are not stable for end users, but `rustc-dev` was only recently + // split out of `rust-std`. We'll include it by default as a transition for nightly users. + if self.rust_release == "nightly" { + self.extend_profile("default", &mut manifest.profiles, &["rustc-dev"]); + self.extend_profile("complete", &mut manifest.profiles, &["rustc-dev"]); + } } fn add_renames_to(&self, manifest: &mut Manifest) { @@ -549,6 +556,14 @@ impl Builder { dst.insert(profile_name.to_owned(), pkgs.iter().map(|s| (*s).to_owned()).collect()); } + fn extend_profile(&mut self, + profile_name: &str, + dst: &mut BTreeMap<String, Vec<String>>, + pkgs: &[&str]) { + dst.get_mut(profile_name).expect("existing profile") + .extend(pkgs.iter().map(|s| (*s).to_owned())); + } + fn package(&mut self, pkgname: &str, dst: &mut BTreeMap<String, Package>, |