more clippy lints

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

src/api2/admin/datastore.rs

@@ -164,8 +164,8 @@ fn list_groups(
 
         let list_all = (user_privs & PRIV_DATASTORE_AUDIT) != 0;
         let owner = datastore.get_owner(group)?;
-        if !list_all {
+        if !list_all && owner != userid {
-            if owner != userid { continue; }
+            continue;
         }
 
         let result_item = GroupListItem {
@@ -355,8 +355,8 @@ pub fn list_snapshots (
         let list_all = (user_privs & PRIV_DATASTORE_AUDIT) != 0;
         let owner = datastore.get_owner(group)?;
 
-        if !list_all {
+        if !list_all && owner != userid {
-            if owner != userid { continue; }
+            continue;
         }
 
         let mut size = None;

src/api2/node/rrd.rs

@@ -31,10 +31,8 @@ pub fn create_value_from_rrd(
                 } else {
                     result.push(json!({ "time": t }));
                 }
-            } else {
+            } else if let Some(value) = list[index] {
-                if let Some(value) = list[index] {
+                result[index][name] = value.into();
-                    result[index][name] = value.into();
-                }
             }
             t += reso;
         }

src/client/pull.rs

@@ -531,20 +531,22 @@ pub async fn pull_store(
                                item.backup_type, item.backup_id, userid, owner));
             errors = true; // do not stop here, instead continue
 
-        } else {
+        } else if let Err(err) = pull_group(
-
+            worker,
-            if let Err(err) = pull_group(
+            client,
-                worker,
+            src_repo,
-                client,
+            tgt_store.clone(),
-                src_repo,
+            &group,
-                tgt_store.clone(),
+            delete,
-                &group,
+            Some((groups_done, group_count)),
-                delete,
+        ).await {
-                Some((groups_done, group_count)),
+            worker.log(format!(
-            ).await {
+                "sync group {}/{} failed - {}",
-                worker.log(format!("sync group {}/{} failed - {}", item.backup_type, item.backup_id, err));
+                item.backup_type,
-                errors = true; // do not stop here, instead continue
+                item.backup_id,
-            }
+                err,
+            ));
+            errors = true; // do not stop here, instead continue
         }
     }
 

src/client/task_log.rs

@@ -43,8 +43,8 @@ pub async fn display_task_log(
             } else {
                 break;
             }
-        } else {
+        } else if lines != limit {
-            if lines != limit { bail!("got wrong number of lines from server ({} != {})", lines, limit); }
+            bail!("got wrong number of lines from server ({} != {})", lines, limit);
         }
     }
 

src/config/cached_user_info.rs

@@ -64,10 +64,8 @@ impl CachedUserInfo {
                 return false;
             }
             if let Some(expire) = info.expire {
-                if expire > 0 {
+                if expire > 0 && expire <= now() {
-                    if expire <= now() {
+                    return false;
-                        return false;
-                    }
                 }
             }
             return true;

src/config/network.rs

@@ -289,8 +289,12 @@ impl Interface {
 
         if let Some(method6) = self.method6 {
             let mut skip_v6 = false; // avoid empty inet6 manual entry
-            if self.method.is_some() && method6 == NetworkConfigMethod::Manual {
+            if self.method.is_some()
-                if self.comments6.is_none() && self.options6.is_empty() { skip_v6 = true; }
+                && method6 == NetworkConfigMethod::Manual
+                && self.comments6.is_none()
+                && self.options6.is_empty()
+            {
+                skip_v6 = true;
             }
 
             if !skip_v6 {

src/config/network/helper.rs

@@ -10,7 +10,7 @@ use regex::Regex;
 
 use proxmox::*; // for IP macros
 
-pub static IPV4_REVERSE_MASK: &[&'static str] = &[
+pub static IPV4_REVERSE_MASK: &[&str] = &[
     "0.0.0.0",
     "128.0.0.0",
     "192.0.0.0",