Rollup merge of #82106 - jyn514:cleanup-bootstrap, r=Mark-Simulacrum

Remove unnecessary `Option` in `default_doc`

Previously, there were two different ways to encode the same info: `None` or
`Some(&[])`. Now there is only one way, `&[]`.
This commit is contained in:
Jonas Schievink 2021-02-15 16:07:02 +01:00 committed by GitHub
commit 40d85a5f7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 5 deletions

View File

@ -579,8 +579,7 @@ impl<'a> Builder<'a> {
self.run_step_descriptions(&Builder::get_step_descriptions(self.kind), &self.paths);
}
pub fn default_doc(&self, paths: Option<&[PathBuf]>) {
let paths = paths.unwrap_or(&[]);
pub fn default_doc(&self, paths: &[PathBuf]) {
self.run_step_descriptions(&Builder::get_step_descriptions(Kind::Doc), paths);
}

View File

@ -68,7 +68,7 @@ impl Step for Docs {
if !builder.config.docs {
return None;
}
builder.default_doc(None);
builder.default_doc(&[]);
let dest = "share/doc/rust/html";
@ -103,7 +103,7 @@ impl Step for RustcDocs {
if !builder.config.compiler_docs {
return None;
}
builder.default_doc(None);
builder.default_doc(&[]);
let mut tarball = Tarball::new(builder, "rustc-docs", &host.triple);
tarball.set_product_name("Rustc Documentation");

View File

@ -111,7 +111,7 @@ impl Step for Linkcheck {
builder.info(&format!("Linkcheck ({})", host));
builder.default_doc(None);
builder.default_doc(&[]);
let _time = util::timeit(&builder);
try_run(