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

merge_tools: box external tool variant to minimize stack size

Browse source 
The ExternalMergeTool struct has four 24-byte fields plus one bool. It could
be shrunk by dropping Vec/String capacity, but the resulting type would still
be bigger compared to the default Builtin variant.
This commit is contained in:
Yuya Nishihara 2024-03-01 23:17:07 +09:00
parent 78edb615a2
commit 0f42c56b5c
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
cli/src/merge_tools/mod.rs
View file

@ -99,7 +99,14 @@ pub enum MergeToolConfigError {
#[derive(Clone, Debug, Eq, PartialEq)]
pub enum MergeTool {
Builtin,
External(ExternalMergeTool),
// Boxed because ExternalMergeTool is big compared to the Builtin variant.
External(Box<ExternalMergeTool>),
}
impl MergeTool {
fn external(tool: ExternalMergeTool) -> Self {
MergeTool::External(Box::new(tool))
}
}
/// Finds the appropriate tool for diff editing or merges
@ -130,7 +137,7 @@ fn get_tool_config(settings: &UserSettings, name: &str) -> Result<Option<MergeTo
if name == BUILTIN_EDITOR_NAME {
Ok(Some(MergeTool::Builtin))
} else {
Ok(get_external_tool_config(settings, name)?.map(MergeTool::External))
Ok(get_external_tool_config(settings, name)?.map(MergeTool::external))
}
}
@ -178,7 +185,7 @@ impl DiffEditor {
} else {
None
}
.unwrap_or_else(|| MergeTool::External(ExternalMergeTool::with_edit_args(&args)));
.unwrap_or_else(|| MergeTool::external(ExternalMergeTool::with_edit_args(&args)));
Ok(DiffEditor {
tool,
base_ignores,
@ -228,7 +235,7 @@ impl MergeEditor {
} else {
None
}
.unwrap_or_else(|| MergeTool::External(ExternalMergeTool::with_merge_args(&args)));
.unwrap_or_else(|| MergeTool::external(ExternalMergeTool::with_merge_args(&args)));
if matches!(&tool, MergeTool::External(mergetool) if mergetool.merge_args.is_empty()) {
return Err(MergeToolConfigError::MergeArgsNotConfigured {
tool_name: args.to_string(),