Improvements

Author: K

libgit2-sys/lib.rs

@@ -1341,7 +1341,7 @@ pub struct git_merge_file_input {
     /// File name of the conflicted file, or `NULL` to not merge the path.
     pub path: *const c_char,
     /// File mode of the conflicted file, or `0` to not merge the mode.
-    pub mode: c_uint,
+    pub mode: git_filemode_t,
 }
 
 #[repr(C)]
@@ -1356,7 +1356,7 @@ pub struct git_merge_file_result {
     pub path: *const c_char,
 
     /// The mode that the resultant merge file should use.
-    pub mode: c_uint,
+    pub mode: git_filemode_t,
 
     /// The contents of the merge.
     pub ptr: *const c_char,

src/call.rs

@@ -57,7 +57,7 @@ mod impls {
     use libc;
 
     use crate::call::Convert;
-    use crate::{raw, BranchType, ConfigLevel, Direction, ObjectType, ResetType};
+    use crate::{raw, BranchType, ConfigLevel, Direction, FileMode, ObjectType, ResetType};
     use crate::{AutotagOption, DiffFormat, FetchPrune, FileFavor, SubmoduleIgnore};
 
     impl<T: Copy> Convert<T> for T {
@@ -229,4 +229,17 @@ mod impls {
             }
         }
     }
+
+    impl Convert<raw::git_filemode_t> for FileMode {
+        fn convert(&self) -> raw::git_filemode_t {
+            match *self {
+                FileMode::Unreadable => raw::GIT_FILEMODE_UNREADABLE,
+                FileMode::Tree => raw::GIT_FILEMODE_TREE,
+                FileMode::Blob => raw::GIT_FILEMODE_BLOB,
+                FileMode::BlobExecutable => raw::GIT_FILEMODE_BLOB_EXECUTABLE,
+                FileMode::Link => raw::GIT_FILEMODE_LINK,
+                FileMode::Commit => raw::GIT_FILEMODE_COMMIT,
+            }
+        }
+    }
 }

src/lib.rs

@@ -1052,22 +1052,9 @@ pub enum FileMode {
 }
 
 impl FileMode {
-    #[cfg(target_os = "windows")]
-    fn from(mode: i32) -> Self {
-        match mode {
-            raw::GIT_FILEMODE_UNREADABLE => FileMode::Unreadable,
-            raw::GIT_FILEMODE_TREE => FileMode::Tree,
-            raw::GIT_FILEMODE_BLOB => FileMode::Blob,
-            raw::GIT_FILEMODE_BLOB_EXECUTABLE => FileMode::BlobExecutable,
-            raw::GIT_FILEMODE_LINK => FileMode::Link,
-            raw::GIT_FILEMODE_COMMIT => FileMode::Commit,
-            mode => panic!("unknown file mode: {}", mode),
-        }
-    }
-
-    #[cfg(not(target_os = "windows"))]
-    fn from(mode: u32) -> Self {
-        match mode {
+    /// Convert git_filemode_t to FileMode
+    pub fn from_raw(raw: raw::git_filemode_t) -> Self {
+        match raw {
             raw::GIT_FILEMODE_UNREADABLE => FileMode::Unreadable,
             raw::GIT_FILEMODE_TREE => FileMode::Tree,
             raw::GIT_FILEMODE_BLOB => FileMode::Blob,

src/merge.rs

@@ -7,7 +7,6 @@ use crate::call::Convert;
 use crate::util::Binding;
 use crate::{raw, Commit, FileFavor, FileMode, IntoCString, Oid};
 use core::{ptr, slice};
-use std::convert::TryInto;
 use std::ffi::{CStr, CString};
 
 /// A structure to represent an annotated commit, the input to merge and rebase.
@@ -346,7 +345,7 @@ impl<'a> MergeFileInput<'a> {
     /// File mode of the conflicted file, or `0` to not merge the mode.
     pub fn mode(&mut self, mode: Option<FileMode>) -> &mut MergeFileInput<'a> {
         if let Some(mode) = mode {
-            self.raw.mode = mode as u32;
+            self.raw.mode = mode as raw::git_filemode_t;
         }
 
         self
@@ -378,9 +377,9 @@ impl std::fmt::Debug for MergeFileInput<'_> {
         if let Some(path) = &self.path {
             ds.field("path", path);
         }
-        ds.field("mode", &FileMode::from(self.raw.mode.try_into().unwrap()));
+        ds.field("mode", &FileMode::from_raw(self.raw.mode));
 
-        match FileMode::from(self.raw.mode.try_into().unwrap()) {
+        match FileMode::from_raw(self.raw.mode) {
             FileMode::Unreadable => {}
             FileMode::Tree => {}
             FileMode::Blob => {
@@ -428,7 +427,7 @@ impl MergeFileResult {
 
     /// The mode that the resultant merge file should use.
     pub fn mode(&self) -> FileMode {
-        FileMode::from(self.raw.mode.try_into().unwrap())
+        FileMode::from_raw(self.raw.mode)
     }
 
     /// The contents of the merge.

src/repo.rs

@@ -3072,7 +3072,6 @@ mod tests {
     use crate::build::CheckoutBuilder;
     use crate::{CherrypickOptions, FileMode, MergeFileInput};
     use crate::{ObjectType, Oid, Repository, ResetType};
-    use std::convert::TryInto;
     use std::ffi::OsStr;
     use std::fs;
     use std::io::Write;
@@ -3443,7 +3442,7 @@ mod tests {
                 let ancestor_content = ancestor_blob.content();
                 let mut input = MergeFileInput::new();
                 input.path(String::from_utf8(ancestor.path).unwrap());
-                input.mode(Some(FileMode::from(ancestor.mode.try_into().unwrap())));
+                input.mode(Some(FileMode::from_raw(ancestor.mode)));
                 input.content(Some(&ancestor_content));
                 ancestor_input = Some(input);
             } else {
@@ -3456,7 +3455,7 @@ mod tests {
                 let ours_content = ours_blob.content();
                 let mut input = MergeFileInput::new();
                 input.path(String::from_utf8(ours.path).unwrap());
-                input.mode(Some(FileMode::from(ours.mode.try_into().unwrap())));
+                input.mode(Some(FileMode::from_raw(ours.mode)));
                 input.content(Some(&ours_content));
                 ours_input = Some(input);
             } else {
@@ -3469,7 +3468,7 @@ mod tests {
                 let theirs_content = theirs_blob.content();
                 let mut input = MergeFileInput::new();
                 input.path(String::from_utf8(theirs.path).unwrap());
-                input.mode(Some(FileMode::from(theirs.mode.try_into().unwrap())));
+                input.mode(Some(FileMode::from_raw(theirs.mode)));
                 input.content(Some(&theirs_content));
                 theirs_input = Some(input);
             } else {