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

Make compiler-docs only control the default instead of being a hard off-switch

Browse Source 
This also fixes `x doc src/tools/clippy` when compiler-docs is disabled.
This commit is contained in:
Joshua Nelson 2021-11-08 04:16:34 +00:00
parent 90a273b785
commit 5bf3a5dfc7
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bootstrap/dist.rs
View File

@ -96,7 +96,8 @@ impl Step for RustcDocs {
const DEFAULT: bool = true;
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
run.path("src/librustc")
let builder = run.builder;
run.path("rustc-docs").default_condition(builder.config.compiler_docs)
}
fn make_run(run: RunConfig<'_>) {
@ -106,9 +107,6 @@ fn make_run(run: RunConfig<'_>) {
/// Builds the `rustc-docs` installer component.
fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
let host = self.host;
if !builder.config.compiler_docs {
return None;
}
builder.default_doc(&[]);
let mut tarball = Tarball::new(builder, "rustc-docs", &host.triple);

15
src/bootstrap/doc.rs
View File

@ -529,7 +529,7 @@ impl Step for Rustc {
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
let builder = run.builder;
run.krate("rustc-main").path("compiler").default_condition(builder.config.docs)
run.krate("rustc-main").path("compiler").default_condition(builder.config.compiler_docs)
}
fn make_run(run: RunConfig<'_>) {
@ -560,11 +560,6 @@ fn run(self, builder: &Builder<'_>) {
})
.collect::<Vec<_>>();
if !builder.config.compiler_docs && !builder.was_invoked_explicitly::<Self>() {
builder.info("\tskipping - compiler/librustdoc docs disabled");
return;
}
// This is the intended out directory for compiler documentation.
let out = builder.compiler_doc_out(target);
t!(fs::create_dir_all(&out));
@ -674,7 +669,8 @@ impl Step for $tool {
const ONLY_HOSTS: bool = true;
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
run.krate($should_run)
let builder = run.builder;
run.krate($should_run).default_condition(builder.config.compiler_docs)
}
fn make_run(run: RunConfig<'_>) {
@ -705,11 +701,6 @@ fn run(self, builder: &Builder<'_>) {
let compiler = builder.compiler(stage, builder.config.build);
if !builder.config.compiler_docs && !builder.was_invoked_explicitly::<Self>() {
builder.info("\tskipping - compiler/tool docs disabled");
return;
}
// Build rustc docs so that we generate relative links.
builder.ensure(Rustc { stage, target });