mirror of
https://github.com/gitbutlerapp/gitbutler.git
synced 2024-09-11 12:25:42 +03:00
rm unnecessary borrows
This commit is contained in:
parent
a240a16cc5
commit
25aceb2520
@ -410,10 +410,10 @@ fn reverse_patch(patch: &BStr) -> Option<BString> {
|
||||
return None;
|
||||
}
|
||||
} else if line.starts_with(b"+") {
|
||||
reversed.push_str(&line.replacen(b"+", b"-", 1));
|
||||
reversed.push_str(line.replacen(b"+", b"-", 1));
|
||||
reversed.push(b'\n');
|
||||
} else if line.starts_with(b"-") {
|
||||
reversed.push_str(&line.replacen(b"-", b"+", 1));
|
||||
reversed.push_str(line.replacen(b"-", b"+", 1));
|
||||
reversed.push(b'\n');
|
||||
} else {
|
||||
reversed.push_str(line);
|
||||
|
@ -107,7 +107,7 @@ impl Project {
|
||||
let commit_tree_id = commit_tree_builder.write()?;
|
||||
|
||||
commits_tree_builder.insert(
|
||||
&commit_id.to_string(),
|
||||
commit_id.to_string(),
|
||||
commit_tree_id,
|
||||
FileMode::Tree.into(),
|
||||
)?;
|
||||
|
@ -3739,7 +3739,7 @@ fn update_conflict_markers(
|
||||
}
|
||||
}
|
||||
if !conflicted {
|
||||
conflicts::resolve(project_repository, &file_path.display().to_string()).unwrap();
|
||||
conflicts::resolve(project_repository, file_path.display().to_string()).unwrap();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user