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 7890DAC0E for ; Tue, 8 Aug 2023 10:02:09 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 67F28686A for ; Tue, 8 Aug 2023 10:02:07 +0200 (CEST) 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 ; Tue, 8 Aug 2023 10:02:05 +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 BC954436AF for ; Tue, 8 Aug 2023 10:02:04 +0200 (CEST) From: Lukas Wagner To: pbs-devel@lists.proxmox.com Date: Tue, 8 Aug 2023 10:01:44 +0200 Message-Id: <20230808080153.79587-6-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230808080153.79587-1-l.wagner@proxmox.com> References: <20230808080153.79587-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -1.446 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 Subject: [pbs-devel] [PATCH proxmox 06/15] clippy fix: redundant closure 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: Tue, 08 Aug 2023 08:02:09 -0000 See: https://rust-lang.github.io/rust-clippy/master/index.html#redundant_closure Signed-off-by: Lukas Wagner --- proxmox-openid/src/lib.rs | 2 +- proxmox-schema/src/de/mod.rs | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/proxmox-openid/src/lib.rs b/proxmox-openid/src/lib.rs index d6ed89b..c2b73c9 100644 --- a/proxmox-openid/src/lib.rs +++ b/proxmox-openid/src/lib.rs @@ -107,7 +107,7 @@ impl PrivateAuthState { impl OpenIdAuthenticator { pub fn discover(config: &OpenIdConfig, redirect_url: &str) -> Result { let client_id = ClientId::new(config.client_id.clone()); - let client_key = config.client_key.clone().map(|key| ClientSecret::new(key)); + let client_key = config.client_key.clone().map(ClientSecret::new); let issuer_url = IssuerUrl::new(config.issuer_url.clone())?; let provider_metadata = CoreProviderMetadata::discover(&issuer_url, http_client)?; diff --git a/proxmox-schema/src/de/mod.rs b/proxmox-schema/src/de/mod.rs index 80d92fd..8cb3761 100644 --- a/proxmox-schema/src/de/mod.rs +++ b/proxmox-schema/src/de/mod.rs @@ -109,7 +109,7 @@ impl<'de, 'i> SchemaDeserializer<'de, 'i> { if !IN_PROPERTY_STRING.with(|v| v.get()) { schema .check_constraints(&self.input) - .map_err(|err| Error::invalid(err))?; + .map_err(Error::invalid)?; } match self.input { Cow3::Original(input) => visitor.visit_borrowed_str(input), @@ -175,9 +175,7 @@ impl<'de, 'i> de::Deserializer<'de> for SchemaDeserializer<'de, 'i> { .parse() .map_err(|_| Error::msg(format!("not an integer: {:?}", self.input)))?; - schema - .check_constraints(value) - .map_err(|err| Error::invalid(err))?; + schema.check_constraints(value).map_err(Error::invalid)?; let value: i64 = i64::try_from(value) .map_err(|_| Error::invalid("isize did not fit into i64"))?; @@ -194,9 +192,7 @@ impl<'de, 'i> de::Deserializer<'de> for SchemaDeserializer<'de, 'i> { .parse() .map_err(|_| Error::msg(format!("not a valid number: {:?}", self.input)))?; - schema - .check_constraints(value) - .map_err(|err| Error::invalid(err))?; + schema.check_constraints(value).map_err(Error::invalid)?; visitor.visit_f64(value) } -- 2.39.2