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 9FA357396A for ; Fri, 16 Apr 2021 12:29:17 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 94CB52360D for ; Fri, 16 Apr 2021 12:29:16 +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 5644D23559 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 1E8D345B1E for ; Fri, 16 Apr 2021 12:29:12 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Fri, 16 Apr 2021 12:29:05 +0200 Message-Id: <20210416102910.8506-10-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.161 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. [inventory.rs] Subject: [pbs-devel] [PATCH proxmox-backup v2 09/14] 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: Fri, 16 Apr 2021 10:29:17 -0000 fixes: * absurd extreme comparisons * or_fun_call * unnecessary return * collapsible if chain Signed-off-by: Dominik Csapak --- src/tape/file_formats/blocked_reader.rs | 4 ++-- src/tape/file_formats/chunk_archive.rs | 12 +++++------- src/tape/file_formats/multi_volume_writer.rs | 2 +- src/tape/inventory.rs | 2 +- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/tape/file_formats/blocked_reader.rs b/src/tape/file_formats/blocked_reader.rs index ce2fc9aa..bfdbc2e7 100644 --- a/src/tape/file_formats/blocked_reader.rs +++ b/src/tape/file_formats/blocked_reader.rs @@ -118,13 +118,13 @@ impl BlockedReader { proxmox::io_bail!("detected tape block after block-stream end marker"); } Err(BlockReadError::EndOfFile) => { - return Ok(()); + Ok(()) } Err(BlockReadError::EndOfStream) => { proxmox::io_bail!("got unexpected end of tape"); } Err(BlockReadError::Error(err)) => { - return Err(err); + Err(err) } } } diff --git a/src/tape/file_formats/chunk_archive.rs b/src/tape/file_formats/chunk_archive.rs index f6b07806..ab4234dd 100644 --- a/src/tape/file_formats/chunk_archive.rs +++ b/src/tape/file_formats/chunk_archive.rs @@ -120,13 +120,11 @@ impl <'a> ChunkArchiveWriter<'a> { } else { self.write_all(&blob_data[start..end])? }; - if leom { - if self.close_on_leom { - let mut writer = self.writer.take().unwrap(); - writer.finish(false)?; - self.bytes_written = writer.bytes_written(); - return Ok(chunk_is_complete); - } + if leom && self.close_on_leom { + let mut writer = self.writer.take().unwrap(); + writer.finish(false)?; + self.bytes_written = writer.bytes_written(); + return Ok(chunk_is_complete); } start = end; } 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