refactor(clippy): collapse nested if blocks across multiple files (#711)

Author: github-actions[bot]

src/compile/filter_ir.rs

@@ -632,17 +632,17 @@ pub fn validate_pr_filters(filters: &super::types::PrFilters) -> Vec<Diagnostic>
     let mut diags = Vec::new();
 
     // min_changes > max_changes
-    if let (Some(min), Some(max)) = (filters.min_changes, filters.max_changes) {
-        if min > max {
-            diags.push(Diagnostic {
-                severity: Severity::Error,
-                filter: "min-changes / max-changes".into(),
-                message: format!(
-                    "min-changes ({}) is greater than max-changes ({}) — no PR can satisfy both",
-                    min, max
-                ),
-            });
-        }
+    if let (Some(min), Some(max)) = (filters.min_changes, filters.max_changes)
+        && min > max
+    {
+        diags.push(Diagnostic {
+            severity: Severity::Error,
+            filter: "min-changes / max-changes".into(),
+            message: format!(
+                "min-changes ({}) is greater than max-changes ({}) — no PR can satisfy both",
+                min, max
+            ),
+        });
     }
 
     // Time window validation

src/compile/pr_filters.rs

@@ -30,38 +30,38 @@ pub(super) fn generate_native_pr_trigger(pr: &PrTriggerConfig) -> String {
 
     let mut yaml = String::from("pr:\n");
 
-    if let Some(branches) = &pr.branches {
-        if !branches.include.is_empty() || !branches.exclude.is_empty() {
-            yaml.push_str("  branches:\n");
-            if !branches.include.is_empty() {
-                yaml.push_str("    include:\n");
-                for b in &branches.include {
-                    yaml.push_str(&format!("      - '{}'\n", b.replace('\'', "''")));
-                }
+    if let Some(branches) = &pr.branches
+        && (!branches.include.is_empty() || !branches.exclude.is_empty())
+    {
+        yaml.push_str("  branches:\n");
+        if !branches.include.is_empty() {
+            yaml.push_str("    include:\n");
+            for b in &branches.include {
+                yaml.push_str(&format!("      - '{}'\n", b.replace('\'', "''")));
             }
-            if !branches.exclude.is_empty() {
-                yaml.push_str("    exclude:\n");
-                for b in &branches.exclude {
-                    yaml.push_str(&format!("      - '{}'\n", b.replace('\'', "''")));
-                }
+        }
+        if !branches.exclude.is_empty() {
+            yaml.push_str("    exclude:\n");
+            for b in &branches.exclude {
+                yaml.push_str(&format!("      - '{}'\n", b.replace('\'', "''")));
             }
         }
     }
 
-    if let Some(paths) = &pr.paths {
-        if !paths.include.is_empty() || !paths.exclude.is_empty() {
-            yaml.push_str("  paths:\n");
-            if !paths.include.is_empty() {
-                yaml.push_str("    include:\n");
-                for p in &paths.include {
-                    yaml.push_str(&format!("      - '{}'\n", p.replace('\'', "''")));
-                }
+    if let Some(paths) = &pr.paths
+        && (!paths.include.is_empty() || !paths.exclude.is_empty())
+    {
+        yaml.push_str("  paths:\n");
+        if !paths.include.is_empty() {
+            yaml.push_str("    include:\n");
+            for p in &paths.include {
+                yaml.push_str(&format!("      - '{}'\n", p.replace('\'', "''")));
             }
-            if !paths.exclude.is_empty() {
-                yaml.push_str("    exclude:\n");
-                for p in &paths.exclude {
-                    yaml.push_str(&format!("      - '{}'\n", p.replace('\'', "''")));
-                }
+        }
+        if !paths.exclude.is_empty() {
+            yaml.push_str("    exclude:\n");
+            for p in &paths.exclude {
+                yaml.push_str(&format!("      - '{}'\n", p.replace('\'', "''")));
             }
         }
     }

src/logging.rs

@@ -98,11 +98,11 @@ impl log::Log for FileLogger {
             );
 
             // Write to file (always capture debug+)
-            if record.level() <= self.file_level {
-                if let Ok(mut file) = self.file.lock() {
-                    let _ = file.write_all(message.as_bytes());
-                    let _ = file.flush();
-                }
+            if record.level() <= self.file_level
+                && let Ok(mut file) = self.file.lock()
+            {
+                let _ = file.write_all(message.as_bytes());
+                let _ = file.flush();
             }
 
             // Write to stderr according to selected runtime verbosity

src/mcp.rs

@@ -1525,17 +1525,17 @@ pub async fn run_http(
                 // Constant-time comparison to prevent timing side-channels.
                 // Length check is non-constant-time but leaking length doesn't
                 // help brute-force a high-entropy token.
-                if let Some(auth) = req.headers().get("authorization") {
-                    if let Ok(auth_str) = auth.to_str() {
-                        let expected_header = format!("Bearer {}", expected);
-                        use subtle::ConstantTimeEq;
-                        let expected_bytes = expected_header.as_bytes();
-                        let provided_bytes = auth_str.as_bytes();
-                        if expected_bytes.len() == provided_bytes.len()
-                            && expected_bytes.ct_eq(provided_bytes).into()
-                        {
-                            return next.run(req).await;
-                        }
+                if let Some(auth) = req.headers().get("authorization")
+                    && let Ok(auth_str) = auth.to_str()
+                {
+                    let expected_header = format!("Bearer {}", expected);
+                    use subtle::ConstantTimeEq;
+                    let expected_bytes = expected_header.as_bytes();
+                    let provided_bytes = auth_str.as_bytes();
+                    if expected_bytes.len() == provided_bytes.len()
+                        && expected_bytes.ct_eq(provided_bytes).into()
+                    {
+                        return next.run(req).await;
                     }
                 }
 

src/runtimes/dotnet/extension.rs

@@ -110,29 +110,28 @@ in the repository.\n"
 
         // Validate version string. Skip the injection check for the
         // `global.json` sentinel — it's a literal keyword, not a version.
-        if let Some(version) = self.config.version() {
-            if !version.eq_ignore_ascii_case(GLOBAL_JSON_SENTINEL) {
-                validate::reject_pipeline_injection(version, "runtimes.dotnet.version")?;
-            }
+        if let Some(version) = self.config.version()
+            && !version.eq_ignore_ascii_case(GLOBAL_JSON_SENTINEL)
+        {
+            validate::reject_pipeline_injection(version, "runtimes.dotnet.version")?;
         }
 
         // global.json conflict detection: if the agent's compile directory
         // contains a `global.json`, the SDK version is already pinned by
         // that file and the front matter must not also specify an explicit
         // version. Either drop the version or set `version: "global.json"`.
-        if let Some(compile_dir) = ctx.compile_dir {
-            if compile_dir.join("global.json").exists()
-                && self.config.version().is_some()
-                && !self.config.use_global_json()
-            {
-                anyhow::bail!(
-                    "runtimes.dotnet.version: a 'global.json' file exists at '{}', \
-                     which already pins the .NET SDK version. Either remove \
-                     'runtimes.dotnet.version' or set it to the literal string \
-                     'global.json' to use UseDotNet@2's useGlobalJson mode.",
-                    compile_dir.display()
-                );
-            }
+        if let Some(compile_dir) = ctx.compile_dir
+            && compile_dir.join("global.json").exists()
+            && self.config.version().is_some()
+            && !self.config.use_global_json()
+        {
+            anyhow::bail!(
+                "runtimes.dotnet.version: a 'global.json' file exists at '{}', \
+                 which already pins the .NET SDK version. Either remove \
+                 'runtimes.dotnet.version' or set it to the literal string \
+                 'global.json' to use UseDotNet@2's useGlobalJson mode.",
+                compile_dir.display()
+            );
         }
 
         // Validate config path (defend against pipeline injection). The value

src/update_check.rs

@@ -26,13 +26,13 @@ pub async fn check_for_update() {
             // Only print if the version parses to a valid semver triple so we
             // never forward raw API content (e.g. ANSI escape sequences) to
             // the terminal.  Use the reconstructed string, not `latest`.
-            if let Some((maj, min, pat)) = parse_version(latest) {
-                if (maj, min, pat) > parse_version(CURRENT_VERSION).unwrap_or((0, 0, 0)) {
-                    eprintln!(
-                        "A newer version of ado-aw is available: v{maj}.{min}.{pat} (you have v{CURRENT_VERSION}).\n\
-                         Update at: https://github.com/githubnext/ado-aw/releases/latest"
-                    );
-                }
+            if let Some((maj, min, pat)) = parse_version(latest)
+                && (maj, min, pat) > parse_version(CURRENT_VERSION).unwrap_or((0, 0, 0))
+            {
+                eprintln!(
+                    "A newer version of ado-aw is available: v{maj}.{min}.{pat} (you have v{CURRENT_VERSION}).\n\
+                     Update at: https://github.com/githubnext/ado-aw/releases/latest"
+                );
             }
         }
         Err(e) => {