Manual cleanup of some is_{or_none|some_and} usages

2025-01-19 20:50:43 +00:00
parent 264fa0fc54
commit 1951d86a35
7 changed files with 12 additions and 8 deletions
--- a/compiler/rustc_errors/src/json.rs
+++ b/compiler/rustc_errors/src/json.rs
@@ -463,7 +463,8 @@ impl DiagnosticSpan {
        // is an empty string, increase the length to include the newline so we don't
        // leave an empty line
        if start.col.0 == 0
-            && suggestion.is_some_and(|(s, _)| s.is_empty())
+            && let Some((suggestion, _)) = suggestion
+            && suggestion.is_empty()
            && let Ok(after) = je.sm.span_to_next_source(span)
            && after.starts_with('\n')
        {