Build profile tweaks. Formatting tweaks.

Author: dkorunic

Cargo.toml

@@ -36,8 +36,11 @@ tikv-jemallocator = "0.6.0"
 tikv-jemallocator = "0.6.0"
 
 [profile.release]
-lto = "fat"
-strip = true
+opt-level = 3
+debug = "none"
+strip = "symbols"
+debug-assertions = false
 overflow-checks = true
-codegen-units = 1
+lto = "fat"
 panic = "abort"
+codegen-units = 1

rustfmt.toml

@@ -0,0 +1,2 @@
+max_width = 79
+use_small_heuristics = "max"

src/args.rs

@@ -58,7 +58,9 @@ pub struct Args {
 fn parse_threads(x: &str) -> Result<usize, Error> {
     match x.parse::<usize>() {
         Ok(v) => match v {
-            v if !(2..=65535).contains(&v) => Err(anyhow!("threads should be in (2..65536) range")),
+            v if !(2..=65535).contains(&v) => {
+                Err(anyhow!("threads should be in (2..65536) range"))
+            }
             v => Ok(v),
         },
         Err(e) => Err(Error::from(e)),

src/calibrate.rs

@@ -58,10 +58,7 @@ pub fn get_inode_ratio(
     shutdown: &Arc<AtomicBool>,
     args: &Arc<args::Args>,
 ) -> Result<u64, Error> {
-    println!(
-        "Starting test directory calibration in {}",
-        test_path.display(),
-    );
+    println!("Starting test directory calibration in {}", test_path.display(),);
 
     // Thread pool for mass file creation
     let pool = rayon::ThreadPoolBuilder::new()
@@ -75,7 +72,8 @@ pub fn get_inode_ratio(
     pool.install(|| {
         (0..args.calibration_count).into_par_iter().for_each(|i| {
             if !shutdown.load(Ordering::Acquire) {
-                File::create(test_path.join(i.to_string())).expect("Unable to create files");
+                File::create(test_path.join(i.to_string()))
+                    .expect("Unable to create files");
             }
         });
     });
@@ -84,14 +82,20 @@ pub fn get_inode_ratio(
 
     // Terminate on received interrupt signal
     if shutdown.load(Ordering::Acquire) {
-        println!("Requested program exit, stopping and deleting temporary files...",);
-        ensure_removed(test_path)
-            .expect("Unable to completely delete calibration directory, exiting");
+        println!(
+            "Requested program exit, stopping and deleting temporary files...",
+        );
+        ensure_removed(test_path).expect(
+            "Unable to completely delete calibration directory, exiting",
+        );
         process::exit(ERROR_EXIT);
     }
 
-    let size_inode_ratio = fs::metadata(test_path)?.size() / args.calibration_count;
-    println!("Calibration done. Calculated size-to-inode ratio: {size_inode_ratio}");
+    let size_inode_ratio =
+        fs::metadata(test_path)?.size() / args.calibration_count;
+    println!(
+        "Calibration done. Calculated size-to-inode ratio: {size_inode_ratio}"
+    );
 
     Ok(size_inode_ratio)
 }

src/interrupt.rs

@@ -15,7 +15,9 @@ use anyhow::{Context, Error};
 ///
 /// # Errors
 /// Returns an error if the Ctrl-C handler cannot be set, encapsulated in an `anyhow::Error`.
-pub fn setup_interrupt_handler(shutdown: Arc<AtomicBool>) -> Result<(), Error> {
+pub fn setup_interrupt_handler(
+    shutdown: Arc<AtomicBool>,
+) -> Result<(), Error> {
     ctrlc::set_handler(move || {
         shutdown.store(true, Ordering::Release);
     })

src/main.rs

@@ -52,10 +52,7 @@ fn main() -> Result<(), Error> {
     let shutdown_scan = shutdown.clone();
     interrupt::setup_interrupt_handler(shutdown)?;
 
-    println!(
-        "Using {} threads for calibration and scanning",
-        args.threads
-    );
+    println!("Using {} threads for calibration and scanning", args.threads);
 
     // Attempt to raise FD limit
     if let Ok(Outcome::LimitRaised { to: x, .. }) = raise_fd_limit() {
@@ -86,34 +83,37 @@ fn main() -> Result<(), Error> {
         } else if let Some(ref user_path) = args.calibration_path {
             // User has specified his calibration directory so attempt to check if it resides on
             // the same device
-            if fs::metadata(user_path.as_path())?.dev() != path_metadata.dev() {
+            if fs::metadata(user_path.as_path())?.dev() != path_metadata.dev()
+            {
                 println!(
                     "Oops, test directory resides on a different device than path {}, results are possibly unreliable!",
                     path.display()
                 );
             }
 
             // Prepare temporary calibration directory in user path
-            let tmp_dir = Arc::new(
-                TempDir::new_in(user_path.as_path())
-                    .context("Unable to setup/create calibration test directory")?,
-            );
+            let tmp_dir =
+                Arc::new(TempDir::new_in(user_path.as_path()).context(
+                    "Unable to setup/create calibration test directory",
+                )?);
 
             calibrate::get_inode_ratio(tmp_dir.path(), &shutdown_scan, &args)
                 .context("Unable to calibrate inode to size ratio")?
         } else {
             // Prepare temporary calibration directory in root of the search path
-            let tmp_dir = Arc::new(
-                TempDir::new_in(path.as_path())
-                    .context("Unable to setup/create calibration test directory")?,
-            );
+            let tmp_dir = Arc::new(TempDir::new_in(path.as_path()).context(
+                "Unable to setup/create calibration test directory",
+            )?);
 
             calibrate::get_inode_ratio(tmp_dir.path(), &shutdown_scan, &args)
                 .context("Unable to calibrate inode to size ratio")?
         };
 
         let start = Instant::now();
-        let pb = progress::new_spinner(format!("Scanning path {} in progress...", path.display()));
+        let pb = progress::new_spinner(format!(
+            "Scanning path {} in progress...",
+            path.display()
+        ));
 
         walk::parallel_search(
             &path,

src/walk.rs

@@ -166,7 +166,9 @@ fn process_dir_entry<E>(
                 dir_count_walk.fetch_add(1, Ordering::AcqRel);
 
                 // Ignore skip paths, typically being virtual filesystems (/proc, /dev, /sys, /run)
-                if !skip_path.is_empty() && skip_path.contains(&full_path.to_path_buf()) {
+                if !skip_path.is_empty()
+                    && skip_path.contains(&full_path.to_path_buf())
+                {
                     println!(
                         "Skipping further scan at {} as requested",
                         full_path.display()
@@ -181,7 +183,9 @@ fn process_dir_entry<E>(
                     // If `one_filesystem` flag has been set and if directory is not residing
                     // on the same device as top search path, print warning and abort deeper
                     // scanning
-                    if args.one_filesystem && (dir_entry_metadata.dev() != path_metadata.dev()) {
+                    if args.one_filesystem
+                        && (dir_entry_metadata.dev() != path_metadata.dev())
+                    {
                         println!(
                             "Identified filesystem boundary at {}, skipping...",
                             full_path.display()
@@ -197,10 +201,22 @@ fn process_dir_entry<E>(
 
                     // Print count warnings if necessary
                     if approx_files > args.blacklist_threshold {
-                        print_offender(full_path, size, approx_files, args.accurate, true);
+                        print_offender(
+                            full_path,
+                            size,
+                            approx_files,
+                            args.accurate,
+                            true,
+                        );
                         dir_entry.read_children_path = None;
                     } else if approx_files > args.alert_threshold {
-                        print_offender(full_path, size, approx_files, args.accurate, false);
+                        print_offender(
+                            full_path,
+                            size,
+                            approx_files,
+                            args.accurate,
+                            false,
+                        );
                     }
                 }
             }