mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #93742 - Mark-Simulacrum:skip-rustc-docs-complete, r=pietroalbini

Browse Source 
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`
This commit is contained in:
Matthias Krüger 2022-02-11 07:48:04 +01:00 committed by GitHub
commit b8da6f4ce4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/tools/build-manifest/src/main.rs
View File

@ -386,7 +386,10 @@ fn add_profiles_to(&mut self, manifest: &mut Manifest) {
// 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"]);
}
}