formatting &c.

vmchale · Aug 14, 2018 · e0e513a · e0e513a
1 parent d9242fd
commit e0e513a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 19 deletions.
diff --git a/benches/bench.rs b/benches/bench.rs
@@ -121,11 +121,7 @@ fn get_entries_is_file(b: &mut Bencher) {
         for p in paths {
             let val = p.unwrap();
             let t = val.file_type().unwrap();
-            let _ = if t.is_file() {
-                true
-            } else {
-                t.is_dir()
-            };
+            let _ = if t.is_file() { true } else { t.is_dir() };
         }
     })
 }

diff --git a/src/types.rs b/src/types.rs
@@ -92,8 +92,7 @@ impl FileTree {
                     (if dirs_only { a.is_dir } else { true })
                         && Some(a.bytes) > min_bytes.map(FileSize::new)
                         && (max_depth.is_none() || Some(a.depth) <= max_depth)
-                })
-                .take(n)
+                }).take(n)
                 .collect::<Vec<NamePair>>();
             FileTree {
                 file_size: self_size,
@@ -110,8 +109,7 @@ impl FileTree {
                     (if dirs_only { a.is_dir } else { true })
                         && Some(a.bytes) > min_bytes.map(FileSize::new)
                         && (max_depth.is_none() || Some(a.depth) <= max_depth)
-                })
-                .collect::<Vec<NamePair>>();
+                }).collect::<Vec<NamePair>>();
             FileTree {
                 file_size: self_size,
                 files: new,
@@ -138,8 +136,7 @@ impl FileTree {
                 (if dirs_only { a.is_dir } else { true })
                     && Some(a.bytes) > min_bytes.map(FileSize::new)
                     && (max_depth.is_none() || Some(a.depth) <= max_depth)
-            })
-            .collect::<Vec<NamePair>>();
+            }).collect::<Vec<NamePair>>();
 
         FileTree {
             file_size: self_size,

diff --git a/src/walk_parallel/mod.rs b/src/walk_parallel/mod.rs
@@ -327,19 +327,21 @@ pub fn clean_project_dirs<P: AsRef<Path>>(p: P, exclude: &Option<Regex>, _: bool
                 .clone()
                 .map(|e| e.is_match(&p.path().to_string_lossy().to_string()))
                 != Some(false)
-        })
-        .filter(|p| {
+        }).filter(|p| {
             REGEX.is_match(&p.path().to_string_lossy().to_string())
                 || is_project_dir(
                     &p.path().to_string_lossy().to_string(),
                     &p.path()
                         .file_name()
                         .map(|x| x.to_string_lossy().to_string())
                         .unwrap_or_else(|| "".to_string()),
-                ) || latex_log(&p.path()) || ats_cgen(p.path().file_name()) || ({
-                let x = &p.path().to_string_lossy().to_string();
-                x.ends_with("/flxg_stats.txt")
-            })
+                )
+                || latex_log(&p.path())
+                || ats_cgen(p.path().file_name())
+                || ({
+                    let x = &p.path().to_string_lossy().to_string();
+                    x.ends_with("/flxg_stats.txt")
+                })
         }) {
         if dir.file_type().is_file() {
             fs::remove_file(dir.path()).unwrap_or(());
@@ -425,8 +427,7 @@ pub fn print_parallel(w: Walk) -> () {
             } else if let Err(e) = result {
                 panic!("{:?}", e)
             }
-        })
-        .count();
+        }).count();
 
     // get the total size
     let m = arc.load(Ordering::SeqCst); // TODO - check if this works with Relaxed?