[pdm-devel] [PATCH proxmox-yew-comp 04/15] apt_repositories: collapse else-if blocks

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

Fixes:

warning: this `else { if .. }` block can be collapsed
   --> src/apt_repositories.rs:151:12
    |
151 |       } else {
    |  ____________^
152 | |         if config.errors.is_empty() {
153 | |             // just avoid that we show "get updates"
154 | |             if has_test || has_no_subscription {
...   |
165 | |         }
166 | |     }
    | |_____^
    |
    = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#collapsible_else_if
    = note: `#[warn(clippy::collapsible_else_if)]` on by default
help: collapse nested if block
    |
151 ~     } else if config.errors.is_empty() {
152 +         // just avoid that we show "get updates"
153 +         if has_test || has_no_subscription {
154 +             list.push(StatusLine::ok(tr!(
155 +                 "You get updates for {0}",
156 +                 product.project_text()
157 +             )));
158 +         } else if has_enterprise && active_subscription {
159 +             list.push(StatusLine::ok(tr!(
160 +                 "You get supported updates for {0}",
161 +                 product.project_text()
162 +             )));
163 +         }
164 +     }
    |

Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
 src/apt_repositories.rs | 43 +++++++++++++++++++----------------------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/src/apt_repositories.rs b/src/apt_repositories.rs
index 534d642..8e6207f 100644
--- a/src/apt_repositories.rs
+++ b/src/apt_repositories.rs
@@ -148,20 +148,18 @@ fn update_status_store(
             "No {0} repository is enabled, you do not get any updates!",
             product.project_text()
         )));
-    } else {
-        if config.errors.is_empty() {
-            // just avoid that we show "get updates"
-            if has_test || has_no_subscription {
-                list.push(StatusLine::ok(tr!(
-                    "You get updates for {0}",
-                    product.project_text()
-                )));
-            } else if has_enterprise && active_subscription {
-                list.push(StatusLine::ok(tr!(
-                    "You get supported updates for {0}",
-                    product.project_text()
-                )));
-            }
+    } else if config.errors.is_empty() {
+        // just avoid that we show "get updates"
+        if has_test || has_no_subscription {
+            list.push(StatusLine::ok(tr!(
+                "You get updates for {0}",
+                product.project_text()
+            )));
+        } else if has_enterprise && active_subscription {
+            list.push(StatusLine::ok(tr!(
+                "You get supported updates for {0}",
+                product.project_text()
+            )));
         }
     }
 
@@ -186,20 +184,19 @@ fn update_status_store(
             ignore_pre_upgrade_warning.insert((&info.path, info.index));
             check_mixed_suites = true;
         }
-        if info.kind == "origin" {
-            if info.message == "Debian" || info.message == "Proxmox" {
-                controlled_origin.insert((&info.path, info.index));
-            }
+        if info.kind == "origin" && (info.message == "Debian" || info.message == "Proxmox") {
+            controlled_origin.insert((&info.path, info.index));
         }
     }
 
     let mut suites_warning = false;
     for info in &config.infos {
-        if info.kind == "warning" && info.property.as_deref() == Some("Suites") {
-            if enabled_repos.contains(&(&info.path, info.index)) {
-                suites_warning = true;
-                break;
-            }
+        if info.kind == "warning"
+            && info.property.as_deref() == Some("Suites")
+            && enabled_repos.contains(&(&info.path, info.index))
+        {
+            suites_warning = true;
+            break;
         }
     }
 
-- 
2.39.5



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