Merge branch 'macro-use' into HEAD

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

diff --git a/clippy_lints/src/use_self.rs b/clippy_lints/src/use_self.rs
index 946df625cb611f5566f40da92b618347ff7f51bc..2ea4497a0d1b13aa9eb221ba7b1116c3f4fdd793 100644 (file)
--- a/clippy_lints/src/use_self.rs
+++ b/clippy_lints/src/use_self.rs
@@ -1,7 +1,9 @@
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
+use rustc::{declare_lint, lint_array};
+use if_chain::if_chain;
 use rustc::hir::*;
 use rustc::hir::intravisit::{walk_path, NestedVisitorMap, Visitor};
-use utils::{in_macro, span_lint_and_then};
+use crate::utils::{in_macro, span_lint_and_then};
 use syntax::ast::NodeId;
 use syntax_pos::symbol::keywords::SelfType;
 
@@ -32,9 +34,9 @@
 ///     }
 /// }
 /// ```
-declare_lint! {
+declare_clippy_lint! {
     pub USE_SELF,
-    Allow,
+    pedantic,
     "Unnecessary structure name repetition whereas `Self` is applicable"
 }
 
@@ -54,26 +56,30 @@ fn check_item(&mut self, cx: &LateContext<'a, 'tcx>, item: &'tcx Item) {
         if in_macro(item.span) {
             return;
         }
-        if_let_chain!([
-            let ItemImpl(.., ref item_type, ref refs) = item.node,
-            let Ty_::TyPath(QPath::Resolved(_, ref item_path)) = item_type.node,
-        ], {
-            let parameters = &item_path.segments.last().expect(SEGMENTS_MSG).parameters;
-            let should_check = if let Some(ref params) = *parameters {
-                !params.parenthesized && params.lifetimes.len() == 0 
-            } else {
-                true
-            };
-            if should_check {
-                let visitor = &mut UseSelfVisitor {
-                    item_path: item_path,
-                    cx: cx,
+        if_chain! {
+            if let ItemKind::Impl(.., ref item_type, ref refs) = item.node;
+            if let TyKind::Path(QPath::Resolved(_, ref item_path)) = item_type.node;
+            then {
+                let parameters = &item_path.segments.last().expect(SEGMENTS_MSG).args;
+                let should_check = if let Some(ref params) = *parameters {
+                    !params.parenthesized && !params.args.iter().any(|arg| match arg {
+                        GenericArg::Lifetime(_) => true,
+                        GenericArg::Type(_) => false,
+                    })
+                } else {
+                    true
                 };
-                for impl_item_ref in refs {
-                    visitor.visit_impl_item(cx.tcx.hir.impl_item(impl_item_ref.id));
+                if should_check {
+                    let visitor = &mut UseSelfVisitor {
+                        item_path,
+                        cx,
+                    };
+                    for impl_item_ref in refs {
+                        visitor.visit_impl_item(cx.tcx.hir.impl_item(impl_item_ref.id));
+                    }
                 }
             }
-        })
+        }
     }
 }
 
@@ -84,7 +90,7 @@ struct UseSelfVisitor<'a, 'tcx: 'a> {
 
 impl<'a, 'tcx> Visitor<'tcx> for UseSelfVisitor<'a, 'tcx> {
     fn visit_path(&mut self, path: &'tcx Path, _id: NodeId) {
-        if self.item_path.def == path.def && path.segments.last().expect(SEGMENTS_MSG).name != SelfType.name() {
+        if self.item_path.def == path.def && path.segments.last().expect(SEGMENTS_MSG).ident.name != SelfType.name() {
             span_lint_and_then(self.cx, USE_SELF, path.span, "unnecessary structure name repetition", |db| {
                 db.span_suggestion(path.span, "use the applicable keyword", "Self".to_owned());
             });