From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 12DAD6B014 for ; Mon, 25 Jan 2021 14:43:57 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 10D3BB232 for ; Mon, 25 Jan 2021 14:43:57 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 728AFB228 for ; Mon, 25 Jan 2021 14:43:56 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 3CAD4460E9 for ; Mon, 25 Jan 2021 14:43:56 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Mon, 25 Jan 2021 14:43:00 +0100 Message-Id: <20210125134302.3394328-16-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210125134302.3394328-1-f.gruenbichler@proxmox.com> References: <20210125134302.3394328-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.025 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH proxmox-backup 15/15] clippy: more misc fixes X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jan 2021 13:43:57 -0000 Signed-off-by: Fabian Grünbichler --- src/bin/proxmox-daily-update.rs | 9 +++------ src/bin/proxmox_backup_client/key.rs | 24 +++++------------------- src/bin/proxmox_backup_client/mount.rs | 2 +- src/bin/proxmox_backup_manager/user.rs | 4 ++-- src/rrd/mod.rs | 1 + 5 files changed, 12 insertions(+), 28 deletions(-) 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