From 6726ca2b280d75fbe2b2cfbac9ac2e61a9274e7c Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Tue, 28 Jul 2020 09:52:39 -0400 Subject: [PATCH] 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();