[pbs-devel] [PATCH backup 2/8] run cargo clippy --fix

[Maximiliano Sandoval <m.sandoval@proxmox.com>]

The actual incantation is:

clippy --all-targets --workspace --all-features --fix

Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
 pbs-datastore/src/prune.rs  | 10 +++++-----
 src/api2/admin/datastore.rs |  2 +-
 src/tools/disks/mod.rs      |  6 ++++++
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/pbs-datastore/src/prune.rs b/pbs-datastore/src/prune.rs
index ad1493bf..7b6f9f75 100644
--- a/pbs-datastore/src/prune.rs
+++ b/pbs-datastore/src/prune.rs
@@ -124,13 +124,13 @@ pub fn compute_prune_info(
 
     if let Some(keep_hourly) = options.keep_hourly {
         mark_selections(&mut mark, &list, keep_hourly as usize, |info| {
-            strftime_local("%Y/%m/%d/%H", info.backup_dir.backup_time()).map_err(Error::from)
+            strftime_local("%Y/%m/%d/%H", info.backup_dir.backup_time())
         })?;
     }
 
     if let Some(keep_daily) = options.keep_daily {
         mark_selections(&mut mark, &list, keep_daily as usize, |info| {
-            strftime_local("%Y/%m/%d", info.backup_dir.backup_time()).map_err(Error::from)
+            strftime_local("%Y/%m/%d", info.backup_dir.backup_time())
         })?;
     }
 
@@ -138,19 +138,19 @@ pub fn compute_prune_info(
         mark_selections(&mut mark, &list, keep_weekly as usize, |info| {
             // Note: Use iso-week year/week here. This year number
             // might not match the calendar year number.
-            strftime_local("%G/%V", info.backup_dir.backup_time()).map_err(Error::from)
+            strftime_local("%G/%V", info.backup_dir.backup_time())
         })?;
     }
 
     if let Some(keep_monthly) = options.keep_monthly {
         mark_selections(&mut mark, &list, keep_monthly as usize, |info| {
-            strftime_local("%Y/%m", info.backup_dir.backup_time()).map_err(Error::from)
+            strftime_local("%Y/%m", info.backup_dir.backup_time())
         })?;
     }
 
     if let Some(keep_yearly) = options.keep_yearly {
         mark_selections(&mut mark, &list, keep_yearly as usize, |info| {
-            strftime_local("%Y", info.backup_dir.backup_time()).map_err(Error::from)
+            strftime_local("%Y", info.backup_dir.backup_time())
         })?;
     }
 
diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs
index dbb7ae47..cfe319c4 100644
--- a/src/api2/admin/datastore.rs
+++ b/src/api2/admin/datastore.rs
@@ -2556,7 +2556,7 @@ fn expect_maintanance_unmounting(
 
     if store_config
         .get_maintenance_mode()
-        .map_or(true, |m| m.ty != MaintenanceType::Unmount)
+        .is_none_or(|m| m.ty != MaintenanceType::Unmount)
     {
         bail!("maintenance mode is not 'Unmount'");
     }
diff --git a/src/tools/disks/mod.rs b/src/tools/disks/mod.rs
index e08ea8ca..b9aef368 100644
--- a/src/tools/disks/mod.rs
+++ b/src/tools/disks/mod.rs
@@ -830,6 +830,12 @@ pub struct DiskUsageQuery {
     partitions: bool,
 }
 
+impl Default for DiskUsageQuery {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl DiskUsageQuery {
     pub const fn new() -> Self {
         Self {
-- 
2.39.5



_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel