Merge branch 'resolve-cleanups3' into misc-cleanups

Author: yotamofek

compiler/rustc_resolve/src/diagnostics.rs

@@ -1,4 +1,4 @@
-use std::cmp::Reverse;
+use std::cmp;
 
 use rustc_ast::expand::StrippedCfgItem;
 use rustc_ast::ptr::P;
@@ -1309,12 +1309,16 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
                     let is_extern_crate_that_also_appears_in_prelude =
                         name_binding.is_extern_crate() && lookup_ident.span.at_least_rust_2018();
 
-                    if !is_extern_crate_that_also_appears_in_prelude || alias_import {
+                    if (!is_extern_crate_that_also_appears_in_prelude || alias_import)
                         // add the module to the lookup
-                        if seen_modules.insert(module.def_id()) {
-                            if via_import { &mut worklist_via_import } else { &mut worklist }
-                                .push((module, path_segments, child_accessible, child_doc_visible));
-                        }
+                        && seen_modules.insert(module.def_id())
+                    {
+                        if via_import { &mut worklist_via_import } else { &mut worklist }.push((
+                            module,
+                            path_segments,
+                            child_accessible,
+                            child_doc_visible,
+                        ));
                     }
                 }
             })
@@ -3082,20 +3086,21 @@ impl<'tcx> visit::Visitor<'tcx> for UsePlacementFinder {
 }
 
 fn search_for_any_use_in_items(items: &[P<ast::Item>]) -> Option<Span> {
-    for item in items {
-        if let ItemKind::Use(..) = item.kind
-            && is_span_suitable_for_use_injection(item.span)
-        {
-            let mut lo = item.span.lo();
-            for attr in &item.attrs {
-                if attr.span.eq_ctxt(item.span) {
-                    lo = std::cmp::min(lo, attr.span.lo());
-                }
-            }
-            return Some(Span::new(lo, lo, item.span.ctxt(), item.span.parent()));
-        }
-    }
-    None
+    items
+        .iter()
+        .find(|item| {
+            matches!(item.kind, ItemKind::Use(..)) && is_span_suitable_for_use_injection(item.span)
+        })
+        .map(|item| {
+            let lo = item
+                .attrs
+                .iter()
+                .filter(|attr| attr.span.eq_ctxt(item.span))
+                .map(|attr| attr.span.lo())
+                .fold(item.span.lo(), cmp::min);
+
+            Span::new(lo, lo, item.span.ctxt(), item.span.parent())
+        })
 }
 
 fn is_span_suitable_for_use_injection(s: Span) -> bool {