Skip to content

Commit

Permalink
Rollup merge of rust-lang#93742 - Mark-Simulacrum:skip-rustc-docs-com…
Browse files Browse the repository at this point in the history
…plete, r=pietroalbini

Drop rustc-docs from complete profile

Addresses rust-lang#75833, but does not fully fix it -- we should support side-by-side installation of these ideally, but that's not currently possible.

r? `@pietroalbini`
  • Loading branch information
matthiaskrgr authored Feb 11, 2022
2 parents 8611e29 + 8742baf commit b8da6f4
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/tools/build-manifest/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,10 @@ impl Builder {
// for users to install the additional component manually, if needed.
if self.versions.channel() == "nightly" {
self.extend_profile("complete", &mut manifest.profiles, &["rustc-dev"]);
self.extend_profile("complete", &mut manifest.profiles, &["rustc-docs"]);
// Do not include the rustc-docs component for now, as it causes
// conflicts with the rust-docs component when installed. See
// #75833.
// self.extend_profile("complete", &mut manifest.profiles, &["rustc-docs"]);
}
}

Expand Down

0 comments on commit b8da6f4

Please sign in to comment.