bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

tidy: unstable_book.rs: Clean up directory iteration

Browse source 
Drop unnecessary .into_iter() (also fixing a clippy warning), and use
path functions to handle file extensions.
This commit is contained in:
Josh Triplett 2018-09-01 17:11:00 -07:00
parent 226d79c30a
commit 40ea999915
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/tools/tidy/src/unstable_book.rs
View file

@ -56,12 +56,11 @@ pub fn collect_unstable_feature_names(features: &Features) -> BTreeSet<String> {
pub fn collect_unstable_book_section_file_names(dir: &path::Path) -> BTreeSet<String> { pub fn collect_unstable_book_section_file_names(dir: &path::Path) -> BTreeSet<String> {
fs::read_dir(dir) fs::read_dir(dir)
.expect("could not read directory") .expect("could not read directory")
.into_iter()
.map(|entry| entry.expect("could not read directory entry")) .map(|entry| entry.expect("could not read directory entry"))
.filter(dir_entry_is_file) .filter(dir_entry_is_file)
.map(|entry| entry.file_name().into_string().unwrap()) .map(|entry| entry.path())
.filter(|n| n.ends_with(".md")) .filter(|path| path.extension().map(|e| e.to_str().unwrap()) == Some("md"))
.map(|n| n.trim_right_matches(".md").to_owned()) .map(|path| path.file_stem().unwrap().to_str().unwrap().into())
.collect() .collect()
} }