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 CD5781FF170 for ; Tue, 3 Dec 2024 11:21:06 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BA8BA387; Tue, 3 Dec 2024 11:21:12 +0100 (CET) From: Maximiliano Sandoval To: pbs-devel@lists.proxmox.com Date: Tue, 3 Dec 2024 11:20:29 +0100 Message-Id: <20241203102038.166031-1-m.sandoval@proxmox.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 1 AWL 0.057 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.110.153, 185.199.111.153, 185.199.108.153, 185.199.109.153] Subject: [pbs-devel] [PATCH proxmox 01/10] apt: file: Use unwrap_or_default instead of match 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_unwrap_or_default clippy lint: ``` warning: match can be simplified with `.unwrap_or_default()` --> proxmox-apt/src/repositories/file.rs:369:30 | 369 | let mut origin = match repo.get_cached_origin(apt_lists_dir) { | ______________________________^ 370 | | Ok(option) => option, 371 | | Err(_) => None, 372 | | }; | |_____________^ help: replace it with: `repo.get_cached_origin(apt_lists_dir).unwrap_or_default()` | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#manual_unwrap_or_default = note: `#[warn(clippy::manual_unwrap_or_default)]` on by default ``` Signed-off-by: Maximiliano Sandoval --- proxmox-apt/src/repositories/file.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/proxmox-apt/src/repositories/file.rs b/proxmox-apt/src/repositories/file.rs index f176ab71..e34e84e0 100644 --- a/proxmox-apt/src/repositories/file.rs +++ b/proxmox-apt/src/repositories/file.rs @@ -366,10 +366,7 @@ impl APTRepositoryFileImpl for APTRepositoryFile { }; for (n, repo) in self.repositories.iter().enumerate() { - let mut origin = match repo.get_cached_origin(apt_lists_dir) { - Ok(option) => option, - Err(_) => None, - }; + let mut origin = repo.get_cached_origin(apt_lists_dir).unwrap_or_default(); if origin.is_none() { origin = repo.origin_from_uris(); -- 2.39.5 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel