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;
/// }
/// }
/// ```
-declare_lint! {
+declare_clippy_lint! {
pub USE_SELF,
- Allow,
+ pedantic,
"Unnecessary structure name repetition whereas `Self` is applicable"
}
return;
}
if_chain! {
- if let ItemImpl(.., ref item_type, ref refs) = item.node;
- if let Ty_::TyPath(QPath::Resolved(_, ref item_path)) = item_type.node;
+ 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).parameters;
+ let parameters = &item_path.segments.last().expect(SEGMENTS_MSG).args;
let should_check = if let Some(ref params) = *parameters {
- !params.parenthesized && params.lifetimes.len() == 0
+ !params.parenthesized && !params.args.iter().any(|arg| match arg {
+ GenericArg::Lifetime(_) => true,
+ GenericArg::Type(_) => false,
+ })
} else {
true
};
if should_check {
let visitor = &mut UseSelfVisitor {
- item_path: item_path,
- cx: cx,
+ item_path,
+ cx,
};
for impl_item_ref in refs {
visitor.visit_impl_item(cx.tcx.hir.impl_item(impl_item_ref.id));
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());
});