Merge branch 'macro-use' into HEAD

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

diff --git a/clippy_lints/src/inline_fn_without_body.rs b/clippy_lints/src/inline_fn_without_body.rs
index 1bb9519d304c33fbe626a352933fb56f34c7f31b..b308e3ca81f55ada47e2b502c6f3b7bc7dd41b0b 100644 (file)
--- a/clippy_lints/src/inline_fn_without_body.rs
+++ b/clippy_lints/src/inline_fn_without_body.rs
@@ -1,10 +1,11 @@
 //! checks for `#[inline]` on trait methods without bodies
 
 use rustc::lint::*;
+use rustc::{declare_lint, lint_array};
 use rustc::hir::*;
 use syntax::ast::{Attribute, Name};
-use utils::span_lint_and_then;
-use utils::sugg::DiagnosticBuilderExt;
+use crate::utils::span_lint_and_then;
+use crate::utils::sugg::DiagnosticBuilderExt;
 
 /// **What it does:** Checks for `#[inline]` on trait methods without bodies
 ///
@@ -20,9 +21,9 @@
 ///     fn name(&self) -> &'static str;
 /// }
 /// ```
-declare_lint! {
+declare_clippy_lint! {
     pub INLINE_FN_WITHOUT_BODY,
-    Warn,
+    correctness,
     "use of `#[inline]` on trait methods without bodies"
 }
 
@@ -37,18 +38,15 @@ fn get_lints(&self) -> LintArray {
 
 impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass {
     fn check_trait_item(&mut self, cx: &LateContext<'a, 'tcx>, item: &'tcx TraitItem) {
-        match item.node {
-            TraitItemKind::Method(_, TraitMethod::Required(_)) => {
-                check_attrs(cx, &item.name, &item.attrs);
-            },
-            _ => {},
+        if let TraitItemKind::Method(_, TraitMethod::Required(_)) = item.node {
+            check_attrs(cx, item.ident.name, &item.attrs);
         }
     }
 }
 
-fn check_attrs(cx: &LateContext, name: &Name, attrs: &[Attribute]) {
+fn check_attrs(cx: &LateContext, name: Name, attrs: &[Attribute]) {
     for attr in attrs {
-        if attr.name().map_or(true, |n| n != "inline") {
+        if attr.name() != "inline" {
             continue;
         }