refactor

all just minor tweaks.

Author: Byron

gix-blame/src/file/mod.rs

@@ -325,8 +325,8 @@ fn process_change(
 /// `process_changes` assumes that ranges coming from the same *Source File* can and do
 /// occasionally overlap. If it were a desirable property of the blame algorithm as a whole to
 /// never have two different lines from a *Blamed File* mapped to the same line in a *Source File*,
-/// this property would need to be enforced at a higher level than `process_changes` if which case
-/// the nested loops could potentially be flattened into one.
+/// this property would need to be enforced at a higher level than `process_changes`.
+/// Then the nested loops could potentially be flattened into one.
 fn process_changes(
     hunks_to_blame: Vec<UnblamedHunk>,
     changes: Vec<Change>,
@@ -335,13 +335,11 @@ fn process_changes(
 ) -> Vec<UnblamedHunk> {
     let mut new_hunks_to_blame = Vec::new();
 
-    for hunk in hunks_to_blame {
-        let mut hunk = Some(hunk);
-
+    for mut hunk in hunks_to_blame.into_iter().map(Some) {
         let mut offset_in_destination = Offset::Added(0);
 
-        let mut changes_iter = changes.iter();
-        let mut change: Option<Change> = changes_iter.next().cloned();
+        let mut changes_iter = changes.iter().cloned();
+        let mut change = changes_iter.next();
 
         loop {
             (hunk, change) = process_change(
@@ -353,7 +351,7 @@ fn process_changes(
                 change,
             );
 
-            change = change.or_else(|| changes_iter.next().cloned());
+            change = change.or_else(|| changes_iter.next());
 
             if hunk.is_none() {
                 break;

gix-blame/src/lib.rs

@@ -4,13 +4,13 @@
 //!
 //! * **Blamed File**
 //!    - The file as it exists in `HEAD`.
-//!    - the initial state with all lines that we need to associate with a *Blamed File*.
+//!    - the initial state with all lines that we need to associate with a *Source File*.
 //! * **Source File**
-//!    - A file at a version (i.e. commit) that introduces hunks into the final 'image'.
+//!    - A file at a version (i.e., commit) that introduces hunks into the final 'image' of the *Blamed File*.
 //! * **Suspects**
 //!    - The versions of the files that can contain hunks that we could use in the final 'image'
 //!    - multiple at the same time as the commit-graph may split up.
-//!    - turns into *Source File* once we have found an association into the *Blamed File*.
+//!    - They turn into a *Source File* once we have found an association into the *Blamed File*.
 #![deny(rust_2018_idioms, missing_docs)]
 #![forbid(unsafe_code)]