Merge pull request #1978 from cruessler/make-mutation-more-idiomatic

Make mutation in `gix_blame::types::UnblamedHunk` more idiomatic

Author: Byron

gix-blame/src/file/function.rs

@@ -401,7 +401,6 @@ fn coalesce_blame_entries(lines_blamed: Vec<BlameEntry>) -> Vec<BlameEntry> {
                     // As of 2024-09-19, the check below only is in `git`, but not in `libgit2`.
                     && previous_source_range.end == current_source_range.start
                 {
-                    // let combined_range =
                     let coalesced_entry = BlameEntry {
                         start_in_blamed_file: previous_blamed_range.start as u32,
                         start_in_source_file: previous_source_range.start as u32,

gix-blame/src/file/mod.rs

@@ -357,10 +357,8 @@ fn process_changes(
 
 impl UnblamedHunk {
     fn shift_by(mut self, suspect: ObjectId, offset: Offset) -> Self {
-        if let Some(position) = self.suspects.iter().position(|entry| entry.0 == suspect) {
-            if let Some((_, ref mut range_in_suspect)) = self.suspects.get_mut(position) {
-                *range_in_suspect = range_in_suspect.shift_by(offset);
-            }
+        if let Some(entry) = self.suspects.iter_mut().find(|entry| entry.0 == suspect) {
+            entry.1 = entry.1.shift_by(offset);
         }
         self
     }
@@ -407,20 +405,16 @@ impl UnblamedHunk {
     /// This is like [`Self::pass_blame()`], but easier to use in places where the 'passing' is
     /// done 'inline'.
     fn passed_blame(mut self, from: ObjectId, to: ObjectId) -> Self {
-        if let Some(position) = self.suspects.iter().position(|entry| entry.0 == from) {
-            if let Some((ref mut commit_id, _)) = self.suspects.get_mut(position) {
-                *commit_id = to;
-            }
+        if let Some(entry) = self.suspects.iter_mut().find(|entry| entry.0 == from) {
+            entry.0 = to;
         }
         self
     }
 
     /// Transfer all ranges from the commit at `from` to the commit at `to`.
     fn pass_blame(&mut self, from: ObjectId, to: ObjectId) {
-        if let Some(position) = self.suspects.iter().position(|entry| entry.0 == from) {
-            if let Some((ref mut commit_id, _)) = self.suspects.get_mut(position) {
-                *commit_id = to;
-            }
+        if let Some(entry) = self.suspects.iter_mut().find(|entry| entry.0 == from) {
+            entry.0 = to;
         }
     }