Rollup merge of rust-lang#38398 - ollie27:patch-1, r=alexcrichton

alexcrichton · alexcrichton · commit 210411105edc · 2016-12-20T12:59:05.000-08:00
rustbuild: Stop building docs for libtest by default They cause the search index from the std docs to get overwritten just like rust-lang#34800. Part of rust-lang#38319.
diff --git a/src/bootstrap/step.rs b/src/bootstrap/step.rs
@@ -455,7 +455,7 @@ pub fn build_rules(build: &Build) -> Rules {
     for (krate, path, default) in krates("test_shim") {
         rules.doc(&krate.doc_step, path)
              .dep(|s| s.name("libtest"))
-             .default(default && build.config.docs)
+             .default(default && build.config.compiler_docs)
              .run(move |s| doc::test(build, s.stage, s.target));
     }
     for (krate, path, default) in krates("rustc-main") {

Original file line number	Diff line number	Diff line change
`@@ -455,7 +455,7 @@ pub fn build_rules(build: &Build) -> Rules {`
`455`	`455`	`for (krate, path, default) in krates("test_shim") {`
`456`	`456`	`rules.doc(&krate.doc_step, path)`
`457`	`457`	`.dep(\|s\| s.name("libtest"))`
`458`		`- .default(default && build.config.docs)`
	`458`	`+ .default(default && build.config.compiler_docs)`
`459`	`459`	`.run(move \|s\| doc::test(build, s.stage, s.target));`
`460`	`460`	`}`
`461`	`461`	`for (krate, path, default) in krates("rustc-main") {`