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

cli: remove workaround for ": {source}" embedded in error message

Browse source
This commit is contained in:
Yuya Nishihara 2024-02-03 17:26:10 +09:00
parent 77ceadbfd0
commit 99f0e7f844
1 changed files with 3 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
cli/src/cli_util.rs
View file

@ -193,24 +193,12 @@ fn print_error_sources(ui: &Ui, source: Option<&dyn std::error::Error>) -> io::R
} else {
writeln!(ui.stderr(), "Caused by:")?;
for (i, err) in iter::successors(Some(err), |err| err.source()).enumerate() {
let message = strip_error_source(err);
writeln!(ui.stderr(), "{n}: {message}", n = i + 1)?;
writeln!(ui.stderr(), "{n}: {err}", n = i + 1)?;
}
}
Ok(())
}
// TODO: remove ": {source}" from error types and drop this hack
fn strip_error_source(err: &dyn std::error::Error) -> String {
let mut message = err.to_string();
if let Some(source) = err.source() {
if let Some(s) = message.strip_suffix(&format!(": {source}")) {
message.truncate(s.len());
}
}
message
}
impl From<std::io::Error> for CommandError {
fn from(err: std::io::Error) -> Self {
if err.kind() == std::io::ErrorKind::BrokenPipe {
@ -2874,7 +2862,7 @@ pub fn handle_command_result(
match &result {
Ok(()) => Ok(ExitCode::SUCCESS),
Err(CommandError::UserError { err, hint }) => {
writeln!(ui.error(), "Error: {}", strip_error_source(err))?;
writeln!(ui.error(), "Error: {err}")?;
print_error_sources(ui, err.source())?;
if let Some(hint) = hint {
writeln!(ui.hint(), "Hint: {hint}")?;
@ -2925,7 +2913,7 @@ pub fn handle_command_result(
Ok(ExitCode::from(BROKEN_PIPE_EXIT_CODE))
}
Err(CommandError::InternalError(err)) => {
writeln!(ui.error(), "Internal error: {}", strip_error_source(err))?;
writeln!(ui.error(), "Internal error: {err}")?;
print_error_sources(ui, err.source())?;
Ok(ExitCode::from(255))
}