Drop rustc-docs from complete profile

Mark-Simulacrum · Mark-Simulacrum · commit 8742baf156bf · 2022-02-07T12:04:00.000-05:00
diff --git 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"]);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -386,7 +386,10 @@ impl Builder {`
`386`	`386`	`// for users to install the additional component manually, if needed.`
`387`	`387`	`if self.versions.channel() == "nightly" {`
`388`	`388`	`self.extend_profile("complete", &mut manifest.profiles, &["rustc-dev"]);`
`389`		`- self.extend_profile("complete", &mut manifest.profiles, &["rustc-docs"]);`
	`389`	`+ // Do not include the rustc-docs component for now, as it causes`
	`390`	`+ // conflicts with the rust-docs component when installed. See`
	`391`	`+ // #75833.`
	`392`	`+ // self.extend_profile("complete", &mut manifest.profiles, &["rustc-docs"]);`
`390`	`393`	`}`
`391`	`394`	`}`
`392`	`395`