cleanup/format only

Author: alexcu2718

build.rs

@@ -44,8 +44,7 @@ fn test_macos_syscall() {
         // Negative values indicate errors
         if result < 0 {
             panic!(
-                "getdirentries64 syscall test failed with result: {}\n This indicates the syscall number has changed!",
-                result
+                "getdirentries64 syscall test failed with result: {result}\n This indicates the syscall number has changed!",
             );
         }
     }
@@ -60,10 +59,10 @@ fn main() {
     println!("cargo:rustc-env=THREAD_COUNT={num_threads}");
 
     let page_size = unsafe { libc::sysconf(libc::_SC_PAGESIZE) };
-    println!("cargo:rustc-env=FDF_PAGE_SIZE={}", page_size);
+    println!("cargo:rustc-env=FDF_PAGE_SIZE={page_size}");
 
     let max_filename_len = unsafe { libc::pathconf(c"/".as_ptr(), libc::_PC_NAME_MAX) };
-    println!("cargo:rustc-env=NAME_MAX={}", max_filename_len);
+    println!("cargo:rustc-env=NAME_MAX={max_filename_len}");
     assert!(
         max_filename_len >= 255,
         "NAME_MAX is not appropriately set!"

src/lib.rs

@@ -167,12 +167,9 @@ pub use iter::GetDirEntries;
 #[cfg(not(any(target_os = "linux", target_os = "android")))]
 pub(crate) use libc::{dirent as dirent64, readdir as readdir64};
 
-
 #[cfg(any(target_os = "linux", target_os = "android"))]
 pub(crate) use libc::{dirent64, readdir64};
 
-
-
 mod printer;
 pub(crate) use printer::write_paths_coloured;
 
@@ -445,6 +442,18 @@ impl Finder {
         }
     }
 
+    #[inline]
+    #[expect(clippy::print_stderr, reason = "only enabled if explicitly requested")]
+    fn send_files_if_not_empty(&self, files: Vec<DirEntry>, sender: &Sender<Vec<DirEntry>>) {
+        if !files.is_empty() {
+            if let Err(e) = sender.send(files) {
+                if self.search_config.show_errors {
+                    eprintln!("Error sending files: {e}");
+                }
+            }
+        }
+    }
+
     #[expect(
         clippy::redundant_clone,
         reason = "we have to clone when sending dirs because it's being used to keep the iterator going.
@@ -501,11 +510,11 @@ impl Finder {
 
                 // We do batch sending to minimise contention of sending
                 // as opposed to sending one at a time, which will cause tremendous locks
-                send_files_if_not_empty!(self, files, sender); // a convenience macro to simplify the code 
+                self.send_files_if_not_empty(files, sender)
             }
             Err(err) => {
                 if self.search_config.show_errors {
-                    eprintln!("Error accessing {}: {}", dir.to_string_lossy(), err);
+                    eprintln!("Error accessing {}: {err}", dir.to_string_lossy());
                     //TODO! replace with logging eventually
                 }
             }

src/macros.rs

@@ -416,18 +416,6 @@ macro_rules! handle_depth_limit {
     };
 }
 
-macro_rules! send_files_if_not_empty {
-    ($self:expr, $files:expr, $sender:expr) => {
-        if !$files.is_empty() {
-            if let Err(e) = $sender.send($files) {
-                if $self.search_config.show_errors {
-                    eprintln!("Error sending files: {e}");
-                }
-            }
-        }
-    };
-}
-
 /// Extremely simple macro for getting rid of boiler blates
 macro_rules! return_os_error {
     () => {{

src/utils.rs

@@ -64,6 +64,7 @@ where
 {
     const SYS_GETDIRENTRIES64: libc::c_int = 344; // Reverse engineered syscall number
     //https://phrack.org/issues/66/16
+    // We verify this works via build script, we check if `getdirentries` returns >0 for tmp directory, if not, syscall is broken.
     // SAFETY: Syscall has no other implicit safety requirements beyond pointer validity
     unsafe { libc::syscall(SYS_GETDIRENTRIES64, fd, buffer_ptr, nbytes, basep) }
 }
@@ -270,6 +271,10 @@ pub const unsafe fn dirent_const_time_strlen(drnt: *const dirent64) -> usize {
         */
         let candidate_pos: u64 = last_word | mask;
 
+        debug_assert!(
+            candidate_pos.wrapping_sub(LO_U64) & !candidate_pos & HI_U64 != 0,
+            "Due to the final 8 bytes always containing a null terminator, this should never be 0"
+        );
         /*
          Locate the first null byte in constant time using SWAR.
          Subtract  the position of the index of the 0 then add 1 to compute its position relative to the start of d_name.