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 631ac8b0fe2619d9224a84d17d10b84748c52f43..803ba34a86578a0eb82f5e411244755bbb218666 100644 (file)
--- a/clippy_lints/src/empty_enum.rs
+++ b/clippy_lints/src/empty_enum.rs
@@ -1,12 +1,14 @@
 //! 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.
 ///
-/// **Why is this bad?** Enum's with no variants should be replaced with `!`, the uninhabited type,
+/// **Why is this bad?** Enum's with no variants should be replaced with `!`,
+/// the uninhabited type,
 /// or a wrapper around it.
 ///
 /// **Known problems:** None.
@@ -15,13 +17,13 @@
 /// ```rust
 /// enum Test {}
 /// ```
-declare_lint! {
+declare_clippy_lint! {
     pub EMPTY_ENUM,
-    Allow,
+    pedantic,
     "enum with no variants"
 }
 
-#[derive(Copy,Clone)]
+#[derive(Copy, Clone)]
 pub struct EmptyEnum;
 
 impl LintPass for EmptyEnum {
@@ -33,9 +35,10 @@ 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 {
-            let ty = cx.tcx.item_type(did);
-            let adt = ty.ty_adt_def().expect("already checked whether this is an enum");
+        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");
             if adt.variants.is_empty() {
                 span_lint_and_then(cx, EMPTY_ENUM, item.span, "enum with no variants", |db| {
                     db.span_help(item.span, "consider using the uninhabited type `!` or a wrapper around it");