* [pbs-devel] [PATCH backup 1/5] backup: remove unneded import
@ 2025-01-13 13:25 Maximiliano Sandoval
2025-01-13 13:25 ` [pbs-devel] [PATCH backup 2/5] metric_collection: remove redundant map_or Maximiliano Sandoval
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Maximiliano Sandoval @ 2025-01-13 13:25 UTC (permalink / raw)
To: pbs-devel
Fixes:
warning: unused import: `SnapshotVerifyState`
--> src/api2/backup/mod.rs:23:66
|
23 | ArchiveType, Authid, BackupNamespace, BackupType, Operation, SnapshotVerifyState, VerifyState,
| ^^^^^^^^^^^^^^^^^^^
|
= note: `#[warn(unused_imports)]` on by default
Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
src/api2/backup/mod.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/api2/backup/mod.rs b/src/api2/backup/mod.rs
index 0373d135..c9ebad49 100644
--- a/src/api2/backup/mod.rs
+++ b/src/api2/backup/mod.rs
@@ -20,7 +20,7 @@ use proxmox_sortable_macro::sortable;
use proxmox_sys::fs::lock_dir_noblock_shared;
use pbs_api_types::{
- ArchiveType, Authid, BackupNamespace, BackupType, Operation, SnapshotVerifyState, VerifyState,
+ ArchiveType, Authid, BackupNamespace, BackupType, Operation, VerifyState,
BACKUP_ARCHIVE_NAME_SCHEMA, BACKUP_ID_SCHEMA, BACKUP_NAMESPACE_SCHEMA, BACKUP_TIME_SCHEMA,
BACKUP_TYPE_SCHEMA, CHUNK_DIGEST_SCHEMA, DATASTORE_SCHEMA, PRIV_DATASTORE_BACKUP,
};
--
2.39.5
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
* [pbs-devel] [PATCH backup 2/5] metric_collection: remove redundant map_or
2025-01-13 13:25 [pbs-devel] [PATCH backup 1/5] backup: remove unneded import Maximiliano Sandoval
@ 2025-01-13 13:25 ` Maximiliano Sandoval
2025-01-13 13:25 ` [pbs-devel] [PATCH backup 3/5] elide lifetimes when possible Maximiliano Sandoval
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Maximiliano Sandoval @ 2025-01-13 13:25 UTC (permalink / raw)
To: pbs-devel
Fixes:
warning: this `map_or` is redundant
--> src/server/metric_collection/mod.rs:172:20
|
172 | if config
| ____________________^
173 | | .get_maintenance_mode()
174 | | .map_or(false, |mode| mode.check(Some(Operation::Read)).is_err())
| |_____________________________________________________________________________________^
|
= help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#unnecessary_map_or
= note: `#[warn(clippy::unnecessary_map_or)]` on by default
help: use is_some_and instead
|
172 ~ if config
173 + .get_maintenance_mode().is_some_and(|mode| mode.check(Some(Operation::Read)).is_err())
|
Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
pbs-datastore/src/datastore.rs | 6 +++---
src/api2/admin/datastore.rs | 2 +-
src/api2/config/datastore.rs | 2 +-
src/api2/config/remote.rs | 2 +-
src/bin/proxmox_backup_debug/inspect.rs | 2 +-
src/bin/proxmox_backup_manager/datastore.rs | 2 +-
src/server/metric_collection/mod.rs | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs
index 0801b4bf..fd3990d6 100644
--- a/pbs-datastore/src/datastore.rs
+++ b/pbs-datastore/src/datastore.rs
@@ -179,9 +179,9 @@ impl Drop for DataStore {
let remove_from_cache = last_task
&& pbs_config::datastore::config()
.and_then(|(s, _)| s.lookup::<DataStoreConfig>("datastore", self.name()))
- .map_or(false, |c| {
+ .is_ok_and(|c| {
c.get_maintenance_mode()
- .map_or(false, |m| m.clear_from_cache())
+ .is_some_and(|m| m.clear_from_cache())
});
if remove_from_cache {
@@ -287,7 +287,7 @@ impl DataStore {
let datastore: DataStoreConfig = config.lookup("datastore", name)?;
if datastore
.get_maintenance_mode()
- .map_or(false, |m| m.clear_from_cache())
+ .is_some_and(|m| m.clear_from_cache())
{
// the datastore drop handler does the checking if tasks are running and clears the
// cache entry, so we just have to trigger it here
diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs
index c611f593..f5d80d61 100644
--- a/src/api2/admin/datastore.rs
+++ b/src/api2/admin/datastore.rs
@@ -2601,7 +2601,7 @@ fn do_unmount_device(
active_operations = task_tracking::get_active_operations(&datastore.name)?;
}
- if aborted || worker.map_or(false, |w| w.abort_requested()) {
+ if aborted || worker.is_some_and(|w| w.abort_requested()) {
let _ = expect_maintanance_unmounting(&datastore.name)
.inspect_err(|e| warn!("maintenance mode was not as expected: {e}"))
.and_then(|(lock, config)| {
diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.rs
index df268161..fe3260f6 100644
--- a/src/api2/config/datastore.rs
+++ b/src/api2/config/datastore.rs
@@ -105,7 +105,7 @@ pub(crate) fn do_create_datastore(
for file in dir {
let name = file?.file_name();
let name = name.to_str();
- if !name.map_or(false, |name| name.starts_with('.') || name == "lost+found") {
+ if !name.is_some_and(|name| name.starts_with('.') || name == "lost+found") {
is_empty = false;
break;
}
diff --git a/src/api2/config/remote.rs b/src/api2/config/remote.rs
index 069aef28..7d5173ef 100644
--- a/src/api2/config/remote.rs
+++ b/src/api2/config/remote.rs
@@ -268,7 +268,7 @@ pub fn delete_remote(name: String, digest: Option<String>) -> Result<(), Error>
let job_list: Vec<SyncJobConfig> = sync_jobs.convert_to_typed_array("sync")?;
for job in job_list {
- if job.remote.map_or(false, |id| id == name) {
+ if job.remote.is_some_and(|id| id == name) {
param_bail!(
"name",
"remote '{}' is used by sync job '{}' (datastore '{}')",
diff --git a/src/bin/proxmox_backup_debug/inspect.rs b/src/bin/proxmox_backup_debug/inspect.rs
index 9a75bae1..75a36870 100644
--- a/src/bin/proxmox_backup_debug/inspect.rs
+++ b/src/bin/proxmox_backup_debug/inspect.rs
@@ -429,7 +429,7 @@ fn inspect_device(device: String, param: Value) -> Result<(), Error> {
&& entry
.file_name()
.to_str()
- .map_or(false, |name| name == ".chunks")
+ .is_some_and(|name| name == ".chunks")
{
let store_path = entry
.path()
diff --git a/src/bin/proxmox_backup_manager/datastore.rs b/src/bin/proxmox_backup_manager/datastore.rs
index 0918af3a..1922a55a 100644
--- a/src/bin/proxmox_backup_manager/datastore.rs
+++ b/src/bin/proxmox_backup_manager/datastore.rs
@@ -273,7 +273,7 @@ async fn uuid_mount(param: Value, _rpcenv: &mut dyn RpcEnvironment) -> Result<Va
store
.backing_device
.clone()
- .map_or(false, |device| device.eq(&uuid))
+ .is_some_and(|device| device.eq(&uuid))
})
.collect();
diff --git a/src/server/metric_collection/mod.rs b/src/server/metric_collection/mod.rs
index 2ede8408..daedfb72 100644
--- a/src/server/metric_collection/mod.rs
+++ b/src/server/metric_collection/mod.rs
@@ -171,7 +171,7 @@ fn collect_disk_stats_sync() -> (DiskStat, Vec<DiskStat>) {
for config in datastore_list {
if config
.get_maintenance_mode()
- .map_or(false, |mode| mode.check(Some(Operation::Read)).is_err())
+ .is_some_and(|mode| mode.check(Some(Operation::Read)).is_err())
{
continue;
}
--
2.39.5
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
* [pbs-devel] [PATCH backup 3/5] elide lifetimes when possible
2025-01-13 13:25 [pbs-devel] [PATCH backup 1/5] backup: remove unneded import Maximiliano Sandoval
2025-01-13 13:25 ` [pbs-devel] [PATCH backup 2/5] metric_collection: remove redundant map_or Maximiliano Sandoval
@ 2025-01-13 13:25 ` Maximiliano Sandoval
2025-01-13 13:25 ` [pbs-devel] [PATCH backup 4/5] sg_pt_changer: remove needless call to as_bytes() Maximiliano Sandoval
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Maximiliano Sandoval @ 2025-01-13 13:25 UTC (permalink / raw)
To: pbs-devel
Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
pbs-client/src/pxar/extract.rs | 4 ++--
src/server/push.rs | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pbs-client/src/pxar/extract.rs b/pbs-client/src/pxar/extract.rs
index 270ee416..64754006 100644
--- a/pbs-client/src/pxar/extract.rs
+++ b/pbs-client/src/pxar/extract.rs
@@ -802,9 +802,9 @@ fn add_metadata_to_header(header: &mut tar::Header, metadata: &Metadata) {
header.set_gid(metadata.stat.gid as u64);
}
-async fn tar_add_file<'a, W, T>(
+async fn tar_add_file<W, T>(
tar: &mut proxmox_compression::tar::Builder<W>,
- contents: Option<Contents<'a, T>>,
+ contents: Option<Contents<'_, T>>,
size: u64,
metadata: &Metadata,
path: &Path,
diff --git a/src/server/push.rs b/src/server/push.rs
index 6498f316..ec5455bd 100644
--- a/src/server/push.rs
+++ b/src/server/push.rs
@@ -955,8 +955,8 @@ pub(crate) async fn push_snapshot(
//
// For fixed indexes, the size must be provided as given by the index reader.
#[allow(clippy::too_many_arguments)]
-async fn push_index<'a>(
- filename: &'a BackupArchiveName,
+async fn push_index(
+ filename: &BackupArchiveName,
index: impl IndexFile + Send + 'static,
chunk_reader: Arc<dyn AsyncReadChunk>,
backup_writer: &BackupWriter,
--
2.39.5
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
* [pbs-devel] [PATCH backup 4/5] sg_pt_changer: remove needless call to as_bytes()
2025-01-13 13:25 [pbs-devel] [PATCH backup 1/5] backup: remove unneded import Maximiliano Sandoval
2025-01-13 13:25 ` [pbs-devel] [PATCH backup 2/5] metric_collection: remove redundant map_or Maximiliano Sandoval
2025-01-13 13:25 ` [pbs-devel] [PATCH backup 3/5] elide lifetimes when possible Maximiliano Sandoval
@ 2025-01-13 13:25 ` Maximiliano Sandoval
2025-01-13 13:25 ` [pbs-devel] [PATCH backup 5/5] replace match statements with ? operator Maximiliano Sandoval
2025-01-14 7:59 ` [pbs-devel] applied: [PATCH backup 1/5] backup: remove unneded import Dietmar Maurer
4 siblings, 0 replies; 6+ messages in thread
From: Maximiliano Sandoval @ 2025-01-13 13:25 UTC (permalink / raw)
To: pbs-devel
Fixes:
warning: needless call to `as_bytes()`
--> pbs-tape/src/sg_pt_changer.rs:913:45
|
913 | let rem = SCSI_VOLUME_TAG_LEN - voltag.as_bytes().len();
| ^^^^^^^^^^^^^^^^^^^^^^^ help: `len()` can be called directly on strings: `voltag.len()`
|
= help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#needless_as_bytes
= note: `#[warn(clippy::needless_as_bytes)]` on by default
Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
pbs-tape/src/sg_pt_changer.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pbs-tape/src/sg_pt_changer.rs b/pbs-tape/src/sg_pt_changer.rs
index 940eed4a..7122fcdb 100644
--- a/pbs-tape/src/sg_pt_changer.rs
+++ b/pbs-tape/src/sg_pt_changer.rs
@@ -910,7 +910,7 @@ mod test {
if let Some(voltag) = &desc.pvoltag {
res.extend_from_slice(voltag.as_bytes());
- let rem = SCSI_VOLUME_TAG_LEN - voltag.as_bytes().len();
+ let rem = SCSI_VOLUME_TAG_LEN - voltag.len();
if rem > 0 {
res.resize(res.len() + rem, 0);
}
--
2.39.5
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
* [pbs-devel] [PATCH backup 5/5] replace match statements with ? operator
2025-01-13 13:25 [pbs-devel] [PATCH backup 1/5] backup: remove unneded import Maximiliano Sandoval
` (2 preceding siblings ...)
2025-01-13 13:25 ` [pbs-devel] [PATCH backup 4/5] sg_pt_changer: remove needless call to as_bytes() Maximiliano Sandoval
@ 2025-01-13 13:25 ` Maximiliano Sandoval
2025-01-14 7:59 ` [pbs-devel] applied: [PATCH backup 1/5] backup: remove unneded import Dietmar Maurer
4 siblings, 0 replies; 6+ messages in thread
From: Maximiliano Sandoval @ 2025-01-13 13:25 UTC (permalink / raw)
To: pbs-devel
When possible.
Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
pbs-config/src/acl.rs | 10 ++--------
pbs-datastore/src/hierarchy.rs | 7 +++----
2 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/pbs-config/src/acl.rs b/pbs-config/src/acl.rs
index e8690560..aca1f68f 100644
--- a/pbs-config/src/acl.rs
+++ b/pbs-config/src/acl.rs
@@ -342,10 +342,7 @@ impl AclTree {
let mut node = &self.root;
for outer in path {
for comp in outer.split('/') {
- node = match node.children.get(comp) {
- Some(n) => n,
- None => return None,
- };
+ node = node.children.get(comp)?;
}
}
Some(node)
@@ -355,10 +352,7 @@ impl AclTree {
let mut node = &mut self.root;
for outer in path {
for comp in outer.split('/') {
- node = match node.children.get_mut(comp) {
- Some(n) => n,
- None => return None,
- };
+ node = node.children.get_mut(comp)?;
}
}
Some(node)
diff --git a/pbs-datastore/src/hierarchy.rs b/pbs-datastore/src/hierarchy.rs
index 8b7af038..25a4d382 100644
--- a/pbs-datastore/src/hierarchy.rs
+++ b/pbs-datastore/src/hierarchy.rs
@@ -417,10 +417,9 @@ impl Iterator for ListNamespacesRecursive {
if state.is_empty() {
return None; // there's a state but it's empty -> we're all done
}
- let iter = match state.last_mut() {
- Some(iter) => iter,
- None => return None, // unexpected, should we just unwrap?
- };
+ // should we just unwrap on None?
+ let iter = state.last_mut()?;
+
match iter.next() {
Some(Ok(ns)) => {
if state.len() < self.max_depth as usize {
--
2.39.5
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
* [pbs-devel] applied: [PATCH backup 1/5] backup: remove unneded import
2025-01-13 13:25 [pbs-devel] [PATCH backup 1/5] backup: remove unneded import Maximiliano Sandoval
` (3 preceding siblings ...)
2025-01-13 13:25 ` [pbs-devel] [PATCH backup 5/5] replace match statements with ? operator Maximiliano Sandoval
@ 2025-01-14 7:59 ` Dietmar Maurer
4 siblings, 0 replies; 6+ messages in thread
From: Dietmar Maurer @ 2025-01-14 7:59 UTC (permalink / raw)
To: Proxmox Backup Server development discussion, Maximiliano Sandoval
applied all 5 patches
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-01-14 8:00 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-01-13 13:25 [pbs-devel] [PATCH backup 1/5] backup: remove unneded import Maximiliano Sandoval
2025-01-13 13:25 ` [pbs-devel] [PATCH backup 2/5] metric_collection: remove redundant map_or Maximiliano Sandoval
2025-01-13 13:25 ` [pbs-devel] [PATCH backup 3/5] elide lifetimes when possible Maximiliano Sandoval
2025-01-13 13:25 ` [pbs-devel] [PATCH backup 4/5] sg_pt_changer: remove needless call to as_bytes() Maximiliano Sandoval
2025-01-13 13:25 ` [pbs-devel] [PATCH backup 5/5] replace match statements with ? operator Maximiliano Sandoval
2025-01-14 7:59 ` [pbs-devel] applied: [PATCH backup 1/5] backup: remove unneded import Dietmar Maurer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox