From 7506c1dbef4aec8ff95bc492bc2bcdf6111e35ab Mon Sep 17 00:00:00 2001 From: Andy Dixon Date: Thu, 8 Oct 2026 12:24:37 +0100 Subject: [PATCH] Clippy fixes Co-Authored-By: Claude --- src/cli.rs | 9 +++++---- src/keyfile.rs | 5 ++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/cli.rs b/src/cli.rs index 568089d..6f280fe 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -479,10 +479,11 @@ fn run(cmd: &str, args: &[String]) -> Result { let mut cat = s.catalogue()?; // Never ingest, or delete, the vault, anything inside it, or its key. let vault_dir = ctx.vault_dir()?; - if let (Ok(v), Ok(src)) = (std::fs::canonicalize(&vault_dir), std::fs::canonicalize(&pos[0])) { - if src != v && src.starts_with(&v) { - crate::bail!("{} is inside the vault", pos[0]); - } + if let (Ok(v), Ok(src)) = (std::fs::canonicalize(&vault_dir), std::fs::canonicalize(&pos[0])) + && src != v + && src.starts_with(&v) + { + crate::bail!("{} is inside the vault", pos[0]); } let skip: Vec = [vault_dir, ctx.key()?].iter().filter_map(|p| FileId::of(p, true)).collect(); let yes = ctx.flags.yes; diff --git a/src/keyfile.rs b/src/keyfile.rs index 0e31af9..f54fbce 100644 --- a/src/keyfile.rs +++ b/src/keyfile.rs @@ -169,10 +169,9 @@ fn go_pem_decode(data: &[u8]) -> Option<(Vec, Vec, &[u8])> { loop { if rest.starts_with(&START[1..]) { rest = &rest[START.len() - 1..]; - } else if let Some(i) = find(rest, START) { - rest = &rest[i + START.len()..]; } else { - return None; + let i = find(rest, START)?; + rest = &rest[i + START.len()..]; } let (type_line, r) = get_line(rest); rest = r;