From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 3/8] clippy: rewrite comparison chains
Date: Wed, 20 Jan 2021 17:23:50 +0100 [thread overview]
Message-ID: <20210120162355.2750802-4-f.gruenbichler@proxmox.com> (raw)
In-Reply-To: <20210120162355.2750802-1-f.gruenbichler@proxmox.com>
chunk_stream one can be collapsed, since split == split_to with at set
to buffer.len() anyway.
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
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<Option<Result<BytesMut, S::Error>>> {
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 <R: BufRead> NetworkParser<R> {
}
}
+ #[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
next prev parent reply other threads:[~2021-01-20 16:24 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-20 16:23 [pbs-devel] [PATCH proxmox-backup 0/8] clippy fixes Fabian Grünbichler
2021-01-20 16:23 ` [pbs-devel] [PATCH proxmox-backup 1/8] clippy: add is_empty() when len() is implemented Fabian Grünbichler
2021-01-20 16:23 ` [pbs-devel] [PATCH proxmox-backup 2/8] clippy: fix Mutex with unused value Fabian Grünbichler
2021-01-20 16:23 ` Fabian Grünbichler [this message]
2021-01-20 16:23 ` [pbs-devel] [PATCH proxmox-backup 4/8] clippy: rewrite ifs with identical return values Fabian Grünbichler
2021-01-20 16:23 ` [pbs-devel] [PATCH proxmox-backup 5/8] apt: let api handle optional bool with default Fabian Grünbichler
2021-01-20 16:23 ` [pbs-devel] [PATCH proxmox-backup 6/8] rework GC traversal error handling Fabian Grünbichler
2021-01-20 16:23 ` [pbs-devel] [PATCH proxmox-backup 7/8] http-client: fix typoed ticket cache condition Fabian Grünbichler
2021-01-20 16:23 ` [pbs-devel] [PATCH proxmox-backup 8/8] http-client: further clippy cleanups Fabian Grünbichler
2021-01-25 10:52 ` [pbs-devel] applied series: [PATCH proxmox-backup 0/8] clippy fixes Wolfgang Bumiller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210120162355.2750802-4-f.gruenbichler@proxmox.com \
--to=f.gruenbichler@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox