about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMark Rousskov <mark.simulacrum@gmail.com>2022-02-07 12:04:00 -0500
committerMark Rousskov <mark.simulacrum@gmail.com>2022-02-07 12:04:00 -0500
commit8742baf156bf96b18b009d57f3c918c8f5bb385d (patch)
tree7eb4e28cb458b0c5ccb0d64571aacbe9f3a49a38
parentc5e414843ebfe25674d8e18a5369d6249fdee741 (diff)
downloadrust-8742baf156bf96b18b009d57f3c918c8f5bb385d.tar.gz
rust-8742baf156bf96b18b009d57f3c918c8f5bb385d.zip
Drop rustc-docs from complete profile
-rw-r--r--src/tools/build-manifest/src/main.rs5
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"]);
         }
     }