Fix attributes on mod tests; problem + Expanded a little bit the tests

Author: blyxyas

clippy_lints/src/items_after_test_module.rs

@@ -62,14 +62,13 @@ impl LateLintPass<'_> for ItemsAfterTestModule {
 
             if !in_external_macro(cx.sess(), item.span);
             then {
-                was_test_mod_visited = false;
                 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 - 1]).span.hi() + BytePos(1),
-                                hir.item(items[when_was_visited]).span.lo() - BytePos(1),
+                                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()),
 
                             format!("\n{}\n", snippet(cx, item.span, ".."))

tests/ui/items_after_test_modules/items_after_test_module.fixed

@@ -7,13 +7,21 @@ mod my_mod;
 
 fn main() {}
 
-fn should_not_lint() {}
-
 fn should_lint() {}
 
+const SHOULD_ALSO_LINT: usize = 1;
+
+fn should_not_lint() {}
+
+#[allow(dead_code)]
+#[allow(unused)] // Some attributes to check that span replacement is good enough
+#[allow(clippy::allow_attributes)]
+#[cfg(test)]
 mod tests {
     #[test]
     fn hi() {}
 }
 
 
+
+

tests/ui/items_after_test_modules/items_after_test_module.rs

@@ -9,10 +9,15 @@ fn main() {}
 
 fn should_not_lint() {}
 
+#[allow(dead_code)]
+#[allow(unused)] // Some attributes to check that span replacement is good enough
+#[allow(clippy::allow_attributes)]
 #[cfg(test)]
 mod tests {
     #[test]
     fn hi() {}
 }
 
 fn should_lint() {}
+
+const SHOULD_ALSO_LINT: usize = 1;

tests/ui/items_after_test_modules/items_after_test_module.stderr

@@ -1,5 +1,5 @@
 error: an item was found after the testing module
-  --> $DIR/items_after_test_module.rs:18:1
+  --> $DIR/items_after_test_module.rs:21:1
    |
 LL | fn should_lint() {}
    | ^^^^^^^^^^^^^^^^^^^
@@ -12,5 +12,18 @@ LL + fn should_lint() {}
 LL + 
    |
 
-error: aborting due to previous error
+error: an item was found after the testing module
+  --> $DIR/items_after_test_module.rs:23:1
+   |
+LL | const SHOULD_ALSO_LINT: usize = 1;
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+help: move the item to before the testing module was defined
+   |
+LL + 
+LL + const SHOULD_ALSO_LINT: usize = 1;
+LL + 
+   |
+
+error: aborting due to 2 previous errors