diff options
| author | bors <bors@rust-lang.org> | 2017-01-09 10:58:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-01-09 10:58:08 +0000 |
| commit | 7ef1a69d2e05d86e0893763d2c86677e9c5f3d99 (patch) | |
| tree | 9f0ea3d0eef26d133fa878907776179f40140158 | |
| parent | 6e18e629c29ae4f94c0a16fa2d5259550b0d5e39 (diff) | |
| parent | af00927a8bba04fb4e0a5cc141211d2837f28d03 (diff) | |
| download | rust-7ef1a69d2e05d86e0893763d2c86677e9c5f3d99.tar.gz rust-7ef1a69d2e05d86e0893763d2c86677e9c5f3d99.zip | |
Auto merge of #38929 - Manishearth:compiler-docs, r=alexcrichton
Don't restrict docs in compiler-docs mode Search is broken without this. We want all crates to be included in compiler-docs mode. This was changed in https://github.com/rust-lang/rust/pull/38858, this PR brings that functionality back in compiler-docs mode.
| -rw-r--r-- | src/bootstrap/doc.rs | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs index 2b063741c07..d1c9918a733 100644 --- a/src/bootstrap/doc.rs +++ b/src/bootstrap/doc.rs @@ -151,17 +151,25 @@ pub fn std(build: &Build, stage: u32, target: &str) { let mut cargo = build.cargo(&compiler, Mode::Libstd, target, "doc"); cargo.arg("--manifest-path") .arg(build.src.join("src/rustc/std_shim/Cargo.toml")) - .arg("--features").arg(build.std_features()) - .arg("--no-deps"); - - for krate in &["alloc", "collections", "core", "std", "std_unicode"] { - cargo.arg("-p").arg(krate); - // Create all crate output directories first to make sure rustdoc uses - // relative links. - // FIXME: Cargo should probably do this itself. - t!(fs::create_dir_all(out_dir.join(krate))); + .arg("--features").arg(build.std_features()); + + // We don't want to build docs for internal std dependencies unless + // in compiler-docs mode. When not in that mode, we whitelist the crates + // for which docs must be built. + if build.config.compiler_docs { + cargo.arg("-p").arg("std"); + } else { + cargo.arg("--no-deps"); + for krate in &["alloc", "collections", "core", "std", "std_unicode"] { + cargo.arg("-p").arg(krate); + // Create all crate output directories first to make sure rustdoc uses + // relative links. + // FIXME: Cargo should probably do this itself. + t!(fs::create_dir_all(out_dir.join(krate))); + } } + build.run(&mut cargo); cp_r(&out_dir, &out) } |
