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 B7512909D3 for ; Mon, 12 Feb 2024 14:18:07 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 98E141928F for ; Mon, 12 Feb 2024 14:17:37 +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 ; Mon, 12 Feb 2024 14:17:36 +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 9B4BE478D4 for ; Mon, 12 Feb 2024 14:17:36 +0100 (CET) From: Maximiliano Sandoval To: pbs-devel@lists.proxmox.com Date: Mon, 12 Feb 2024 14:17:32 +0100 Message-Id: <20240212131734.454966-7-m.sandoval@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240212131734.454966-1-m.sandoval@proxmox.com> References: <20240212131734.454966-1-m.sandoval@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -0.047 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_SBL_A 0.1 Contains URL's A record listed in the Spamhaus SBL blocklist [185.199.108.153, 185.199.110.153, 185.199.111.153, 185.199.109.153] Subject: [pbs-devel] [PATCH backup 07/13] datastore: use is_{err, some} rather than match {Ok, Some}(_) 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, 12 Feb 2024 13:18:07 -0000 Fixes the clippy lint: ``` warning: redundant pattern matching, consider using `is_ok()` --> pbs-datastore/src/datastore.rs:1025:10 | 1025 | !matches!(self.inner.gc_mutex.try_lock(), Ok(_)) | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `self.inner.gc_mutex.try_lock().is_ok()` | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#redundant_pattern_matching = note: `#[warn(clippy::redundant_pattern_matching)]` on by default ``` Signed-off-by: Maximiliano Sandoval --- pbs-datastore/src/datastore.rs | 2 +- src/api2/config/access/ldap.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs index de948821..2f0e5279 100644 --- a/pbs-datastore/src/datastore.rs +++ b/pbs-datastore/src/datastore.rs @@ -1022,7 +1022,7 @@ impl DataStore { } pub fn garbage_collection_running(&self) -> bool { - !matches!(self.inner.gc_mutex.try_lock(), Ok(_)) + self.inner.gc_mutex.try_lock().is_err() } pub fn garbage_collection( diff --git a/src/api2/config/access/ldap.rs b/src/api2/config/access/ldap.rs index 911142a0..e60dc9c1 100644 --- a/src/api2/config/access/ldap.rs +++ b/src/api2/config/access/ldap.rs @@ -337,7 +337,7 @@ pub fn update_ldap_realm( config.user_classes = Some(user_classes); } - let ldap_config = if let Some(_) = password { + let ldap_config = if password.is_some() { LdapAuthenticator::api_type_to_config_with_password(&config, password.clone())? } else { LdapAuthenticator::api_type_to_config(&config)? -- 2.39.2