Remove suggestions, replace it with a help message

Author: blyxyas

clippy_lints/src/items_after_test_module.rs

@@ -1,10 +1,9 @@
-use clippy_utils::{diagnostics::span_lint_and_then, is_in_cfg_test, source::snippet};
-use rustc_errors::Applicability;
+use clippy_utils::{diagnostics::span_lint_and_help, is_in_cfg_test};
 use rustc_hir::{HirId, ItemId, ItemKind, Mod};
 use rustc_lint::{LateContext, LateLintPass, LintContext};
 use rustc_middle::lint::in_external_macro;
 use rustc_session::{declare_lint_pass, declare_tool_lint};
-use rustc_span::{sym, BytePos, Span};
+use rustc_span::sym;
 
 declare_clippy_lint! {
     /// ### What it does
@@ -44,42 +43,24 @@ declare_lint_pass!(ItemsAfterTestModule => [ITEMS_AFTER_TEST_MODULE]);
 impl LateLintPass<'_> for ItemsAfterTestModule {
     fn check_mod(&mut self, cx: &LateContext<'_>, _: &Mod<'_>, _: HirId) {
         let mut was_test_mod_visited = false;
-        let mut test_span: Option<Span> = None;
-        let mut when_was_visited = 0;
 
         let hir = cx.tcx.hir();
         let items = hir.items().collect::<Vec<ItemId>>();
 
-        for (i, itid) in items.iter().enumerate() {
+        for itid in items.iter() {
             let item = hir.item(*itid);
 
             if_chain! {
             if was_test_mod_visited;
-            if cx.sess().source_map().lookup_char_pos(item.span.lo()).file.name_hash ==
-                cx.sess().source_map().lookup_char_pos(test_span.unwrap().lo()).file.name_hash;
             if !matches!(item.kind, ItemKind::Mod(_));
             if !is_in_cfg_test(cx.tcx, itid.hir_id()); // The item isn't in the testing module itself
 
             if !in_external_macro(cx.sess(), item.span);
             then {
-                span_lint_and_then(cx, ITEMS_AFTER_TEST_MODULE, item.span, "an item was found after the testing module", |diag| {
-                    diag.multipart_suggestion("move the item to before the testing module was defined", vec![
-                        (item.span, String::new()), // Remove the item
-                        (
-                            Span::new(
-                                hir.item(items[when_was_visited - 2]).span.hi() + BytePos(1),
-                                hir.item(items[when_was_visited - 1]).span.lo() - BytePos(1),
-                                item.span.ctxt(), item.span.parent()),
+                span_lint_and_help(cx, ITEMS_AFTER_TEST_MODULE, item.span, "an item was found after the testing module", None, "move the item to before the testing module was defined");
+            }};
 
-                            format!("\n{}\n", snippet(cx, item.span, ".."))
-                        ) // ^ Copy the item to the new location
-                        ], Applicability::MachineApplicable);
-                    });
-					return;
-                }
-            }
-
-            if let ItemKind::Mod(mod_item) = item.kind {
+            if matches!(item.kind, ItemKind::Mod(_)) {
                 for attr in cx.tcx.get_attrs(item.owner_id.to_def_id(), sym::cfg) {
                     if_chain! {
                         if attr.has_name(sym::cfg);
@@ -88,8 +69,6 @@ impl LateLintPass<'_> for ItemsAfterTestModule {
                         if mitem.has_name(sym::test);
                         then {
                             was_test_mod_visited = true;
-                           test_span = Some(mod_item.spans.inject_use_span);
-                            when_was_visited = i;
                         }
                     }
                 }

tests/ui/items_after_test_modules/items_after_test_module.rs renamed to tests/ui/items_after_test_module.rs

@@ -1,10 +1,7 @@
 // compile-flags: --test
-// run-rustfix
 #![allow(unused)]
 #![warn(clippy::items_after_test_module)]
 
-mod my_mod;
-
 fn main() {}
 
 fn should_not_lint() {}

tests/ui/items_after_test_module.stderr

@@ -0,0 +1,19 @@
+error: an item was found after the testing module
+  --> $DIR/items_after_test_module.rs:18:1
+   |
+LL | fn should_lint() {}
+   | ^^^^^^^^^^^^^^^^^^^
+   |
+   = help: move the item to before the testing module was defined
+   = note: `-D clippy::items-after-test-module` implied by `-D warnings`
+
+error: an item was found after the testing module
+  --> $DIR/items_after_test_module.rs:20:1
+   |
+LL | const SHOULD_ALSO_LINT: usize = 1;
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = help: move the item to before the testing module was defined
+
+error: aborting due to 2 previous errors
+