style: fix code formatting

Author: MikeJerred

libgit2-sys/lib.rs

@@ -3423,7 +3423,8 @@ extern "C" {
         their_tree: *const git_tree,
         opts: *const git_merge_options,
     ) -> c_int;
-    pub fn git_merge_file_options_init(opts: *mut git_merge_file_options, version: c_uint) -> c_int;
+    pub fn git_merge_file_options_init(opts: *mut git_merge_file_options, version: c_uint)
+        -> c_int;
     pub fn git_repository_state_cleanup(repo: *mut git_repository) -> c_int;
 
     // merge analysis

src/lib.rs

@@ -101,7 +101,7 @@ pub use crate::index::{
 pub use crate::indexer::{Indexer, IndexerProgress, Progress};
 pub use crate::mailmap::Mailmap;
 pub use crate::mempack::Mempack;
-pub use crate::merge::{AnnotatedCommit, MergeOptions, MergeFileOptions, MergeFileResult};
+pub use crate::merge::{AnnotatedCommit, MergeFileOptions, MergeFileResult, MergeOptions};
 pub use crate::message::{
     message_prettify, message_trailers_bytes, message_trailers_strs, MessageTrailersBytes,
     MessageTrailersBytesIterator, MessageTrailersStrs, MessageTrailersStrsIterator,

src/merge.rs

@@ -7,8 +7,8 @@ use std::str;
 
 use crate::call::Convert;
 use crate::util::Binding;
-use crate::{raw, Commit, FileFavor, Oid};
 use crate::IntoCString;
+use crate::{raw, Commit, FileFavor, Oid};
 
 /// A structure to represent an annotated commit, the input to merge and rebase.
 ///
@@ -225,7 +225,10 @@ impl MergeFileOptions {
             their_label: None,
             raw: unsafe { mem::zeroed() },
         };
-        assert_eq!(unsafe { raw::git_merge_file_options_init(&mut opts.raw, 1) }, 0);
+        assert_eq!(
+            unsafe { raw::git_merge_file_options_init(&mut opts.raw, 1) },
+            0
+        );
         opts
     }
 
@@ -360,7 +363,8 @@ impl<'repo> MergeFileResult<'repo> {
     /// returns `None` if a filename conflict would occur,
     /// or if the path is not valid utf-8
     pub fn path(&self) -> Option<&str> {
-        self.path_bytes().and_then(|bytes| str::from_utf8(bytes).ok())
+        self.path_bytes()
+            .and_then(|bytes| str::from_utf8(bytes).ok())
     }
 
     /// Gets the path as a byte slice.
@@ -375,12 +379,7 @@ impl<'repo> MergeFileResult<'repo> {
 
     /// The contents of the merge.
     pub fn content(&self) -> &'repo [u8] {
-        unsafe {
-            std::slice::from_raw_parts(
-                self.raw.ptr as *const u8,
-                self.raw.len as usize,
-            )
-        }
+        unsafe { std::slice::from_raw_parts(self.raw.ptr as *const u8, self.raw.len as usize) }
     }
 }
 

src/repo.rs

@@ -24,12 +24,14 @@ use crate::{
     StashFlags,
 };
 use crate::{
-    AnnotatedCommit, MergeAnalysis, MergeOptions, MergeFileOptions, MergeFileResult, MergePreference,
-    SubmoduleIgnore, SubmoduleStatus, SubmoduleUpdate,
+    AnnotatedCommit, MergeAnalysis, MergeFileOptions, MergeFileResult, MergeOptions,
+    MergePreference, SubmoduleIgnore, SubmoduleStatus, SubmoduleUpdate,
 };
 use crate::{ApplyLocation, ApplyOptions, Rebase, RebaseOptions};
 use crate::{Blame, BlameOptions, Reference, References, ResetType, Signature, Submodule};
-use crate::{Blob, BlobWriter, Branch, BranchType, Branches, Commit, Config, Index, IndexEntry, Oid, Tree};
+use crate::{
+    Blob, BlobWriter, Branch, BranchType, Branches, Commit, Config, Index, IndexEntry, Oid, Tree,
+};
 use crate::{Describe, IntoCString, Reflog, RepositoryInitMode, RevparseMode};
 use crate::{DescribeOptions, Diff, DiffOptions, Odb, PackBuilder, TreeBuilder};
 use crate::{Note, Notes, ObjectType, Revwalk, Status, StatusOptions, Statuses, Tag, Transaction};
@@ -4175,12 +4177,14 @@ mod tests {
         opts.our_label("ours");
         opts.their_label("theirs");
         opts.style_diff3(true);
-        let merge_file_result = repo.merge_file_from_index(&base, &ours, &theirs, Some(&mut opts)).unwrap();
+        let merge_file_result = repo
+            .merge_file_from_index(&base, &ours, &theirs, Some(&mut opts))
+            .unwrap();
 
         assert!(!merge_file_result.is_automergeable());
         assert_eq!(
             String::from_utf8_lossy(merge_file_result.content()).to_string(),
-r"<<<<<<< ours
+            r"<<<<<<< ours
 foo
 ||||||| ancestor
 base