Skip to content

Commit 2206218

Browse files
committed
Remove rustc-dev from the default nightly components
It was already filtered from other branches, but we only kept it in nightly's default to ease the transition. Now that the separation of rust-std/rustc-dev has reached the 1.40 release, it seems like a good time for that transition to end.
1 parent 01a4650 commit 2206218

File tree

1 file changed

+3
-13
lines changed
  • src/tools/build-manifest/src

1 file changed

+3
-13
lines changed

Diff for: src/tools/build-manifest/src/main.rs

+3-13
Original file line numberDiff line numberDiff line change
@@ -453,10 +453,10 @@ impl Builder {
453453
"lldb-preview", "rust-analysis", "miri-preview"
454454
]);
455455

456-
// The compiler libraries are not stable for end users, but `rustc-dev` was only recently
457-
// split out of `rust-std`. We'll include it by default as a transition for nightly users.
456+
// The compiler libraries are not stable for end users, and they're also huge, so we only
457+
// `rustc-dev` for nightly users, and only in the "complete" profile. It's still possible
458+
// for users to install the additional component manually, if needed.
458459
if self.rust_release == "nightly" {
459-
self.extend_profile("default", &mut manifest.profiles, &["rustc-dev"]);
460460
self.extend_profile("complete", &mut manifest.profiles, &["rustc-dev"]);
461461
}
462462
}
@@ -514,15 +514,6 @@ impl Builder {
514514
components.push(host_component("rust-mingw"));
515515
}
516516

517-
// The compiler libraries are not stable for end users, but `rustc-dev` was only recently
518-
// split out of `rust-std`. We'll include it by default as a transition for nightly users,
519-
// but ship it as an optional component on the beta and stable channels.
520-
if self.rust_release == "nightly" {
521-
components.push(host_component("rustc-dev"));
522-
} else {
523-
extensions.push(host_component("rustc-dev"));
524-
}
525-
526517
// Tools are always present in the manifest,
527518
// but might be marked as unavailable if they weren't built.
528519
extensions.extend(vec![
@@ -542,7 +533,6 @@ impl Builder {
542533
);
543534
extensions.extend(
544535
HOSTS.iter()
545-
.filter(|&&target| target != host)
546536
.map(|target| Component::from_str("rustc-dev", target))
547537
);
548538
extensions.push(Component::from_str("rust-src", "*"));

0 commit comments

Comments
 (0)