From 40ea9999155bb4c48dc537ef066cb736956914e1 Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Sat, 1 Sep 2018 17:11:00 -0700 Subject: [PATCH] tidy: unstable_book.rs: Clean up directory iteration Drop unnecessary .into_iter() (also fixing a clippy warning), and use path functions to handle file extensions. --- src/tools/tidy/src/unstable_book.rs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/tools/tidy/src/unstable_book.rs b/src/tools/tidy/src/unstable_book.rs index 62296f73f016..520879df620e 100644 --- a/src/tools/tidy/src/unstable_book.rs +++ b/src/tools/tidy/src/unstable_book.rs @@ -56,12 +56,11 @@ pub fn collect_unstable_feature_names(features: &Features) -> BTreeSet { pub fn collect_unstable_book_section_file_names(dir: &path::Path) -> BTreeSet { fs::read_dir(dir) .expect("could not read directory") - .into_iter() .map(|entry| entry.expect("could not read directory entry")) .filter(dir_entry_is_file) - .map(|entry| entry.file_name().into_string().unwrap()) - .filter(|n| n.ends_with(".md")) - .map(|n| n.trim_right_matches(".md").to_owned()) + .map(|entry| entry.path()) + .filter(|path| path.extension().map(|e| e.to_str().unwrap()) == Some("md")) + .map(|path| path.file_stem().unwrap().to_str().unwrap().into()) .collect() }