WIP: Error using cargo uibless

Author: paulmialane

clippy_lints/src/inherent_impl.rs

@@ -1,7 +1,7 @@
 use clippy_config::Conf;
 use clippy_config::types::InherentImplLintScope;
 use clippy_utils::diagnostics::span_lint_and_then;
-use clippy_utils::is_lint_allowed;
+use clippy_utils::fulfill_or_allowed;
 use rustc_data_structures::fx::FxHashMap;
 use rustc_hir::def_id::{LocalDefId, LocalModDefId};
 use rustc_hir::{Item, ItemKind, Node};
@@ -81,10 +81,10 @@ impl<'tcx> LateLintPass<'tcx> for MultipleInherentImpl {
         for (&id, impl_ids) in &impls.inherent_impls {
             if impl_ids.len() < 2
             // Check for `#[allow]` on the type definition
-            || is_lint_allowed(
+            || fulfill_or_allowed(
                 cx,
                 MULTIPLE_INHERENT_IMPL,
-                cx.tcx.local_def_id_to_hir_id(id),
+                [cx.tcx.local_def_id_to_hir_id(id)],
             ) {
                 continue;
             }
@@ -95,18 +95,8 @@ impl<'tcx> LateLintPass<'tcx> for MultipleInherentImpl {
                 let criterion = match self.scope {
                     InherentImplLintScope::Module => Criterion::Module(cx.tcx.parent_module(hir_id)),
                     InherentImplLintScope::File => {
-                        if let Node::Item(&Item {
-                            kind: ItemKind::Impl(_impl_id),
-                            span,
-                            ..
-                        }) = cx.tcx.hir_node(hir_id)
-                        {
-                            Criterion::File(cx.tcx.sess.source_map().lookup_source_file(span.lo()).name.clone())
-                        } else {
-                            // We know we are working on an impl, so the pattern matching can
-                            // not fail
-                            unreachable!()
-                        }
+                        let span = cx.tcx.hir_span(hir_id);
+                        Criterion::File(cx.tcx.sess.source_map().lookup_source_file(span.lo()).name.clone())
                     },
                     InherentImplLintScope::Crate => Criterion::Crate,
                 };
@@ -168,7 +158,7 @@ fn get_impl_span(cx: &LateContext<'_>, id: LocalDefId) -> Option<Span> {
     {
         (!span.from_expansion()
             && impl_item.generics.params.is_empty()
-            && !is_lint_allowed(cx, MULTIPLE_INHERENT_IMPL, id))
+            && !fulfill_or_allowed(cx, MULTIPLE_INHERENT_IMPL, [id]))
         .then_some(span)
     } else {
         None

tests/ui/impl.rs

@@ -68,7 +68,26 @@ struct OneAllowedImpl;
 impl OneAllowedImpl {}
 #[allow(clippy::multiple_inherent_impl)]
 impl OneAllowedImpl {}
-impl OneAllowedImpl {} // Lint, only one of the three blocks is allowed.
+impl OneAllowedImpl {}
+//~^ multiple_inherent_impl
+
+#[expect(clippy::multiple_inherent_impl)]
+struct ExpectedFulfilled;
+
+impl ExpectedFulfilled {}
+impl ExpectedFulfilled {}
+
+#[expect(clippy::multiple_inherent_impl)]
+//~^ unfulfilled_lint_expectations
+struct ExpectedNotFulfilled;
+
+impl ExpectedNotFulfilled {}
+
+struct OneExpected;
+impl OneExpected {}
+#[expect(clippy::multiple_inherent_impl)]
+impl OneExpected {}
+impl OneExpected {}
 //~^ multiple_inherent_impl
 
 fn main() {}