tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

clippy: rewrite comparison chains

Browse Source 
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>
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2021-01-20 17:23:50 +01:00 committed by Wolfgang Bumiller
parent 81b2a87232
commit 43313c2ee7
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/api2/backup/environment.rs
View File

@ -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)");

7
src/backup/chunk_stream.rs
View File

@ -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)) {

1
src/config/network/parser.rs
View File

@ -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)");

6
src/tools/acl.rs
View File

@ -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;
}
}