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 781FD70D3D for ; Tue, 6 Apr 2021 08:28:22 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6E46229BA8 for ; Tue, 6 Apr 2021 08:27:52 +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 4F27629AC4 for ; Tue, 6 Apr 2021 08:27:49 +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 13562459D1 for ; Tue, 6 Apr 2021 08:27:49 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Tue, 6 Apr 2021 08:27:44 +0200 Message-Id: <20210406062747.9356-10-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210406062747.9356-1-d.csapak@proxmox.com> References: <20210406062747.9356-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.171 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 Subject: [pbs-devel] [PATCH proxmox-backup 09/12] tape/*: clippy fixes 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, 06 Apr 2021 06:28:22 -0000 fixes: * absurd extreme comparisons * or_fun_call Signed-off-by: Dominik Csapak --- src/tape/file_formats/multi_volume_writer.rs | 2 +- src/tape/inventory.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tape/file_formats/multi_volume_writer.rs b/src/tape/file_formats/multi_volume_writer.rs index d58285e9..8e0e1d94 100644 --- a/src/tape/file_formats/multi_volume_writer.rs +++ b/src/tape/file_formats/multi_volume_writer.rs @@ -72,7 +72,7 @@ impl <'a> TapeWrite for MultiVolumeWriter<'a> { } if self.writer.is_none() { - if self.header.part_number >= 255 { + if self.header.part_number == 255 { proxmox::io_bail!("multi-volume writer: too many parts"); } self.writer = Some( diff --git a/src/tape/inventory.rs b/src/tape/inventory.rs index f9654538..15a51e5e 100644 --- a/src/tape/inventory.rs +++ b/src/tape/inventory.rs @@ -792,7 +792,7 @@ pub fn lock_media_set( path.push(format!(".media-set-{}", media_set_uuid)); path.set_extension("lck"); - let timeout = timeout.unwrap_or(Duration::new(10, 0)); + let timeout = timeout.unwrap_or_else(|| Duration::new(10, 0)); let file = open_file_locked(&path, timeout, true)?; if cfg!(test) { // We cannot use chown inside test environment (no permissions) -- 2.20.1