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 AD96973985 for ; Fri, 16 Apr 2021 12:29:14 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2500A2358F for ; Fri, 16 Apr 2021 12:29:14 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 id 2C66E2354D for ; Fri, 16 Apr 2021 12:29:12 +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 E80BE45B65 for ; Fri, 16 Apr 2021 12:29:11 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Fri, 16 Apr 2021 12:29:03 +0200 Message-Id: <20210416102910.8506-8-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210416102910.8506-1-d.csapak@proxmox.com> References: <20210416102910.8506-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.162 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [extract.rs] Subject: [pbs-devel] [PATCH proxmox-backup v2 07/14] pxar: clippy fix `or_fun_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 Apr 2021 10:29:14 -0000 replace ok_or with ok_or_else to do lazy evaluation Signed-off-by: Dominik Csapak --- src/pxar/extract.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pxar/extract.rs b/src/pxar/extract.rs index 16b2b499..b52bc503 100644 --- a/src/pxar/extract.rs +++ b/src/pxar/extract.rs @@ -517,7 +517,7 @@ where let root = decoder.open_root().await?; let file = root .lookup(&path).await? - .ok_or(format_err!("error opening '{:?}'", path.as_ref()))?; + .ok_or_else(|| format_err!("error opening '{:?}'", path.as_ref()))?; let mut prefix = PathBuf::new(); let mut components = file.entry().path().components(); @@ -668,7 +668,7 @@ where let file = root .lookup(&path) .await? - .ok_or(format_err!("error opening '{:?}'", path.as_ref()))?; + .ok_or_else(|| format_err!("error opening '{:?}'", path.as_ref()))?; recurse_files_extractor(&mut extractor, file, verbose).await } -- 2.20.1