[pbs-devel] [PATCH backup 02/13] remove redundant guards
Maximiliano Sandoval
m.sandoval at proxmox.com
Mon Feb 12 14:17:27 CET 2024
Fixes the clippy lint:
```
warning: redundant guard
--> pbs-datastore/src/chunk_store.rs:325:37
|
325 | Err(ref err) if err == &nix::errno::Errno::ENOENT => {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#redundant_guards
= note: `#[warn(clippy::redundant_guards)]` on by default
help: try
|
325 - Err(ref err) if err == &nix::errno::Errno::ENOENT => {
325 + Err(nix::errno::Errno::ENOENT) => {
|
```
Signed-off-by: Maximiliano Sandoval <m.sandoval at proxmox.com>
---
pbs-client/src/pxar/extract.rs | 4 ++--
pbs-datastore/src/chunk_store.rs | 2 +-
src/bin/proxmox_backup_manager/user.rs | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pbs-client/src/pxar/extract.rs b/pbs-client/src/pxar/extract.rs
index af18ecfc..5f5ac618 100644
--- a/pbs-client/src/pxar/extract.rs
+++ b/pbs-client/src/pxar/extract.rs
@@ -699,7 +699,7 @@ impl Extractor {
if result.seeked_last {
while match nix::unistd::ftruncate(file.as_raw_fd(), size as i64) {
Ok(_) => false,
- Err(errno) if errno == nix::errno::Errno::EINTR => true,
+ Err(nix::errno::Errno::EINTR) => true,
Err(err) => return Err(err).context("error setting file size"),
} {}
}
@@ -758,7 +758,7 @@ impl Extractor {
if result.seeked_last {
while match nix::unistd::ftruncate(file.as_raw_fd(), size as i64) {
Ok(_) => false,
- Err(errno) if errno == nix::errno::Errno::EINTR => true,
+ Err(nix::errno::Errno::EINTR) => true,
Err(err) => return Err(err).context("error setting file size"),
} {}
}
diff --git a/pbs-datastore/src/chunk_store.rs b/pbs-datastore/src/chunk_store.rs
index fb282749..9f6289c9 100644
--- a/pbs-datastore/src/chunk_store.rs
+++ b/pbs-datastore/src/chunk_store.rs
@@ -322,7 +322,7 @@ impl ChunkStore {
// start reading:
continue;
}
- Err(ref err) if err == &nix::errno::Errno::ENOENT => {
+ Err(nix::errno::Errno::ENOENT) => {
// non-existing directories are okay, just keep going:
continue;
}
diff --git a/src/bin/proxmox_backup_manager/user.rs b/src/bin/proxmox_backup_manager/user.rs
index 743c5d16..96b83fcc 100644
--- a/src/bin/proxmox_backup_manager/user.rs
+++ b/src/bin/proxmox_backup_manager/user.rs
@@ -16,7 +16,7 @@ fn render_expire(value: &Value, _record: &Value) -> Result<String, Error> {
return Ok(never);
}
let text = match value.as_i64() {
- Some(epoch) if epoch == 0 => never,
+ Some(0) => never,
Some(epoch) => {
if let Ok(epoch_string) = proxmox_time::strftime_local("%c", epoch) {
epoch_string
--
2.39.2
More information about the pbs-devel
mailing list