From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 5058D1FF170 for ; Tue, 3 Dec 2024 11:21:36 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0BD4857E; Tue, 3 Dec 2024 11:21:43 +0100 (CET) From: Maximiliano Sandoval To: pbs-devel@lists.proxmox.com Date: Tue, 3 Dec 2024 11:20:38 +0100 Message-Id: <20241203102038.166031-10-m.sandoval@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241203102038.166031-1-m.sandoval@proxmox.com> References: <20241203102038.166031-1-m.sandoval@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 1 AWL 0.056 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 URIBL_SBL_A 0.1 Contains URL's A record listed in the Spamhaus SBL blocklist [185.199.109.153, 185.199.111.153, 185.199.108.153, 185.199.110.153] Subject: [pbs-devel] [PATCH proxmox 10/10] apt: repositories: remove unnecessary if-let in iterator 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: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" Fixes the manual_flatten clippy lint: ``` warning: unnecessary `if let` since only the `Some` variant of the iterator element is used --> proxmox-apt/src/repositories/mod.rs:40:5 | 40 | for digest in digests.values() { | ^ ---------------- help: try: `digests.values().copied().flatten()` | _____| | | 41 | | if let Some(digest) = digest { 42 | | common_raw.extend_from_slice(&digest[..]); 43 | | } 44 | | } | |_____^ | help: ...and remove the `if let` statement in the for loop --> proxmox-apt/src/repositories/mod.rs:41:9 | 41 | / if let Some(digest) = digest { 42 | | common_raw.extend_from_slice(&digest[..]); 43 | | } | |_________^ = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#manual_flatten = note: `#[warn(clippy::manual_flatten)]` on by default ``` Signed-off-by: Maximiliano Sandoval --- proxmox-apt/src/repositories/mod.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/proxmox-apt/src/repositories/mod.rs b/proxmox-apt/src/repositories/mod.rs index 4c954668..b688f66e 100644 --- a/proxmox-apt/src/repositories/mod.rs +++ b/proxmox-apt/src/repositories/mod.rs @@ -37,10 +37,8 @@ fn common_digest(files: &[APTRepositoryFile]) -> ConfigDigest { } let mut common_raw = Vec::::with_capacity(digests.len() * 32); - for digest in digests.values() { - if let Some(digest) = digest { - common_raw.extend_from_slice(&digest[..]); - } + for digest in digests.values().copied().flatten() { + common_raw.extend_from_slice(&digest[..]); } ConfigDigest::from_slice(&common_raw[..]) -- 2.39.5 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel