Fix #10713 and move the tests to a subdir

This commit is contained in:
blyxyas 2023-04-27 16:43:51 +02:00
parent c4f2c48d9b
commit 273c898aef
No known key found for this signature in database
GPG Key ID: 4D38170B5A2FC334
6 changed files with 27 additions and 8 deletions

View File

@ -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()));
}
}
}
}
}
}
}
}

View File

@ -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]

View File

@ -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 {
() => {};
}

View File

@ -0,0 +1 @@
fn main() {}