Skip to content

Commit b8da6f4

Browse files
authored
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`
2 parents 8611e29 + 8742baf commit b8da6f4

File tree

1 file changed

+4
-1
lines changed
  • src/tools/build-manifest/src

1 file changed

+4
-1
lines changed

src/tools/build-manifest/src/main.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,10 @@ impl Builder {
386386
// for users to install the additional component manually, if needed.
387387
if self.versions.channel() == "nightly" {
388388
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"]);
390393
}
391394
}
392395

0 commit comments

Comments
 (0)