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 6427B913A8 for ; Wed, 14 Feb 2024 10:04:51 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3C0163FF78 for ; Wed, 14 Feb 2024 10:04:51 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 for ; Wed, 14 Feb 2024 10:04:49 +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 8DCAB4810B for ; Wed, 14 Feb 2024 10:04:49 +0100 (CET) From: Maximiliano Sandoval To: pbs-devel@lists.proxmox.com Date: Wed, 14 Feb 2024 10:04:48 +0100 Message-Id: <20240214090448.123884-3-m.sandoval@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240214090448.123884-1-m.sandoval@proxmox.com> References: <20240214090448.123884-1-m.sandoval@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -0.030 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy FSL_BULK_SIG 0.001 Bulk signature with no Unsubscribe KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RAZOR2_CF_RANGE_51_100 1.886 Razor2 gives confidence level above 50% RAZOR2_CHECK 0.922 Listed in Razor2 (http://razor.sf.net/) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [github.io, data.name, disk.rs] URIBL_SBL_A 0.1 Contains URL's A record listed in the Spamhaus SBL blocklist [185.199.110.153, 185.199.109.153, 185.199.108.153] Subject: [pbs-devel] [PATCH backup 2/2] restore-daemon: Use first() when it makes sense 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: Wed, 14 Feb 2024 09:04:51 -0000 Fixes the following Clippy lint ``` warning: accessing first element with `comp.get(0)` --> proxmox-restore-daemon/src/proxmox_restore_daemon/disk.rs:102:37 | 102 | if let Some(comp) = comp.get(0) { | ^^^^^^^^^^^ help: try: `comp.first()` | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#get_first = note: `#[warn(clippy::get_first)]` on by default ``` The lint ``` warning: accessing first element with `comp.get(0)` --> proxmox-restore-daemon/src/proxmox_restore_daemon/disk.rs:117:56 | 117 | if let (Some(ref vg), Some(ref lv)) = (comp.get(0), comp.get(1)) { | ^^^^^^^^^^^ help: try: `comp.first()` | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#get_first ``` was not fixed (nor a clippy::allow was added) on purpose. Signed-off-by: Maximiliano Sandoval --- proxmox-restore-daemon/src/proxmox_restore_daemon/disk.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proxmox-restore-daemon/src/proxmox_restore_daemon/disk.rs b/proxmox-restore-daemon/src/proxmox_restore_daemon/disk.rs index bde459dd..f651afea 100644 --- a/proxmox-restore-daemon/src/proxmox_restore_daemon/disk.rs +++ b/proxmox-restore-daemon/src/proxmox_restore_daemon/disk.rs @@ -99,7 +99,7 @@ impl Bucket { let ty = ty.as_ref(); haystack.iter_mut().find(|b| match b { Bucket::Partition(data) => { - if let Some(comp) = comp.get(0) { + if let Some(comp) = comp.first() { ty == "part" && comp.as_ref().parse::().unwrap() == data.number } else { false @@ -107,7 +107,7 @@ impl Bucket { } Bucket::RawFs(_) => ty == "raw", Bucket::ZPool(data) => { - if let Some(ref comp) = comp.get(0) { + if let Some(ref comp) = comp.first() { ty == "zpool" && comp.as_ref() == data.name } else { false -- 2.39.2