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

style: use #[error(transparent)] instead of #[error("{0}")]

Browse source 
This is the canonical way of forwarding an error message with
the "thiserror" crate.
This commit is contained in:
Samuel Tardieu 2023-01-17 16:35:46 +01:00
parent 2832d7c739
commit 5d0535276c
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/merge_tools.rs
View file

@ -67,7 +67,7 @@ pub enum ExternalToolError {
#[derive(Debug, Error)] #[derive(Debug, Error)]
pub enum DiffEditError { pub enum DiffEditError {
#[error("{0}")] #[error(transparent)]
ExternalToolError(#[from] ExternalToolError), ExternalToolError(#[from] ExternalToolError),
#[error("Failed to write directories to diff: {0:?}")] #[error("Failed to write directories to diff: {0:?}")]
CheckoutError(#[from] CheckoutError), CheckoutError(#[from] CheckoutError),
@ -77,7 +77,7 @@ pub enum DiffEditError {
#[derive(Debug, Error)] #[derive(Debug, Error)]
pub enum ConflictResolveError { pub enum ConflictResolveError {
#[error("{0}")] #[error(transparent)]
ExternalToolError(#[from] ExternalToolError), ExternalToolError(#[from] ExternalToolError),
#[error( #[error(
"To use `{tool_name}` as a merge tool, the config `merge-tools.{tool_name}.merge-args` \ "To use `{tool_name}` as a merge tool, the config `merge-tools.{tool_name}.merge-args` \