mirror of
https://github.com/martinvonz/jj.git
synced 2025-02-06 03:22:59 +00:00
cleanup: don't use debug format to print source errors
This commit is contained in:
parent
5568ca81c6
commit
31def4b131
5 changed files with 13 additions and 13 deletions
|
@ -480,7 +480,7 @@ impl TracingSubscription {
|
|||
.from_env_lossy()
|
||||
})
|
||||
.map_err(|err| {
|
||||
CommandError::InternalError(format!("failed to enable verbose logging: {err:?}"))
|
||||
CommandError::InternalError(format!("failed to enable verbose logging: {err}"))
|
||||
})?;
|
||||
tracing::info!("verbose logging enabled");
|
||||
Ok(())
|
||||
|
@ -2215,14 +2215,14 @@ pub fn write_config_value_to_file(
|
|||
// If config doesn't exist yet, read as empty and we'll write one.
|
||||
std::io::ErrorKind::NotFound => Ok("".to_string()),
|
||||
_ => Err(user_error(format!(
|
||||
"Failed to read file {path}: {err:?}",
|
||||
"Failed to read file {path}: {err}",
|
||||
path = path.display()
|
||||
))),
|
||||
}
|
||||
})?;
|
||||
let mut doc = toml_edit::Document::from_str(&config_toml).map_err(|err| {
|
||||
user_error(format!(
|
||||
"Failed to parse file {path}: {err:?}",
|
||||
"Failed to parse file {path}: {err}",
|
||||
path = path.display()
|
||||
))
|
||||
})?;
|
||||
|
@ -2264,7 +2264,7 @@ pub fn write_config_value_to_file(
|
|||
// Write config back
|
||||
std::fs::write(path, doc.to_string()).map_err(|err| {
|
||||
user_error(format!(
|
||||
"Failed to write file {path}: {err:?}",
|
||||
"Failed to write file {path}: {err}",
|
||||
path = path.display()
|
||||
))
|
||||
})
|
||||
|
|
|
@ -36,7 +36,7 @@ pub enum BuiltinToolError {
|
|||
},
|
||||
#[error("Rendering {item} {id} is unimplemented for the builtin difftool/mergetool")]
|
||||
Unimplemented { item: &'static str, id: String },
|
||||
#[error("Backend error: {0:?}")]
|
||||
#[error("Backend error: {0}")]
|
||||
BackendError(#[from] jj_lib::backend::BackendError),
|
||||
}
|
||||
|
||||
|
|
|
@ -170,13 +170,13 @@ pub enum PaginationChoice {
|
|||
fn pagination_setting(config: &config::Config) -> Result<PaginationChoice, CommandError> {
|
||||
config
|
||||
.get::<PaginationChoice>("ui.paginate")
|
||||
.map_err(|err| CommandError::ConfigError(format!("Invalid `ui.paginate`: {err:?}")))
|
||||
.map_err(|err| CommandError::ConfigError(format!("Invalid `ui.paginate`: {err}")))
|
||||
}
|
||||
|
||||
fn pager_setting(config: &config::Config) -> Result<CommandNameAndArgs, CommandError> {
|
||||
config
|
||||
.get::<CommandNameAndArgs>("ui.pager")
|
||||
.map_err(|err| CommandError::ConfigError(format!("Invalid `ui.pager`: {err:?}")))
|
||||
.map_err(|err| CommandError::ConfigError(format!("Invalid `ui.pager`: {err}")))
|
||||
}
|
||||
|
||||
impl Ui {
|
||||
|
|
|
@ -251,12 +251,12 @@ impl IndexStore for DefaultIndexStore {
|
|||
.downcast::<MutableIndexImpl>()
|
||||
.expect("index to merge in must be a MutableIndexImpl");
|
||||
let index = index.save_in(self.dir.clone()).map_err(|err| {
|
||||
IndexWriteError::Other(format!("Failed to write commit index file: {err:?}"))
|
||||
IndexWriteError::Other(format!("Failed to write commit index file: {err}"))
|
||||
})?;
|
||||
self.associate_file_with_operation(&index, op_id)
|
||||
.map_err(|err| {
|
||||
IndexWriteError::Other(format!(
|
||||
"Failed to associate commit index file with a operation {op_id:?}: {err:?}"
|
||||
"Failed to associate commit index file with a operation {op_id:?}: {err}"
|
||||
))
|
||||
})?;
|
||||
Ok(Box::new(ReadonlyIndexWrapper(index)))
|
||||
|
|
|
@ -141,7 +141,7 @@ pub enum SnapshotError {
|
|||
max_size: HumanByteSize,
|
||||
},
|
||||
/// Some other error happened while snapshotting the working copy.
|
||||
#[error("{message}: {err:?}")]
|
||||
#[error("{message}: {err}")]
|
||||
Other {
|
||||
/// Error message.
|
||||
message: String,
|
||||
|
@ -224,7 +224,7 @@ pub enum CheckoutError {
|
|||
#[error("Internal backend error: {0}")]
|
||||
InternalBackendError(#[from] BackendError),
|
||||
/// Some other error happened while checking out the working copy.
|
||||
#[error("{message}: {err:?}")]
|
||||
#[error("{message}: {err}")]
|
||||
Other {
|
||||
/// Error message.
|
||||
message: String,
|
||||
|
@ -248,7 +248,7 @@ pub enum ResetError {
|
|||
#[error("Internal error: {0}")]
|
||||
InternalBackendError(#[from] BackendError),
|
||||
/// Some other error happened while checking out the working copy.
|
||||
#[error("{message}: {err:?}")]
|
||||
#[error("{message}: {err}")]
|
||||
Other {
|
||||
/// Error message.
|
||||
message: String,
|
||||
|
@ -260,7 +260,7 @@ pub enum ResetError {
|
|||
|
||||
/// An error while reading the working copy state.
|
||||
#[derive(Debug, Error)]
|
||||
#[error("{message}: {err:?}")]
|
||||
#[error("{message}: {err}")]
|
||||
pub struct WorkingCopyStateError {
|
||||
/// Error message.
|
||||
pub message: String,
|
||||
|
|
Loading…
Reference in a new issue