From 46cd4103818c573ca0ca9cf450ae1a006dca27bf Mon Sep 17 00:00:00 2001 From: tinaun Date: Fri, 13 Oct 2017 02:00:45 -0400 Subject: [PATCH 1/2] remove duplicate stubs --- src/doc/unstable-book/src/library-features/proc-macro.md | 7 ------- src/tools/tidy/src/unstable_book.rs | 4 +++- src/tools/unstable-book-gen/src/main.rs | 6 +++++- 3 files changed, 8 insertions(+), 9 deletions(-) delete mode 100644 src/doc/unstable-book/src/library-features/proc-macro.md diff --git a/src/doc/unstable-book/src/library-features/proc-macro.md b/src/doc/unstable-book/src/library-features/proc-macro.md deleted file mode 100644 index 19e7f663c7ac3..0000000000000 --- a/src/doc/unstable-book/src/library-features/proc-macro.md +++ /dev/null @@ -1,7 +0,0 @@ -# `proc_macro` - -The tracking issue for this feature is: [#38356] - -[#38356]: https://github.com/rust-lang/rust/issues/38356 - ------------------------- diff --git a/src/tools/tidy/src/unstable_book.rs b/src/tools/tidy/src/unstable_book.rs index ff032b14ad1d5..e8eac0b87033a 100644 --- a/src/tools/tidy/src/unstable_book.rs +++ b/src/tools/tidy/src/unstable_book.rs @@ -87,7 +87,9 @@ pub fn check(path: &path::Path, bad: &mut bool) { // Library features let lang_features = collect_lang_features(path); - let lib_features = collect_lib_features(path); + let lib_features = collect_lib_features(path).iter().filter(|(name, _) { + !lang_features.contains_key(name) + }).collect(); let unstable_lib_feature_names = collect_unstable_feature_names(&lib_features); let unstable_book_lib_features_section_file_names = diff --git a/src/tools/unstable-book-gen/src/main.rs b/src/tools/unstable-book-gen/src/main.rs index 5c2bd1e3e087d..189f69ab7cb63 100644 --- a/src/tools/unstable-book-gen/src/main.rs +++ b/src/tools/unstable-book-gen/src/main.rs @@ -129,7 +129,11 @@ fn main() { let dest_path = Path::new(&dest_path_str).join("src"); let lang_features = collect_lang_features(src_path); - let lib_features = collect_lib_features(src_path); + let lib_features = collect_lib_features(src_path) + .iter() + .filter(|(name, _) { + !lang_features.contains_key(name) + }).collect(); let doc_src_path = src_path.join(PATH_STR); From 5c25b0c5948d730d7fa7f6e581e8b91d4467753e Mon Sep 17 00:00:00 2001 From: tinaun Date: Mon, 1 Jan 2018 19:32:44 -0500 Subject: [PATCH 2/2] prevent generating duplicate stubs --- src/tools/tidy/src/unstable_book.rs | 2 +- src/tools/unstable-book-gen/src/main.rs | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/tools/tidy/src/unstable_book.rs b/src/tools/tidy/src/unstable_book.rs index e8eac0b87033a..a4a35a706fd91 100644 --- a/src/tools/tidy/src/unstable_book.rs +++ b/src/tools/tidy/src/unstable_book.rs @@ -87,7 +87,7 @@ pub fn check(path: &path::Path, bad: &mut bool) { // Library features let lang_features = collect_lang_features(path); - let lib_features = collect_lib_features(path).iter().filter(|(name, _) { + let lib_features = collect_lib_features(path).into_iter().filter(|&(ref name, _)| { !lang_features.contains_key(name) }).collect(); diff --git a/src/tools/unstable-book-gen/src/main.rs b/src/tools/unstable-book-gen/src/main.rs index 189f69ab7cb63..f66a18547c3b5 100644 --- a/src/tools/unstable-book-gen/src/main.rs +++ b/src/tools/unstable-book-gen/src/main.rs @@ -129,11 +129,9 @@ fn main() { let dest_path = Path::new(&dest_path_str).join("src"); let lang_features = collect_lang_features(src_path); - let lib_features = collect_lib_features(src_path) - .iter() - .filter(|(name, _) { - !lang_features.contains_key(name) - }).collect(); + let lib_features = collect_lib_features(src_path).into_iter().filter(|&(ref name, _)| { + !lang_features.contains_key(name) + }).collect(); let doc_src_path = src_path.join(PATH_STR);