mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-01 09:08:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

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

Browse source
This commit is contained in:
Yuya Nishihara 2024-08-14 23:59:27 +09:00
parent a973c7b0ea
commit 085e17e1cc
1 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
lib/src/files.rs
View file

@ -17,7 +17,7 @@
use std::borrow::Borrow; use std::borrow::Borrow;
use std::collections::VecDeque; use std::collections::VecDeque;
use std::fmt::{Debug, Error, Formatter}; use std::fmt::{Debug, Error, Formatter};
use std::iter; use std::{iter, mem};
use bstr::BStr; use bstr::BStr;
@ -33,10 +33,6 @@ pub struct DiffLine<'a> {
} }
impl DiffLine<'_> { impl DiffLine<'_> {
fn reset_line(&mut self) {
self.hunks.clear();
}
pub fn has_left_content(&self) -> bool { pub fn has_left_content(&self) -> bool {
self.hunks self.hunks
.iter() .iter()
@ -54,6 +50,14 @@ impl DiffLine<'_> {
.iter() .iter()
.all(|&(side, _)| side == DiffLineHunkSide::Both) .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? /// Which side a `DiffLine` hunk belongs to?
@ -110,10 +114,9 @@ where
for line in lines { for line in lines {
self.current_line.hunks.push((DiffLineHunkSide::Both, line)); self.current_line.hunks.push((DiffLineHunkSide::Both, line));
if line.ends_with(b"\n") { 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.left_line_number += 1;
self.current_line.right_line_number += 1; self.current_line.right_line_number += 1;
self.current_line.reset_line();
} }
} }
} }
@ -127,9 +130,8 @@ where
.hunks .hunks
.push((DiffLineHunkSide::Left, left_line)); .push((DiffLineHunkSide::Left, left_line));
if left_line.ends_with(b"\n") { 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.left_line_number += 1;
self.current_line.reset_line();
} }
} }
let right_lines = right_text.split_inclusive(|b| *b == b'\n').map(BStr::new); let right_lines = right_text.split_inclusive(|b| *b == b'\n').map(BStr::new);
@ -138,9 +140,8 @@ where
.hunks .hunks
.push((DiffLineHunkSide::Right, right_line)); .push((DiffLineHunkSide::Right, right_line));
if right_line.ends_with(b"\n") { 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.right_line_number += 1;
self.current_line.reset_line();
} }
} }
} }
@ -152,9 +153,7 @@ where
} }
if !self.current_line.hunks.is_empty() { if !self.current_line.hunks.is_empty() {
let line = self.current_line.clone(); return Some(self.current_line.take());
self.current_line.reset_line();
return Some(line);
} }
None None