ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

Make find_all_variables lazy, and not allocate

Browse source 
There's no need for it to allocate the variable names, and the only place it's
currently used can benefit from returning early if `$output` is found
This commit is contained in:
Zachary Dremann 2023-08-22 02:42:47 -04:00
parent 336d00d59b
commit 1221e306a1
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
cli/src/merge_tools/external.rs
View file

@ -409,11 +409,14 @@ fn interpolate_variables<V: AsRef<str>>(
} }
/// Return all variable names found in the args, without the dollar sign /// Return all variable names found in the args, without the dollar sign
fn find_all_variables(args: &[String]) -> Vec<String> { fn find_all_variables(args: &[String]) -> impl Iterator<Item = &str> {
let regex = &*VARIABLE_REGEX;
args.iter() args.iter()
.flat_map(|arg| VARIABLE_REGEX.find_iter(arg)) .flat_map(|arg| regex.find_iter(arg))
.map(|single_match| single_match.as_str()[1..].to_owned()) .map(|single_match| {
.collect() let s = single_match.as_str();
&s[1..]
})
} }
pub fn edit_diff_external( pub fn edit_diff_external(
@ -424,7 +427,7 @@ pub fn edit_diff_external(
base_ignores: Arc<GitIgnoreFile>, base_ignores: Arc<GitIgnoreFile>,
settings: &UserSettings, settings: &UserSettings,
) -> Result<TreeId, DiffEditError> { ) -> Result<TreeId, DiffEditError> {
let got_output_field = find_all_variables(&editor.edit_args).contains(&"output".to_owned()); let got_output_field = find_all_variables(&editor.edit_args).contains(&"output");
let store = left_tree.store(); let store = left_tree.store();
let diff_wc = check_out_trees( let diff_wc = check_out_trees(
store, store,
@ -632,7 +635,8 @@ mod tests {
"--can-repeat=$right" "--can-repeat=$right"
] ]
.map(ToOwned::to_owned), .map(ToOwned::to_owned),
), )
.collect_vec(),
["left", "right", "1", "2", "output", "right"], ["left", "right", "1", "2", "output", "right"],
); );
} }