Skip to content

Commit da622f7

Browse files
committed
Run cargo fmt
1 parent eeff9c2 commit da622f7

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

src/index.rs

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,12 @@ impl Index {
535535
let our_raw_ptr = our_raw.as_ref().map_or_else(std::ptr::null, |ptr| ptr);
536536
let their_raw_ptr = their_raw.as_ref().map_or_else(std::ptr::null, |ptr| ptr);
537537
unsafe {
538-
try_call!(raw::git_index_conflict_add(self.raw, ancestor_raw_ptr, our_raw_ptr, their_raw_ptr));
538+
try_call!(raw::git_index_conflict_add(
539+
self.raw,
540+
ancestor_raw_ptr,
541+
our_raw_ptr,
542+
their_raw_ptr
543+
));
539544
Ok(())
540545
}
541546
}
@@ -558,9 +563,13 @@ impl Index {
558563
let mut their = ptr::null();
559564

560565
unsafe {
561-
try_call!(
562-
raw::git_index_conflict_get(&mut ancestor, &mut our, &mut their, self.raw, path)
563-
);
566+
try_call!(raw::git_index_conflict_get(
567+
&mut ancestor,
568+
&mut our,
569+
&mut their,
570+
self.raw,
571+
path
572+
));
564573
Ok(IndexConflict {
565574
ancestor: match ancestor.is_null() {
566575
false => Some(IndexEntry::from_raw(*ancestor)),

0 commit comments

Comments
 (0)