From 856f68fa14806a6395e71a9ab6c5101914aa1ae2 Mon Sep 17 00:00:00 2001
From: mark <markm@cs.wisc.edu>
Date: Mon, 27 Jul 2020 23:02:34 -0500
Subject: [PATCH 1/2] reenable tests after moving std

---
 src/bootstrap/builder/tests.rs |  4 +---
 src/bootstrap/test.rs          | 19 +++++++++----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/bootstrap/builder/tests.rs b/src/bootstrap/builder/tests.rs
index 4293844fcbf94..111971534ba5e 100644
--- a/src/bootstrap/builder/tests.rs
+++ b/src/bootstrap/builder/tests.rs
@@ -546,9 +546,7 @@ mod dist {
         );
     }
 
-    //FIXME(mark-i-m): reinstate this test when things are fixed...
-    //#[test]
-    #[allow(dead_code)]
+    #[test]
     fn test_docs() {
         // Behavior of `x.py test` doing various documentation tests.
         let mut config = configure(&[], &[]);
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index addc51faa5e29..05af7210b1c68 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -106,19 +106,18 @@ impl Step for Linkcheck {
     ///
     /// This tool in `src/tools` will verify the validity of all our links in the
     /// documentation to ensure we don't have a bunch of dead ones.
-    fn run(self, _builder: &Builder<'_>) {
-        // FIXME(mark-i-m): uncomment this after we fix the links...
-        // let host = self.host;
+    fn run(self, builder: &Builder<'_>) {
+        let host = self.host;
 
-        // builder.info(&format!("Linkcheck ({})", host));
+        builder.info(&format!("Linkcheck ({})", host));
 
-        // builder.default_doc(None);
+        builder.default_doc(None);
 
-        // let _time = util::timeit(&builder);
-        // try_run(
-        //     builder,
-        //     builder.tool_cmd(Tool::Linkchecker).arg(builder.out.join(host.triple).join("doc")),
-        // );
+        let _time = util::timeit(&builder);
+        try_run(
+            builder,
+            builder.tool_cmd(Tool::Linkchecker).arg(builder.out.join(host.triple).join("doc")),
+        );
     }
 
     fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {

From 6726ca2b280d75fbe2b2cfbac9ac2e61a9274e7c Mon Sep 17 00:00:00 2001
From: Mark Rousskov <mark.simulacrum@gmail.com>
Date: Tue, 28 Jul 2020 09:52:39 -0400
Subject: [PATCH 2/2] Collect library features from library/

---
 src/bootstrap/doc.rs                    | 1 +
 src/tools/unstable-book-gen/src/main.rs | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs
index b43108ccaf984..96cabf754490b 100644
--- a/src/bootstrap/doc.rs
+++ b/src/bootstrap/doc.rs
@@ -693,6 +693,7 @@ impl Step for UnstableBookGen {
         builder.create_dir(&out);
         builder.remove_dir(&out);
         let mut cmd = builder.tool_cmd(Tool::UnstableBookGen);
+        cmd.arg(builder.src.join("library"));
         cmd.arg(builder.src.join("src"));
         cmd.arg(out);
 
diff --git a/src/tools/unstable-book-gen/src/main.rs b/src/tools/unstable-book-gen/src/main.rs
index aa24881ac6bd7..11617911446ec 100644
--- a/src/tools/unstable-book-gen/src/main.rs
+++ b/src/tools/unstable-book-gen/src/main.rs
@@ -94,13 +94,15 @@ fn copy_recursive(from: &Path, to: &Path) {
 }
 
 fn main() {
-    let src_path_str = env::args_os().skip(1).next().expect("source path required");
-    let dest_path_str = env::args_os().skip(2).next().expect("destination path required");
+    let library_path_str = env::args_os().skip(1).next().expect("library path required");
+    let src_path_str = env::args_os().skip(2).next().expect("source path required");
+    let dest_path_str = env::args_os().skip(3).next().expect("destination path required");
+    let library_path = Path::new(&library_path_str);
     let src_path = Path::new(&src_path_str);
     let dest_path = Path::new(&dest_path_str);
 
     let lang_features = collect_lang_features(src_path, &mut false);
-    let lib_features = collect_lib_features(src_path)
+    let lib_features = collect_lib_features(library_path)
         .into_iter()
         .filter(|&(ref name, _)| !lang_features.contains_key(name))
         .collect();