use if_chain::if_chain;
-use rustc_hir::def::Res;
-use rustc_hir::intravisit::{walk_path, NestedVisitorMap, Visitor};
-use rustc_hir::{HirId, Impl, ImplItem, ImplItemKind, ItemKind, Path};
+use rustc_hir::{Impl, ImplItem, ImplItemKind, ItemKind};
use rustc_lint::{LateContext, LateLintPass};
-use rustc_middle::hir::map::Map;
use rustc_session::{declare_lint_pass, declare_tool_lint};
use crate::utils::span_lint_and_help;
+use crate::utils::visitors::LocalUsedVisitor;
declare_clippy_lint! {
/// **What it does:** Checks methods that contain a `self` argument but don't use it
if impl_item.span.from_expansion() {
return;
}
- let parent = cx.tcx.hir().get_parent_item(impl_item.hir_id);
+ let parent = cx.tcx.hir().get_parent_item(impl_item.hir_id());
let parent_item = cx.tcx.hir().expect_item(parent);
- let def_id = cx.tcx.hir().local_def_id(impl_item.hir_id);
- let assoc_item = cx.tcx.associated_item(def_id);
+ let assoc_item = cx.tcx.associated_item(impl_item.def_id);
if_chain! {
if let ItemKind::Impl(Impl { of_trait: None, .. }) = parent_item.kind;
if assoc_item.fn_has_self_parameter;
then {
let self_param = &body.params[0];
let self_hir_id = self_param.pat.hir_id;
- let mut visitor = UnusedSelfVisitor {
- cx,
- uses_self: false,
- self_hir_id: &self_hir_id,
- };
- visitor.visit_body(body);
- if !visitor.uses_self {
+ if !LocalUsedVisitor::new(cx, self_hir_id).check_body(body) {
span_lint_and_help(
cx,
UNUSED_SELF,
}
}
}
-
-struct UnusedSelfVisitor<'a, 'tcx> {
- cx: &'a LateContext<'tcx>,
- uses_self: bool,
- self_hir_id: &'a HirId,
-}
-
-impl<'a, 'tcx> Visitor<'tcx> for UnusedSelfVisitor<'a, 'tcx> {
- type Map = Map<'tcx>;
-
- fn visit_path(&mut self, path: &'tcx Path<'_>, _id: HirId) {
- if self.uses_self {
- // This function already uses `self`
- return;
- }
- if let Res::Local(hir_id) = &path.res {
- self.uses_self = self.self_hir_id == hir_id
- }
- walk_path(self, path);
- }
-
- fn nested_visit_map(&mut self) -> NestedVisitorMap<Self::Map> {
- NestedVisitorMap::OnlyBodies(self.cx.tcx.hir())
- }
-}