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 14244A1C26 for ; Fri, 16 Jun 2023 10:28:03 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EBF882FA8D for ; Fri, 16 Jun 2023 10:27:32 +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 ; Fri, 16 Jun 2023 10:27:32 +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 0326D45B96 for ; Fri, 16 Jun 2023 10:27:32 +0200 (CEST) From: Maximiliano Sandoval To: pbs-devel@lists.proxmox.com Date: Fri, 16 Jun 2023 10:27:28 +0200 Message-Id: <20230616082731.45647-3-m.sandoval@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230616082731.45647-1-m.sandoval@proxmox.com> References: <20230616082731.45647-1-m.sandoval@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH v2 backup 2/5] clippy fixes: use of ok_or followed by a function call 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: Fri, 16 Jun 2023 08:28:03 -0000 The function will always be called. This is only bad if it allocates or does some non-trivial amount of work. Signed-off-by: Maximiliano Sandoval --- src/api2/node/services.rs | 4 +++- src/api2/tape/drive.rs | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/api2/node/services.rs b/src/api2/node/services.rs index 4a73b42d..2786d620 100644 --- a/src/api2/node/services.rs +++ b/src/api2/node/services.rs @@ -78,7 +78,9 @@ fn json_service_state(service: &str, status: Value) -> Value { let name = status["Name"].as_str().unwrap_or(service); let state = if status["Type"] == "oneshot" && status["SubState"] == "dead" { - status["Result"].as_str().or(status["SubState"].as_str()) + status["Result"] + .as_str() + .or_else(|| status["SubState"].as_str()) } else { status["SubState"].as_str() } diff --git a/src/api2/tape/drive.rs b/src/api2/tape/drive.rs index 020dd492..5306e605 100644 --- a/src/api2/tape/drive.rs +++ b/src/api2/tape/drive.rs @@ -652,7 +652,7 @@ pub async fn read_label(drive: String, inventorize: Option) -> Result