From 1e66c576434abd1f121dec1eccb183542ae18c09 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 17 Aug 2025 14:49:52 +0200 Subject: [PATCH] refactor: Replace return Err(anyhow!()) with anyhow::bail!() This is equivalent to before, but reduces cognitive load when browsing the source. Signed-off-by: Matthias Beyer --- crates/radicle-cli/src/commands/auth.rs | 2 +- crates/radicle-cli/src/commands/block.rs | 6 +++--- crates/radicle-cli/src/commands/checkout.rs | 2 +- crates/radicle-cli/src/commands/clean.rs | 2 +- crates/radicle-cli/src/commands/diff.rs | 2 +- crates/radicle-cli/src/commands/fork.rs | 2 +- crates/radicle-cli/src/commands/help.rs | 2 +- crates/radicle-cli/src/commands/inbox.rs | 2 +- crates/radicle-cli/src/commands/init.rs | 2 +- crates/radicle-cli/src/commands/inspect.rs | 2 +- crates/radicle-cli/src/commands/ls.rs | 2 +- crates/radicle-cli/src/commands/patch.rs | 2 +- crates/radicle-cli/src/commands/remote.rs | 2 +- crates/radicle-cli/src/commands/self.rs | 2 +- crates/radicle-cli/src/commands/stats.rs | 2 +- crates/radicle-cli/src/commands/unblock.rs | 6 +++--- crates/radicle-cli/src/commands/watch.rs | 2 +- crates/radicle-cli/src/main.rs | 2 +- crates/radicle-cli/src/terminal/args.rs | 5 +---- crates/radicle-cli/src/terminal/io.rs | 4 ++-- crates/radicle-term/src/args.rs | 5 +---- 21 files changed, 26 insertions(+), 32 deletions(-) diff --git a/crates/radicle-cli/src/commands/auth.rs b/crates/radicle-cli/src/commands/auth.rs index 07f09b14..18de1652 100644 --- a/crates/radicle-cli/src/commands/auth.rs +++ b/crates/radicle-cli/src/commands/auth.rs @@ -63,7 +63,7 @@ impl Args for Options { Long("help") | Short('h') => { return Err(Error::Help.into()); } - _ => return Err(anyhow::anyhow!(arg.unexpected())), + _ => anyhow::bail!(arg.unexpected()), } } diff --git a/crates/radicle-cli/src/commands/block.rs b/crates/radicle-cli/src/commands/block.rs index fe482f64..a39f571c 100644 --- a/crates/radicle-cli/src/commands/block.rs +++ b/crates/radicle-cli/src/commands/block.rs @@ -61,12 +61,12 @@ impl Args for Options { } else if let Ok(nid) = args::nid(&val) { target = Some(Target::Node(nid)); } else { - return Err(anyhow::anyhow!( + anyhow::bail!( "invalid repository or node specified, see `rad block --help`" - )); + ) } } - _ => return Err(anyhow::anyhow!(arg.unexpected())), + _ => anyhow::bail!(arg.unexpected()), } } diff --git a/crates/radicle-cli/src/commands/checkout.rs b/crates/radicle-cli/src/commands/checkout.rs index 7c2b6255..1c637479 100644 --- a/crates/radicle-cli/src/commands/checkout.rs +++ b/crates/radicle-cli/src/commands/checkout.rs @@ -59,7 +59,7 @@ impl Args for Options { Value(val) if id.is_none() => { id = Some(term::args::rid(&val)?); } - _ => return Err(anyhow::anyhow!(arg.unexpected())), + _ => anyhow::bail!(arg.unexpected()), } } diff --git a/crates/radicle-cli/src/commands/clean.rs b/crates/radicle-cli/src/commands/clean.rs index 13060708..b2aa0ef5 100644 --- a/crates/radicle-cli/src/commands/clean.rs +++ b/crates/radicle-cli/src/commands/clean.rs @@ -55,7 +55,7 @@ impl Args for Options { Value(val) if id.is_none() => { id = Some(term::args::rid(&val)?); } - _ => return Err(anyhow::anyhow!(arg.unexpected())), + _ => anyhow::bail!(arg.unexpected()), } } diff --git a/crates/radicle-cli/src/commands/diff.rs b/crates/radicle-cli/src/commands/diff.rs index fbf28b10..a705bdd7 100644 --- a/crates/radicle-cli/src/commands/diff.rs +++ b/crates/radicle-cli/src/commands/diff.rs @@ -65,7 +65,7 @@ impl Args for Options { commits.push(rev); } - _ => return Err(anyhow::anyhow!(arg.unexpected())), + _ => anyhow::bail!(arg.unexpected()), } } diff --git a/crates/radicle-cli/src/commands/fork.rs b/crates/radicle-cli/src/commands/fork.rs index 59ace89c..440c9436 100644 --- a/crates/radicle-cli/src/commands/fork.rs +++ b/crates/radicle-cli/src/commands/fork.rs @@ -43,7 +43,7 @@ impl Args for Options { Value(val) if rid.is_none() => { rid = Some(args::rid(&val)?); } - _ => return Err(anyhow::anyhow!(arg.unexpected())), + _ => anyhow::bail!(arg.unexpected()), } } diff --git a/crates/radicle-cli/src/commands/help.rs b/crates/radicle-cli/src/commands/help.rs index c735c368..a1117f48 100644 --- a/crates/radicle-cli/src/commands/help.rs +++ b/crates/radicle-cli/src/commands/help.rs @@ -49,7 +49,7 @@ impl Args for Options { let mut parser = lexopt::Parser::from_args(args); if let Some(arg) = parser.next()? { - return Err(anyhow::anyhow!(arg.unexpected())); + anyhow::bail!(arg.unexpected()); } Err(Error::HelpManual { name: "rad" }.into()) } diff --git a/crates/radicle-cli/src/commands/inbox.rs b/crates/radicle-cli/src/commands/inbox.rs index 08bbd082..f1be8fc5 100644 --- a/crates/radicle-cli/src/commands/inbox.rs +++ b/crates/radicle-cli/src/commands/inbox.rs @@ -140,7 +140,7 @@ impl Args for Options { let id = term::args::number(&val)? as NotificationId; ids.push(id); } - _ => return Err(anyhow::anyhow!(arg.unexpected())), + _ => anyhow::bail!(arg.unexpected()), } } let mode = if ids.is_empty() { diff --git a/crates/radicle-cli/src/commands/init.rs b/crates/radicle-cli/src/commands/init.rs index 76822e0b..99cb4146 100644 --- a/crates/radicle-cli/src/commands/init.rs +++ b/crates/radicle-cli/src/commands/init.rs @@ -159,7 +159,7 @@ impl Args for Options { Value(val) if path.is_none() => { path = Some(val.into()); } - _ => return Err(anyhow::anyhow!(arg.unexpected())), + _ => anyhow::bail!(arg.unexpected()), } } diff --git a/crates/radicle-cli/src/commands/inspect.rs b/crates/radicle-cli/src/commands/inspect.rs index 8ea1bbd8..92e5c821 100644 --- a/crates/radicle-cli/src/commands/inspect.rs +++ b/crates/radicle-cli/src/commands/inspect.rs @@ -120,7 +120,7 @@ impl Args for Options { .context("Supplied argument is not a valid path")?; } } - _ => return Err(anyhow::anyhow!(arg.unexpected())), + _ => anyhow::bail!(arg.unexpected()), } } diff --git a/crates/radicle-cli/src/commands/ls.rs b/crates/radicle-cli/src/commands/ls.rs index 6a9a3e19..e4398ec6 100644 --- a/crates/radicle-cli/src/commands/ls.rs +++ b/crates/radicle-cli/src/commands/ls.rs @@ -68,7 +68,7 @@ impl Args for Options { public = true; } Long("verbose") | Short('v') => verbose = true, - _ => return Err(anyhow::anyhow!(arg.unexpected())), + _ => anyhow::bail!(arg.unexpected()), } } diff --git a/crates/radicle-cli/src/commands/patch.rs b/crates/radicle-cli/src/commands/patch.rs index ae665f31..80382675 100644 --- a/crates/radicle-cli/src/commands/patch.rs +++ b/crates/radicle-cli/src/commands/patch.rs @@ -727,7 +727,7 @@ impl Args for Options { let val = string(&val); patch_id = Some(Rev::from(val)); } - _ => return Err(anyhow::anyhow!(arg.unexpected())), + _ => anyhow::bail!(arg.unexpected()), } } diff --git a/crates/radicle-cli/src/commands/remote.rs b/crates/radicle-cli/src/commands/remote.rs index 8d95a88d..ec64b054 100644 --- a/crates/radicle-cli/src/commands/remote.rs +++ b/crates/radicle-cli/src/commands/remote.rs @@ -152,7 +152,7 @@ impl Args for Options { name = Some(val); } - _ => return Err(anyhow::anyhow!(arg.unexpected())), + _ => anyhow::bail!(arg.unexpected()), } } diff --git a/crates/radicle-cli/src/commands/self.rs b/crates/radicle-cli/src/commands/self.rs index 79de897c..e2887d4b 100644 --- a/crates/radicle-cli/src/commands/self.rs +++ b/crates/radicle-cli/src/commands/self.rs @@ -79,7 +79,7 @@ impl Args for Options { Long("help") | Short('h') => { return Err(Error::Help.into()); } - _ => return Err(anyhow::anyhow!(arg.unexpected())), + _ => anyhow::bail!(arg.unexpected()), } } diff --git a/crates/radicle-cli/src/commands/stats.rs b/crates/radicle-cli/src/commands/stats.rs index 8e6efc17..ae12648a 100644 --- a/crates/radicle-cli/src/commands/stats.rs +++ b/crates/radicle-cli/src/commands/stats.rs @@ -80,7 +80,7 @@ impl Args for Options { Long("help") | Short('h') => { return Err(Error::Help.into()); } - _ => return Err(anyhow::anyhow!(arg.unexpected())), + _ => anyhow::bail!(arg.unexpected()), } } diff --git a/crates/radicle-cli/src/commands/unblock.rs b/crates/radicle-cli/src/commands/unblock.rs index 6a144c3f..25f87acd 100644 --- a/crates/radicle-cli/src/commands/unblock.rs +++ b/crates/radicle-cli/src/commands/unblock.rs @@ -60,12 +60,12 @@ impl Args for Options { } else if let Ok(nid) = args::nid(&val) { target = Some(Target::Node(nid)); } else { - return Err(anyhow::anyhow!( + anyhow::bail!( "invalid repository or remote specified, see `rad unblock --help`" - )); + ) } } - _ => return Err(anyhow::anyhow!(arg.unexpected())), + _ => anyhow::bail!(arg.unexpected()), } } diff --git a/crates/radicle-cli/src/commands/watch.rs b/crates/radicle-cli/src/commands/watch.rs index 55b19fb5..a621ac23 100644 --- a/crates/radicle-cli/src/commands/watch.rs +++ b/crates/radicle-cli/src/commands/watch.rs @@ -100,7 +100,7 @@ impl Args for Options { Long("help") | Short('h') => { return Err(Error::Help.into()); } - _ => return Err(anyhow::anyhow!(arg.unexpected())), + _ => anyhow::bail!(arg.unexpected()), } } diff --git a/crates/radicle-cli/src/main.rs b/crates/radicle-cli/src/main.rs index b8362977..c29ea318 100644 --- a/crates/radicle-cli/src/main.rs +++ b/crates/radicle-cli/src/main.rs @@ -79,7 +79,7 @@ fn parse_args() -> anyhow::Result { command = Some(Command::Other(args)) } } - _ => return Err(anyhow::anyhow!(arg.unexpected())), + _ => anyhow::bail!(arg.unexpected()), } } if let Some(Command::Version { json: j }) = &mut command { diff --git a/crates/radicle-cli/src/terminal/args.rs b/crates/radicle-cli/src/terminal/args.rs index 9215bacd..90f74d4e 100644 --- a/crates/radicle-cli/src/terminal/args.rs +++ b/crates/radicle-cli/src/terminal/args.rs @@ -85,10 +85,7 @@ pub fn format(arg: lexopt::Arg) -> OsString { pub fn finish(unparsed: Vec) -> anyhow::Result<()> { if let Some(arg) = unparsed.first() { - return Err(anyhow::anyhow!( - "unexpected argument `{}`", - arg.to_string_lossy() - )); + anyhow::bail!("unexpected argument `{}`", arg.to_string_lossy()) } Ok(()) } diff --git a/crates/radicle-cli/src/terminal/io.rs b/crates/radicle-cli/src/terminal/io.rs index 79bcc37e..40e580d7 100644 --- a/crates/radicle-cli/src/terminal/io.rs +++ b/crates/radicle-cli/src/terminal/io.rs @@ -52,9 +52,9 @@ pub fn signer(profile: &Profile) -> anyhow::Result { let passphrase = match passphrase(validator) { Ok(p) => p, Err(inquire::InquireError::NotTTY) => { - return Err(anyhow::anyhow!( + anyhow::bail!( "running in non-interactive mode, please set `{RAD_PASSPHRASE}` to unseal your key", - )); + ) } Err(e) => return Err(e.into()), }; diff --git a/crates/radicle-term/src/args.rs b/crates/radicle-term/src/args.rs index eeddd054..f178f967 100644 --- a/crates/radicle-term/src/args.rs +++ b/crates/radicle-term/src/args.rs @@ -66,10 +66,7 @@ pub fn format(arg: lexopt::Arg) -> OsString { pub fn finish(unparsed: Vec) -> anyhow::Result<()> { if let Some(arg) = unparsed.first() { - return Err(anyhow::anyhow!( - "unexpected argument `{}`", - arg.to_string_lossy() - )); + anyhow::bail!("unexpected argument `{}`", arg.to_string_lossy()) } Ok(()) }