diff --git a/src/bin/proxmox-daily-update.rs b/src/bin/proxmox-daily-update.rs index 99f5152e..83c6b80c 100644 --- a/src/bin/proxmox-daily-update.rs +++ b/src/bin/proxmox-daily-update.rs @@ -63,11 +63,8 @@ fn main() { let mut rpcenv = CliEnvironment::new(); rpcenv.set_auth_id(Some(String::from("root@pam"))); - match proxmox_backup::tools::runtime::main(do_update(&mut rpcenv)) { - Err(err) => { - eprintln!("error during update: {}", err); - std::process::exit(1); - }, - _ => (), + if let Err(err) = proxmox_backup::tools::runtime::main(do_update(&mut rpcenv)) { + eprintln!("error during update: {}", err); + std::process::exit(1); } } diff --git a/src/bin/proxmox_backup_client/key.rs b/src/bin/proxmox_backup_client/key.rs index ef3123bb..405cb818 100644 --- a/src/bin/proxmox_backup_client/key.rs +++ b/src/bin/proxmox_backup_client/key.rs @@ -315,22 +315,13 @@ fn change_passphrase( }, )] /// Print the encryption key's metadata. -fn show_key( - path: Option, - param: Value, -) -> Result<(), Error> { +fn show_key(path: Option, param: Value) -> Result<(), Error> { let path = match path { Some(path) => PathBuf::from(path), - None => { - let path = find_default_encryption_key()? - .ok_or_else(|| { - format_err!("no encryption file provided and no default file found") - })?; - path - } + None => find_default_encryption_key()? + .ok_or_else(|| format_err!("no encryption file provided and no default file found"))?, }; - let config: KeyConfig = serde_json::from_slice(&file_get_contents(path.clone())?)?; let output_format = get_output_format(¶m); @@ -442,13 +433,8 @@ fn paper_key( ) -> Result<(), Error> { let path = match path { Some(path) => PathBuf::from(path), - None => { - let path = find_default_encryption_key()? - .ok_or_else(|| { - format_err!("no encryption file provided and no default file found") - })?; - path - } + None => find_default_encryption_key()? + .ok_or_else(|| format_err!("no encryption file provided and no default file found"))?, }; let data = file_get_contents(&path)?; diff --git a/src/bin/proxmox_backup_client/mount.rs b/src/bin/proxmox_backup_client/mount.rs index 72ed9166..24100752 100644 --- a/src/bin/proxmox_backup_client/mount.rs +++ b/src/bin/proxmox_backup_client/mount.rs @@ -345,7 +345,7 @@ fn unmap( let mut any = false; for (backing, loopdev) in tools::fuse_loop::find_all_mappings()? { let name = tools::systemd::unescape_unit(&backing)?; - println!("{}:\t{}", loopdev.unwrap_or("(unmapped)".to_owned()), name); + println!("{}:\t{}", loopdev.unwrap_or_else(|| "(unmapped)".to_string()), name); any = true; } if !any { diff --git a/src/bin/proxmox_backup_manager/user.rs b/src/bin/proxmox_backup_manager/user.rs index d68e9e81..6603db1b 100644 --- a/src/bin/proxmox_backup_manager/user.rs +++ b/src/bin/proxmox_backup_manager/user.rs @@ -133,7 +133,7 @@ fn list_permissions(param: Value, rpcenv: &mut dyn RpcEnvironment) -> Result (handler)(param, info, rpcenv)?, _ => unreachable!(), }; @@ -161,7 +161,7 @@ fn list_permissions(param: Value, rpcenv: &mut dyn RpcEnvironment) -> Result