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 91DF869D5C for ; Wed, 20 Jan 2021 17:24:28 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 85541AC4B for ; Wed, 20 Jan 2021 17:24:28 +0100 (CET) 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 0CFD4AC41 for ; Wed, 20 Jan 2021 17:24:28 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id C76254604B for ; Wed, 20 Jan 2021 17:24:27 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Wed, 20 Jan 2021 17:23:50 +0100 Message-Id: <20210120162355.2750802-4-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210120162355.2750802-1-f.gruenbichler@proxmox.com> References: <20210120162355.2750802-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.027 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. [parser.rs, environment.rs, acl.rs] Subject: [pbs-devel] [PATCH proxmox-backup 3/8] clippy: rewrite comparison chains 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: Wed, 20 Jan 2021 16:24:28 -0000 chunk_stream one can be collapsed, since split == split_to with at set to buffer.len() anyway. Signed-off-by: Fabian Grünbichler --- src/api2/backup/environment.rs | 4 +++- src/backup/chunk_stream.rs | 7 ++----- src/config/network/parser.rs | 1 + src/tools/acl.rs | 6 ++++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/api2/backup/environment.rs b/src/api2/backup/environment.rs index 53fd76a2..38061816 100644 --- a/src/api2/backup/environment.rs +++ b/src/api2/backup/environment.rs @@ -185,7 +185,9 @@ impl BackupEnvironment { if size > data.chunk_size { bail!("fixed writer '{}' - got large chunk ({} > {}", data.name, size, data.chunk_size); - } else if size < data.chunk_size { + } + + if size < data.chunk_size { data.small_chunk_count += 1; if data.small_chunk_count > 1 { bail!("fixed writer '{}' - detected multiple end chunks (chunk size too small)"); diff --git a/src/backup/chunk_stream.rs b/src/backup/chunk_stream.rs index 2c4040c4..dd37832b 100644 --- a/src/backup/chunk_stream.rs +++ b/src/backup/chunk_stream.rs @@ -98,11 +98,8 @@ where fn poll_next(self: Pin<&mut Self>, cx: &mut Context) -> Poll>> { let this = self.get_mut(); loop { - if this.buffer.len() == this.chunk_size { - return Poll::Ready(Some(Ok(this.buffer.split()))); - } else if this.buffer.len() > this.chunk_size { - let result = this.buffer.split_to(this.chunk_size); - return Poll::Ready(Some(Ok(result))); + if this.buffer.len() >= this.chunk_size { + return Poll::Ready(Some(Ok(this.buffer.split_to(this.chunk_size)))); } match ready!(Pin::new(&mut this.input).try_poll_next(cx)) { diff --git a/src/config/network/parser.rs b/src/config/network/parser.rs index 2546f027..ff36a314 100644 --- a/src/config/network/parser.rs +++ b/src/config/network/parser.rs @@ -293,6 +293,7 @@ impl NetworkParser { } } + #[allow(clippy::comparison_chain)] if let Some(netmask) = netmask { if address_list.len() > 1 { bail!("unable to apply netmask to multiple addresses (please use cidr notation)"); diff --git a/src/tools/acl.rs b/src/tools/acl.rs index 94f3f4df..80e27812 100644 --- a/src/tools/acl.rs +++ b/src/tools/acl.rs @@ -196,9 +196,11 @@ impl<'a> ACLEntry<'a> { for &perm in &[ACL_READ, ACL_WRITE, ACL_EXECUTE] { res = unsafe { acl_get_perm(permset, perm) }; - if res < 0 { + if res < 0 { return Err(Errno::last()); - } else if res > 0 { + } + + if res == 1 { permissions |= perm as u64; } } -- 2.20.1