Merge branch 'macro-use' into HEAD

[rust.git] / clippy_lints / src / empty_enum.rs

diff --git a/clippy_lints/src/empty_enum.rs b/clippy_lints/src/empty_enum.rs
index 67a4b8d4030d6028bae22e1e214a4c6b4dd2785e..803ba34a86578a0eb82f5e411244755bbb218666 100644 (file)
--- a/clippy_lints/src/empty_enum.rs
+++ b/clippy_lints/src/empty_enum.rs
@@ -1,8 +1,9 @@
 //! lint when there is an enum with no variants
 
 use rustc::lint::*;
+use rustc::{declare_lint, lint_array};
 use rustc::hir::*;
-use utils::span_lint_and_then;
+use crate::utils::span_lint_and_then;
 
 /// **What it does:** Checks for `enum`s with no variants.
 ///
@@ -16,9 +17,9 @@
 /// ```rust
 /// enum Test {}
 /// ```
-declare_lint! {
+declare_clippy_lint! {
     pub EMPTY_ENUM,
-    Allow,
+    pedantic,
     "enum with no variants"
 }
 
@@ -34,7 +35,7 @@ fn get_lints(&self) -> LintArray {
 impl<'a, 'tcx> LateLintPass<'a, 'tcx> for EmptyEnum {
     fn check_item(&mut self, cx: &LateContext, item: &Item) {
         let did = cx.tcx.hir.local_def_id(item.id);
-        if let ItemEnum(..) = item.node {
+        if let ItemKind::Enum(..) = item.node {
             let ty = cx.tcx.type_of(did);
             let adt = ty.ty_adt_def()
                 .expect("already checked whether this is an enum");