From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup v2 01/14] api2/tape: clippy fixes
Date: Fri, 16 Apr 2021 12:28:57 +0200 [thread overview]
Message-ID: <20210416102910.8506-2-d.csapak@proxmox.com> (raw)
In-Reply-To: <20210416102910.8506-1-d.csapak@proxmox.com>
fixes:
* too_many_arguments
* `if let Err(_) = ` => `.is_err()`
* combine if branches
* remove unnecessary lifetime
* remove unnecessary return
* `.len() == 0` => `.is_empty()`
* `find().is_some()` => `.any()`
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
src/api2/config/tape_backup_job.rs | 1 +
src/api2/tape/backup.rs | 2 +-
src/api2/tape/media.rs | 42 ++++++++++++++----------------
src/api2/tape/restore.rs | 12 ++++-----
4 files changed, 28 insertions(+), 29 deletions(-)
diff --git a/src/api2/config/tape_backup_job.rs b/src/api2/config/tape_backup_job.rs
index caea4e18..70d1f6af 100644
--- a/src/api2/config/tape_backup_job.rs
+++ b/src/api2/config/tape_backup_job.rs
@@ -219,6 +219,7 @@ pub enum DeletableProperty {
},
)]
/// Update the tape backup job
+#[allow(clippy::too_many_arguments)]
pub fn update_tape_backup_job(
id: String,
store: Option<String>,
diff --git a/src/api2/tape/backup.rs b/src/api2/tape/backup.rs
index bce0fbcc..18153048 100644
--- a/src/api2/tape/backup.rs
+++ b/src/api2/tape/backup.rs
@@ -607,7 +607,7 @@ pub fn backup_snapshot(
}
}
- if let Err(_) = reader_thread.join() {
+ if reader_thread.join().is_err() {
bail!("chunk reader thread failed");
}
diff --git a/src/api2/tape/media.rs b/src/api2/tape/media.rs
index 811fcb7e..b1497fb3 100644
--- a/src/api2/tape/media.rs
+++ b/src/api2/tape/media.rs
@@ -173,32 +173,30 @@ pub async fn list_media(
let inventory = Inventory::load(status_path)?;
let privs = user_info.lookup_privs(&auth_id, &["tape", "pool"]);
- if (privs & PRIV_TAPE_AUDIT) != 0 {
- if pool.is_none() {
+ if (privs & PRIV_TAPE_AUDIT) != 0 && pool.is_none() {
- for media_id in inventory.list_unassigned_media() {
+ for media_id in inventory.list_unassigned_media() {
- let (mut status, location) = inventory.status_and_location(&media_id.label.uuid);
+ let (mut status, location) = inventory.status_and_location(&media_id.label.uuid);
- if status == MediaStatus::Unknown {
- status = MediaStatus::Writable;
- }
-
- list.push(MediaListEntry {
- uuid: media_id.label.uuid.clone(),
- ctime: media_id.label.ctime,
- label_text: media_id.label.label_text.to_string(),
- location,
- status,
- catalog: true, // empty, so we do not need a catalog
- expired: false,
- media_set_uuid: None,
- media_set_name: None,
- media_set_ctime: None,
- seq_nr: None,
- pool: None,
- });
+ if status == MediaStatus::Unknown {
+ status = MediaStatus::Writable;
}
+
+ list.push(MediaListEntry {
+ uuid: media_id.label.uuid.clone(),
+ ctime: media_id.label.ctime,
+ label_text: media_id.label.label_text.to_string(),
+ location,
+ status,
+ catalog: true, // empty, so we do not need a catalog
+ expired: false,
+ media_set_uuid: None,
+ media_set_name: None,
+ media_set_ctime: None,
+ seq_nr: None,
+ pool: None,
+ });
}
}
diff --git a/src/api2/tape/restore.rs b/src/api2/tape/restore.rs
index 5cadd6dd..45a035d0 100644
--- a/src/api2/tape/restore.rs
+++ b/src/api2/tape/restore.rs
@@ -137,7 +137,7 @@ impl TryFrom<String> for DataStoreMap {
}
impl DataStoreMap {
- fn used_datastores<'a>(&self) -> HashSet<&str> {
+ fn used_datastores(&self) -> HashSet<&str> {
let mut set = HashSet::new();
for store in self.map.values() {
set.insert(store.name());
@@ -158,7 +158,7 @@ impl DataStoreMap {
return Some(&store);
}
- return None;
+ None
}
}
@@ -212,7 +212,7 @@ pub fn restore(
let store_map = DataStoreMap::try_from(store)
.map_err(|err| format_err!("cannot parse store mapping: {}", err))?;
let used_datastores = store_map.used_datastores();
- if used_datastores.len() == 0 {
+ if used_datastores.is_empty() {
bail!("no datastores given");
}
@@ -369,6 +369,7 @@ pub fn restore(
}
/// Request and restore complete media without using existing catalog (create catalog instead)
+#[allow(clippy::too_many_arguments)]
pub fn request_and_restore_media(
worker: &WorkerTask,
media_id: &MediaId,
@@ -878,13 +879,12 @@ pub fn fast_catalog_restore(
let wanted = media_set
.media_list()
.iter()
- .find(|e| {
+ .any(|e| {
match e {
None => false,
Some(uuid) => uuid == catalog_uuid,
}
- })
- .is_some();
+ });
if !wanted {
task_log!(worker, "skip catalog because media '{}' not inventarized", catalog_uuid);
--
2.20.1
next prev parent reply other threads:[~2021-04-16 10:29 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-16 10:28 [pbs-devel] [PATCH proxmox-backup v2 00/14] various " Dominik Csapak
2021-04-16 10:28 ` Dominik Csapak [this message]
2021-04-16 10:28 ` [pbs-devel] [PATCH proxmox-backup v2 02/14] tape/changer: " Dominik Csapak
2021-04-16 10:28 ` [pbs-devel] [PATCH proxmox-backup v2 03/14] tape/drive: " Dominik Csapak
2021-04-16 10:29 ` [pbs-devel] [PATCH proxmox-backup v2 04/14] tape/media_*: " Dominik Csapak
2021-04-16 10:29 ` [pbs-devel] [PATCH proxmox-backup v2 05/14] tape/pool_writer: " Dominik Csapak
2021-04-16 10:29 ` [pbs-devel] [PATCH proxmox-backup v2 06/14] backup: " Dominik Csapak
2021-04-16 10:29 ` [pbs-devel] [PATCH proxmox-backup v2 07/14] pxar: clippy fix `or_fun_call` Dominik Csapak
2021-04-16 10:29 ` [pbs-devel] [PATCH proxmox-backup v2 08/14] bin: clippy fixes Dominik Csapak
2021-04-16 10:29 ` [pbs-devel] [PATCH proxmox-backup v2 09/14] tape/*: " Dominik Csapak
2021-04-16 10:29 ` [pbs-devel] [PATCH proxmox-backup v2 10/14] tools: " Dominik Csapak
2021-04-16 10:29 ` [pbs-devel] [PATCH proxmox-backup v2 11/14] config/tape_encryption_keys: " Dominik Csapak
2021-04-16 10:29 ` [pbs-devel] [PATCH proxmox-backup v2 12/14] server/worker_task: clippy fix Dominik Csapak
2021-04-16 10:29 ` [pbs-devel] [PATCH proxmox-backup v2 13/14] bin/proxmox-file-restore: clippy fixes Dominik Csapak
2021-04-16 10:29 ` [pbs-devel] [PATCH proxmox-backup v2 14/14] bin/proxmox-restore-daemon: " Dominik Csapak
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=20210416102910.8506-2-d.csapak@proxmox.com \
--to=d.csapak@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