a bit of clean up

Author: DevinR528

clippy_lints/src/macro_use.rs

@@ -9,11 +9,6 @@ use rustc_session::{declare_tool_lint, impl_lint_pass};
 use rustc_span::{edition::Edition, Span};
 use rustc_ast::ast;
 
-const PRELUDE: &[&str] = &[
-    "marker", "ops", "convert", "iter", "option", "result", "borrow", "boxed", "string", "vec", "macros",
-];
-const BRACKETS: &[char] = &['<', '>'];
-
 declare_clippy_lint! {
     /// **What it does:** Checks for `#[macro_use] use...`.
     ///
@@ -32,6 +27,8 @@ declare_clippy_lint! {
     "#[macro_use] is no longer needed"
 }
 
+const BRACKETS: &[char] = &['<', '>'];
+
 /// MacroRefData includes the name of the macro
 /// and the path from `SourceMap::span_to_filename`.
 #[derive(Debug, Clone)]
@@ -61,30 +58,15 @@ impl MacroRefData {
 
 #[derive(Default)]
 pub struct MacroUseImports {
-    /// the actual import path used and its span.
+    /// the actual import path used and the span of the attribute above it.
     imports: Vec<(String, Span)>,
     /// the span of the macro reference and the `MacroRefData`
     /// for the use of the macro.
+    /// TODO make this FxHashSet<Span> to guard against inserting already found macros
     collected: FxHashMap<Span, MacroRefData>,
     mac_refs: Vec<(Span, MacroRefData)>,
 }
 
-/// This is somewhat of a fallback for imports from `std::prelude` because they
-/// are not recognized by `LateLintPass::check_item` `lcx.tcx.item_children(id)`
-fn make_path(mac: &MacroRefData, use_path: &str) -> String {
-    let segs = mac.path.split("::").filter(|s| *s != "").collect::<Vec<_>>();
-
-    if segs.starts_with(&["std"]) && PRELUDE.iter().any(|m| segs.contains(m)) {
-        return format!("std::prelude::{} is imported by default, remove `use` statement", mac.name);
-    }
-
-    if use_path.split("::").count() == 1 {
-        return format!("{}::{}", use_path, mac.name);
-    }
-
-    mac.path.clone()
-}
-
 impl_lint_pass!(MacroUseImports => [MACRO_USE_IMPORTS]);
 
 impl<'l, 'txc> LateLintPass<'l, 'txc> for MacroUseImports {
@@ -233,9 +215,30 @@ impl<'l, 'txc> LateLintPass<'l, 'txc> for MacroUseImports {
             }
         }
         if !self.mac_refs.is_empty() {
-            // TODO if not empty we found one would could not make a suggestion for
+            // TODO if not empty we found one we could not make a suggestion for
             // such as std::prelude::v1 or something else I haven't thought of.
             // println!("{:#?}", self.mac_refs);
         }
     }
 }
+
+
+const PRELUDE: &[&str] = &[
+    "marker", "ops", "convert", "iter", "option", "result", "borrow", "boxed", "string", "vec", "macros",
+];
+
+/// This is somewhat of a fallback for imports from `std::prelude` because they
+/// are not recognized by `LateLintPass::check_item` `lcx.tcx.item_children(id)`
+fn make_path(mac: &MacroRefData, use_path: &str) -> String {
+    let segs = mac.path.split("::").filter(|s| *s != "").collect::<Vec<_>>();
+
+    if segs.starts_with(&["std"]) && PRELUDE.iter().any(|m| segs.contains(m)) {
+        return format!("std::prelude::{} is imported by default, remove `use` statement", mac.name);
+    }
+
+    if use_path.split("::").count() == 1 {
+        return format!("{}::{}", use_path, mac.name);
+    }
+
+    mac.path.clone()
+}