Auto merge of #6833 - daxpedda:use-self, r=Manishearth

Fix false-positive in `use_self`

Fixes  #6818.

changelog: Fix false positives for use_self in macros.
This commit is contained in:
bors 2021-03-04 17:35:06 +00:00
commit 6680710961
3 changed files with 25 additions and 6 deletions

View file

@ -262,12 +262,17 @@ impl<'tcx> LateLintPass<'tcx> for UseSelf {
// FIXME: this span manipulation should not be necessary
// @flip1995 found an ast lowering issue in
// https://github.com/rust-lang/rust/blob/master/src/librustc_ast_lowering/path.rs#l142-l162
match cx.tcx.hir().find(cx.tcx.hir().get_parent_node(hir_ty.hir_id)) {
Some(Node::Expr(Expr {
kind: ExprKind::Path(QPath::TypeRelative(_, segment)),
..
})) => span_lint_until_last_segment(cx, hir_ty.span, segment),
_ => span_lint(cx, hir_ty.span),
let hir = cx.tcx.hir();
let id = hir.get_parent_node(hir_ty.hir_id);
if !hir.opt_span(id).map(in_macro).unwrap_or(false) {
match hir.find(id) {
Some(Node::Expr(Expr {
kind: ExprKind::Path(QPath::TypeRelative(_, segment)),
..
})) => span_lint_until_last_segment(cx, hir_ty.span, segment),
_ => span_lint(cx, hir_ty.span),
}
}
}
}

View file

@ -454,3 +454,10 @@ mod nested_paths {
}
}
}
mod issue6818 {
#[derive(serde::Deserialize)]
struct A {
a: i32,
}
}

View file

@ -454,3 +454,10 @@ mod nested_paths {
}
}
}
mod issue6818 {
#[derive(serde::Deserialize)]
struct A {
a: i32,
}
}