From 53b2aca9da2af900bae32a4b7d389cf8fbbf6709 Mon Sep 17 00:00:00 2001
From: Isak Nyberg <36712644+IsakNyberg@users.noreply.github.com>
Date: Thu, 14 Apr 2022 00:22:08 +0200
Subject: [PATCH 1/2] Refactor loop into iterator; simplify negation logic.

---
 compiler/rustc_error_messages/src/lib.rs | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/compiler/rustc_error_messages/src/lib.rs b/compiler/rustc_error_messages/src/lib.rs
index b33e6b6611706..894f3fdaf596d 100644
--- a/compiler/rustc_error_messages/src/lib.rs
+++ b/compiler/rustc_error_messages/src/lib.rs
@@ -320,18 +320,12 @@ impl MultiSpan {
 
     /// Returns `true` if any of the primary spans are displayable.
     pub fn has_primary_spans(&self) -> bool {
-        self.primary_spans.iter().any(|sp| !sp.is_dummy())
+        !self.primary_spans.iter().all(|sp| sp.is_dummy())
     }
 
     /// Returns `true` if this contains only a dummy primary span with any hygienic context.
     pub fn is_dummy(&self) -> bool {
-        let mut is_dummy = true;
-        for span in &self.primary_spans {
-            if !span.is_dummy() {
-                is_dummy = false;
-            }
-        }
-        is_dummy
+        self.primary_spans.iter().all(|sp| sp.is_dummy())
     }
 
     /// Replaces all occurrences of one Span with another. Used to move `Span`s in areas that don't

From 657ae03f603f137364bcbe97a17fc8cef3b18642 Mon Sep 17 00:00:00 2001
From: Isak Nyberg <36712644+IsakNyberg@users.noreply.github.com>
Date: Sat, 16 Apr 2022 23:52:18 +0200
Subject: [PATCH 2/2] Update compiler/rustc_error_messages/src/lib.rs

Co-authored-by: Janusz Marcinkiewicz <virrages@gmail.com>
---
 compiler/rustc_error_messages/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/rustc_error_messages/src/lib.rs b/compiler/rustc_error_messages/src/lib.rs
index 894f3fdaf596d..0dc708b419e58 100644
--- a/compiler/rustc_error_messages/src/lib.rs
+++ b/compiler/rustc_error_messages/src/lib.rs
@@ -320,7 +320,7 @@ impl MultiSpan {
 
     /// Returns `true` if any of the primary spans are displayable.
     pub fn has_primary_spans(&self) -> bool {
-        !self.primary_spans.iter().all(|sp| sp.is_dummy())
+        !self.is_dummy()
     }
 
     /// Returns `true` if this contains only a dummy primary span with any hygienic context.