Skip to content

Commit

Permalink
Fix #10713 and move the tests to a subdir
Browse files Browse the repository at this point in the history
  • Loading branch information
blyxyas committed Apr 27, 2023
1 parent c4f2c48 commit 273c898
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 8 deletions.
15 changes: 8 additions & 7 deletions clippy_lints/src/items_after_test_module.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,20 +64,21 @@ impl LateLintPass<'_> for ItemsAfterTestModule {
span_lint_and_help(cx, ITEMS_AFTER_TEST_MODULE, test_mod_span.unwrap().with_hi(item.span.hi()), "items were found after the testing module", None, "move the items to before the testing module was defined");
}};

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);
if let ItemKind::Mod(module) = item.kind && item.span.hi() == module.spans.inner_span.hi() {
// Check that it works the same way, the only I way I've found for #10713
for attr in cx.tcx.get_attrs(item.owner_id.to_def_id(), sym::cfg) {
if_chain! {
if attr.has_name(sym::cfg);
if let Some(mitems) = attr.meta_item_list();
if let [mitem] = &*mitems;
if mitem.has_name(sym::test);
then {
was_test_mod_visited = true;
test_mod_span = Some(item.span);
was_test_mod_visited = true;
test_mod_span = Some(module.spans.inner_span.with_lo(item.span.lo()));
}
}
}
}
}
}
}
}
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error: items were found after the testing module
--> $DIR/items_after_test_module.rs:13:1
--> $DIR/block_module.rs:13:1
|
LL | / mod tests {
LL | | #[test]
Expand Down
17 changes: 17 additions & 0 deletions tests/ui/items_after_test_module/imported_module.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
//@compile-flags: --test
#![allow(unused)]
#![warn(clippy::items_after_test_module)]

fn main() {}

fn should_not_lint() {}

#[cfg(test)]
mod tests; // Should not lint

fn should_lint() {}

const SHOULD_ALSO_LINT: usize = 1;
macro_rules! should_not_lint {
() => {};
}
Empty file.
1 change: 1 addition & 0 deletions tests/ui/items_after_test_module/tests/mod.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fn main() {}

0 comments on commit 273c898

Please sign in to comment.