mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-10-26 00:19:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

merge_tools: remove implicit conversion of io::Error

Browse source 
Since ExternalToolError has non-unique io::Error variants, implicit conversion
can be source of bugs.
This commit is contained in:
Yuya Nishihara 2023-08-02 18:33:09 +09:00
parent 36cc1fbfdd
commit bcbb4f215c
1 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/merge_tools.rs
View file

@ -68,7 +68,7 @@ pub enum ExternalToolError {
exit_status: std::process::ExitStatus,
},
#[error("I/O error: {0}")]
Io(#[from] std::io::Error),
Io(#[source] std::io::Error),
}
#[derive(Debug, Error)]
@ -109,17 +109,6 @@ pub enum ConflictResolveError {
Backend(#[from] jj_lib::backend::BackendError),
}
impl From<std::io::Error> for DiffEditError {
fn from(err: std::io::Error) -> Self {
DiffEditError::ExternalTool(ExternalToolError::from(err))
}
}
impl From<std::io::Error> for ConflictResolveError {
fn from(err: std::io::Error) -> Self {
ConflictResolveError::ExternalTool(ExternalToolError::from(err))
}
}
fn check_out(
store: Arc<Store>,
wc_dir: PathBuf,
@ -244,7 +233,8 @@ pub fn run_mergetool(
}));
}
let output_file_contents: Vec<u8> = std::fs::read(paths.get("output").unwrap())?;
let output_file_contents: Vec<u8> =
std::fs::read(paths.get("output").unwrap()).map_err(ExternalToolError::Io)?;
if output_file_contents.is_empty() || output_file_contents == initial_output_content {
return Err(ConflictResolveError::EmptyOrUnchanged);
}
@ -510,7 +500,8 @@ fn editor_args_from_settings(
writeln!(
ui.hint(),
"Using default editor '{default_editor}'; you can change this by setting {key}"
)?;
)
.map_err(ExternalToolError::Io)?;
Ok(default_editor.into())
}
}