From 31066e17e843b10e4abeb983ae4c8cc0279591d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BChlbacher?= Date: Fri, 31 May 2024 02:27:43 +0200 Subject: [PATCH] fix: keep compat with MSRV MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thomas Mühlbacher --- src/commands/mount.rs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/commands/mount.rs b/src/commands/mount.rs index 49849aae..622f6cb9 100644 --- a/src/commands/mount.rs +++ b/src/commands/mount.rs @@ -345,15 +345,15 @@ fn cmd_mount_inner(opt: Cli) -> Result<()> { if unsafe { bcachefs::bch2_sb_is_encrypted(first_sb.sb) } { let _key_handle = KeyHandle::new_from_search(&uuid).or_else(|_| { opt.passphrase_file - .map(|path| { - Passphrase::new_from_file(&first_sb, path) - .inspect_err(|e| { - error!( - "Failed to read passphrase from file, falling back to prompt: {}", - e - ) - }) - .and_then(|p| KeyHandle::new(&first_sb, &p)) + .and_then(|path| match Passphrase::new_from_file(&first_sb, path) { + Ok(p) => Some(KeyHandle::new(&first_sb, &p)), + Err(e) => { + error!( + "Failed to read passphrase from file, falling back to prompt: {}", + e + ); + None + } }) .unwrap_or_else(|| opt.unlock_policy.apply(&first_sb)) });