Auto merge of #3685 - rust-lang:rustup, r=oli-obk

Rustup
rust-lang · Jan 22, 2019 · 46b62b7 · 46b62b7
2 parents 9d5b148 + 38cdf63
commit 46b62b7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/clippy_lints/src/arithmetic.rs b/clippy_lints/src/arithmetic.rs
@@ -128,7 +128,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Arithmetic {
                 }
                 self.const_span = Some(body_span);
             },
-            hir::BodyOwnerKind::Fn => (),
+            hir::BodyOwnerKind::Fn | hir::BodyOwnerKind::Closure => (),
         }
     }
 

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 => 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,
     }
 }