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 D6CEF1FF178 for ; Mon, 29 Dec 2025 17:18:14 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 674541EA9C; Mon, 29 Dec 2025 17:19:19 +0100 (CET) From: Maximiliano Sandoval To: pdm-devel@lists.proxmox.com Date: Mon, 29 Dec 2025 17:18:41 +0100 Message-ID: <20251229161844.49433-7-m.sandoval@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251229161844.49433-1-m.sandoval@proxmox.com> References: <20251229161844.49433-1-m.sandoval@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1767025098502 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.091 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 KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pdm-devel] [PATCH proxmox-datacenter-manager 6/7] api: resources: collapse identical if blocks X-BeenThere: pdm-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Datacenter Manager development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Datacenter Manager development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pdm-devel-bounces@lists.proxmox.com Sender: "pdm-devel" This was triggering the if_same_then_else clippy warning twice. Signed-off-by: Maximiliano Sandoval --- server/src/api/resources.rs | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/server/src/api/resources.rs b/server/src/api/resources.rs index ecccb94a..654a4550 100644 --- a/server/src/api/resources.rs +++ b/server/src/api/resources.rs @@ -409,18 +409,17 @@ pub(crate) async fn get_resources_impl( for handle in join_handles { let remote_with_resources = handle.await?; - if filters.is_empty() { - remote_resources.push(remote_with_resources); - } else if !remote_with_resources.resources.is_empty() { - remote_resources.push(remote_with_resources); - } else if filters.matches(|filter| { - remote_matches_search_term( - &remote_with_resources.remote_name, - &remote_with_resources.remote, - Some(remote_with_resources.error.is_none()), - filter, - ) - }) { + if filters.is_empty() + || !remote_with_resources.resources.is_empty() + || filters.matches(|filter| { + remote_matches_search_term( + &remote_with_resources.remote_name, + &remote_with_resources.remote, + Some(remote_with_resources.error.is_none()), + filter, + ) + }) + { remote_resources.push(remote_with_resources); } } -- 2.47.3 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel