files: micro-optimzie DiffLine::reset_line() to not clone hunks

jj-vcs · Aug 16, 2024 · 085e17e · 085e17e
1 parent a973c7b
commit 085e17e
Showing 1 changed file with 13 additions and 14 deletions.
diff --git a/lib/src/files.rs b/lib/src/files.rs
@@ -17,7 +17,7 @@
 use std::borrow::Borrow;
 use std::collections::VecDeque;
 use std::fmt::{Debug, Error, Formatter};
-use std::iter;
+use std::{iter, mem};
 
 use bstr::BStr;
 
@@ -33,10 +33,6 @@ pub struct DiffLine<'a> {
 }
 
 impl DiffLine<'_> {
-    fn reset_line(&mut self) {
-        self.hunks.clear();
-    }
-
     pub fn has_left_content(&self) -> bool {
         self.hunks
             .iter()
@@ -54,6 +50,14 @@ impl DiffLine<'_> {
             .iter()
             .all(|&(side, _)| side == DiffLineHunkSide::Both)
     }
+
+    fn take(&mut self) -> Self {
+        DiffLine {
+            left_line_number: self.left_line_number,
+            right_line_number: self.right_line_number,
+            hunks: mem::take(&mut self.hunks),
+        }
+    }
 }
 
 /// Which side a `DiffLine` hunk belongs to?
@@ -110,10 +114,9 @@ where
                     for line in lines {
                         self.current_line.hunks.push((DiffLineHunkSide::Both, line));
                         if line.ends_with(b"\n") {
-                            self.queued_lines.push_back(self.current_line.clone());
+                            self.queued_lines.push_back(self.current_line.take());
                             self.current_line.left_line_number += 1;
                             self.current_line.right_line_number += 1;
-                            self.current_line.reset_line();
                         }
                     }
                 }
@@ -127,9 +130,8 @@ where
                             .hunks
                             .push((DiffLineHunkSide::Left, left_line));
                         if left_line.ends_with(b"\n") {
-                            self.queued_lines.push_back(self.current_line.clone());
+                            self.queued_lines.push_back(self.current_line.take());
                             self.current_line.left_line_number += 1;
-                            self.current_line.reset_line();
                         }
                     }
                     let right_lines = right_text.split_inclusive(|b| *b == b'\n').map(BStr::new);
@@ -138,9 +140,8 @@ where
                             .hunks
                             .push((DiffLineHunkSide::Right, right_line));
                         if right_line.ends_with(b"\n") {
-                            self.queued_lines.push_back(self.current_line.clone());
+                            self.queued_lines.push_back(self.current_line.take());
                             self.current_line.right_line_number += 1;
-                            self.current_line.reset_line();
                         }
                     }
                 }
@@ -152,9 +153,7 @@ where
         }
 
         if !self.current_line.hunks.is_empty() {
-            let line = self.current_line.clone();
-            self.current_line.reset_line();
-            return Some(line);
+            return Some(self.current_line.take());
         }
 
         None