fix macos build

kamiyaa · Sep 27, 2024 · b0fb708 · b0fb708
1 parent af643db
commit b0fb708
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/src/commands/bulk_rename.rs b/src/commands/bulk_rename.rs
@@ -50,7 +50,7 @@ pub fn _bulk_rename(app_state: &mut AppState) -> AppResult {
             let file_name = path.file_name();
             let file_name_as_bytes = file_name.as_bytes();
             file.write_all(file_name_as_bytes)?;
-            file.write_all(&[b'\n'])?;
+            file.write_all(b"\n")?;
         }
     }
 

diff --git a/src/fs/metadata.rs b/src/fs/metadata.rs
@@ -2,6 +2,9 @@ use std::{fs, io, path, time};
 
 use nix::sys::stat::{Mode, SFlag};
 
+#[cfg(target_os = "macos")]
+use nix::sys::stat::mode_t;
+
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub enum FileType {
     Directory,
@@ -77,7 +80,12 @@ impl JoshutoMetadata {
         let (file_type, mode) = match metadata.as_ref() {
             Ok(metadata) => {
                 let metadata_mode = metadata.mode();
+                #[cfg(target_os = "macos")]
+                let sflag = SFlag::from_bits_truncate(metadata_mode as mode_t);
+
+                #[cfg(not(target_os = "macos"))]
                 let sflag = SFlag::from_bits_truncate(metadata_mode);
+
                 let mode = Mode::from_bits_truncate(metadata_mode);
                 (FileType::from_mode(sflag), mode)
             }

diff --git a/src/utils/name_resolution.rs b/src/utils/name_resolution.rs
@@ -9,7 +9,7 @@ pub fn rename_filename_conflict(path: &mut path::PathBuf) {
         path.pop();
 
         let mut file_name = file_name.clone();
-        file_name.push(&format!("_{}", i));
+        file_name.push(format!("_{i}"));
         path.push(file_name);
     }
 }