From 898baf81cdaf1682c6cbf6e575fb546741bc73a0 Mon Sep 17 00:00:00 2001 From: Samuel Moelius Date: Sat, 20 Apr 2024 01:16:30 +0000 Subject: [PATCH 1/2] Add `test_with_disallowed_name` --- tests/ui/disallowed_names.rs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/ui/disallowed_names.rs b/tests/ui/disallowed_names.rs index 9a701a2cbcf..13c883409bf 100644 --- a/tests/ui/disallowed_names.rs +++ b/tests/ui/disallowed_names.rs @@ -71,3 +71,8 @@ fn nested() { } } } + +#[test] +fn test_with_disallowed_name() { + let foo = 0; +} From de258cc6becde010381502ae0e80b4aca4064e3c Mon Sep 17 00:00:00 2001 From: Samuel Moelius Date: Sat, 20 Apr 2024 01:17:28 +0000 Subject: [PATCH 2/2] Fix `is_test_module_or_function` --- clippy_utils/src/lib.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/clippy_utils/src/lib.rs b/clippy_utils/src/lib.rs index a13885b022f..5ea9b375f5b 100644 --- a/clippy_utils/src/lib.rs +++ b/clippy_utils/src/lib.rs @@ -2505,8 +2505,9 @@ fn with_test_item_names(tcx: TyCtxt<'_>, module: LocalModDefId, f: impl Fn(&[Sym /// Note: Add `//@compile-flags: --test` to UI tests with a `#[test]` function pub fn is_in_test_function(tcx: TyCtxt<'_>, id: HirId) -> bool { with_test_item_names(tcx, tcx.parent_module(id), |names| { - tcx.hir() - .parent_iter(id) + let node = tcx.hir_node(id); + once((id, node)) + .chain(tcx.hir().parent_iter(id)) // Since you can nest functions we need to collect all until we leave // function scope .any(|(_id, node)| {