diff --git a/compiler/rustc_errors/src/diagnostic.rs b/compiler/rustc_errors/src/diagnostic.rs
index 026b0222665..c48a8e12a00 100644
--- a/compiler/rustc_errors/src/diagnostic.rs
+++ b/compiler/rustc_errors/src/diagnostic.rs
@@ -519,16 +519,15 @@ impl Diagnostic {
 
     /// Helper for pushing to `self.suggestions`, if available (not disable).
     fn push_suggestion(&mut self, suggestion: CodeSuggestion) {
-        let in_derive = suggestion.substitutions.iter().any(|subst| {
-            subst.parts.iter().any(|part| {
+        for subst in &suggestion.substitutions {
+            for part in &subst.parts {
                 let span = part.span;
                 let call_site = span.ctxt().outer_expn_data().call_site;
-                span.in_derive_expansion() && span.overlaps_or_adjacent(call_site)
-            })
-        });
-        if in_derive {
-            // Ignore if spans is from derive macro.
-            return;
+                if span.in_derive_expansion() && span.overlaps_or_adjacent(call_site) {
+                    // Ignore if spans is from derive macro.
+                    return;
+                }
+            }
         }
 
         if let Ok(suggestions) = &mut self.suggestions {