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 1D711739A0 for ; Fri, 16 Apr 2021 12:29:18 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 19F1823625 for ; Fri, 16 Apr 2021 12:29:17 +0200 (CEST) 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 B22F123562 for ; Fri, 16 Apr 2021 12:29:12 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 7F4E445B1E for ; Fri, 16 Apr 2021 12:29:12 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Fri, 16 Apr 2021 12:29:09 +0200 Message-Id: <20210416102910.8506-14-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210416102910.8506-1-d.csapak@proxmox.com> References: <20210416102910.8506-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.161 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [proxmox-file-restore.rs] Subject: [pbs-devel] [PATCH proxmox-backup v2 13/14] bin/proxmox-file-restore: clippy 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: Fri, 16 Apr 2021 10:29:18 -0000 fixes: * redundant_closure * `.len() >= 0` => `!.is_empty()` * unnecessary clone * `if let Err(_)` => `.is_err()` Signed-off-by: Dominik Csapak --- src/bin/proxmox-file-restore.rs | 4 +++- src/bin/proxmox_file_restore/block_driver_qemu.rs | 2 +- src/bin/proxmox_file_restore/qemu_helper.rs | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/bin/proxmox-file-restore.rs b/src/bin/proxmox-file-restore.rs index c9ef3912..a225998c 100644 --- a/src/bin/proxmox-file-restore.rs +++ b/src/bin/proxmox-file-restore.rs @@ -56,7 +56,7 @@ fn parse_path(path: String, base64: bool) -> Result { return Ok(ExtractPath::ListArchives); } - while bytes.len() > 0 && bytes[0] == b'/' { + while !bytes.is_empty() && bytes[0] == b'/' { bytes.remove(0); } @@ -451,6 +451,8 @@ fn main() { run_cli_command( cmd_def, rpcenv, + // is a false positive, does not compile without the closure + #[allow(clippy::redundant_closure)] Some(|future| proxmox_backup::tools::runtime::main(future)), ); } diff --git a/src/bin/proxmox_file_restore/block_driver_qemu.rs b/src/bin/proxmox_file_restore/block_driver_qemu.rs index 607d7d8e..a4a5e011 100644 --- a/src/bin/proxmox_file_restore/block_driver_qemu.rs +++ b/src/bin/proxmox_file_restore/block_driver_qemu.rs @@ -165,7 +165,7 @@ async fn ensure_running(details: &SnapRestoreDetails) -> Result Result<(i32, i32), Error> { validate_img_existance()?; - if let Err(_) = std::env::var("PBS_PASSWORD") { + if std::env::var("PBS_PASSWORD").is_err() { bail!("environment variable PBS_PASSWORD has to be set for QEMU VM restore"); } - if let Err(_) = std::env::var("PBS_FINGERPRINT") { + if std::env::var("PBS_FINGERPRINT").is_err() { bail!("environment variable PBS_FINGERPRINT has to be set for QEMU VM restore"); } -- 2.20.1