|
@@ -98,16 +98,14 @@ mod charcounter {
|
|
|
pub fn walk_dir(path: &std::path::Path, counter: &mut Counter) {
|
|
|
if path.is_dir() {
|
|
|
counter.increment(IncType::Directory);
|
|
|
- for entry in std::fs::read_dir(path).expect("read_dir call failed") {
|
|
|
- if let Ok(entry) = entry {
|
|
|
- let path = entry.path();
|
|
|
- if path.is_dir() {
|
|
|
- walk_dir(&path, counter);
|
|
|
- } else if path.is_file() {
|
|
|
- do_counting(&path, counter);
|
|
|
- } else {
|
|
|
- continue;
|
|
|
- }
|
|
|
+ for entry in std::fs::read_dir(path).expect("read_dir call failed").flatten() {
|
|
|
+ let path = entry.path();
|
|
|
+ if path.is_dir() {
|
|
|
+ walk_dir(&path, counter);
|
|
|
+ } else if path.is_file() {
|
|
|
+ do_counting(&path, counter);
|
|
|
+ } else {
|
|
|
+ continue;
|
|
|
}
|
|
|
}
|
|
|
}
|