Don't make decisions on values that don't represent the decision

rust-lang · Jan 22, 2019 · 38cdf63 · 38cdf63
1 parent 3168023
commit 38cdf63
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/clippy_lints/src/utils/mod.rs b/clippy_lints/src/utils/mod.rs
@@ -64,9 +64,14 @@ pub fn differing_macro_contexts(lhs: Span, rhs: Span) -> bool {
 /// ```
 pub fn in_constant(cx: &LateContext<'_, '_>, id: NodeId) -> bool {
     let parent_id = cx.tcx.hir().get_parent(id);
-    match cx.tcx.hir().body_owner_kind(parent_id) {
-        hir::BodyOwnerKind::Fn | hir::BodyOwnerKind::Closure => false,
-        hir::BodyOwnerKind::Const | hir::BodyOwnerKind::Static(..) => true,
+    match cx.tcx.hir().get(parent_id) {
+        | Node::Item(&Item { node: ItemKind::Const(..), .. })
+        | Node::TraitItem(&TraitItem { node: TraitItemKind::Const(..), .. })
+        | Node::ImplItem(&ImplItem { node: ImplItemKind::Const(..), .. })
+        | Node::AnonConst(_)
+        | Node::Item(&Item { node: ItemKind::Static(..), .. })
+        => true,
+        _ => false,
     }
 }