Add UnblamedHunk::shift_by

This communicates intent more clearly and allows simplification of a few
blocks.

Author: cruessler

gix-blame/src/lib.rs

@@ -225,6 +225,12 @@ impl UnblamedHunk {
         }
     }
 
+    fn shift_by(&self, offset: Offset) -> Self {
+        let combined_offset = self.offset() + offset;
+
+        Self::new(self.range_in_blamed_file.clone(), combined_offset)
+    }
+
     fn offset(&self) -> Offset {
         if self.range_in_blamed_file.start > self.range_in_destination.start {
             Offset::Added(self.range_in_blamed_file.start - self.range_in_destination.start)
@@ -327,13 +333,7 @@ pub fn process_change(
                     // <-------->     (hunk)
                     //     <------->  (unchanged)
 
-                    let line_range_in_next_destination =
-                        LineRange::with_offset(hunk.range_in_destination.clone(), *offset_in_destination);
-
-                    new_hunks_to_blame.push(UnblamedHunk::from_destination(
-                        line_range_in_next_destination.into(),
-                        hunk.offset() + *offset_in_destination,
-                    ));
+                    new_hunks_to_blame.push(hunk.shift_by(*offset_in_destination));
 
                     (None, Some(Change::Unchanged(unchanged)))
                 }
@@ -360,13 +360,7 @@ pub fn process_change(
                         //    <--->      (hunk)
                         // <---------->  (unchanged)
 
-                        let line_range_in_next_destination =
-                            LineRange::with_offset(hunk.range_in_destination.clone(), *offset_in_destination);
-
-                        new_hunks_to_blame.push(UnblamedHunk::from_destination(
-                            line_range_in_next_destination.into(),
-                            hunk.offset() + *offset_in_destination,
-                        ));
+                        new_hunks_to_blame.push(hunk.shift_by(*offset_in_destination));
 
                         (None, Some(Change::Unchanged(unchanged.clone())))
                     }
@@ -492,13 +486,7 @@ pub fn process_change(
                         // <-->          (hunk)
                         //       <---->  (added)
 
-                        let line_range_in_next_destination =
-                            LineRange::with_offset(hunk.range_in_destination.clone(), *offset_in_destination);
-
-                        new_hunks_to_blame.push(UnblamedHunk::from_destination(
-                            line_range_in_next_destination.into(),
-                            hunk.offset() + *offset_in_destination,
-                        ));
+                        new_hunks_to_blame.push(hunk.shift_by(*offset_in_destination));
 
                         (None, Some(Change::Added(added.clone(), number_of_lines_deleted)))
                     } else {
@@ -553,13 +541,7 @@ pub fn process_change(
                 //  <--->     (hunk)
                 //         |  (line_number_in_destination)
 
-                let line_range_in_next_destination =
-                    LineRange::with_offset(hunk.range_in_destination.clone(), *offset_in_destination);
-
-                new_hunks_to_blame.push(UnblamedHunk::from_destination(
-                    line_range_in_next_destination.into(),
-                    hunk.offset() + *offset_in_destination,
-                ));
+                new_hunks_to_blame.push(hunk.shift_by(*offset_in_destination));
 
                 (
                     None,
@@ -568,10 +550,7 @@ pub fn process_change(
             }
         }
         (Some(hunk), None) => {
-            new_hunks_to_blame.push(UnblamedHunk::new(
-                hunk.range_in_blamed_file.clone(),
-                hunk.offset() + *offset_in_destination,
-            ));
+            new_hunks_to_blame.push(hunk.shift_by(*offset_in_destination));
 
             (None, None)
         }