diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-02-11 07:48:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-11 07:48:04 +0100 |
| commit | b8da6f4ce4cfdc60885e80edd7a73c5605f560e1 (patch) | |
| tree | c0e53c14a2e318c8b3e7a754b1b1bbdc8925a464 | |
| parent | 8611e292e4cf395fa8892803e8f03dff1c5a41eb (diff) | |
| parent | 8742baf156bf96b18b009d57f3c918c8f5bb385d (diff) | |
| download | rust-b8da6f4ce4cfdc60885e80edd7a73c5605f560e1.tar.gz rust-b8da6f4ce4cfdc60885e80edd7a73c5605f560e1.zip | |
Rollup merge of #93742 - Mark-Simulacrum:skip-rustc-docs-complete, r=pietroalbini
Drop rustc-docs from complete profile Addresses #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`
| -rw-r--r-- | src/tools/build-manifest/src/main.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs index 6b56d6bc4ad..8a62146abfc 100644 --- a/src/tools/build-manifest/src/main.rs +++ b/src/tools/build-manifest/src/main.rs @@ -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"]); } } |