Collect library features from library/

diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs
index b43108ccaf984eabbbfa5a4ffab29158d61e6df8..96cabf754490b4950273099aebc1ab3dcf81e914 100644 (file)
--- a/src/bootstrap/doc.rs
+++ b/src/bootstrap/doc.rs
@@ -693,6 +693,7 @@ fn run(self, builder: &Builder<'_>) {
         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 aa24881ac6bd75ea2b176f9180f65e26a5c9bd39..11617911446ecee0fed0f5ee4e3e830ec9bc5942 100644 (file)
--- 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();