Skip to content

Commit c0a48b9

Browse files
JarchoJarcho
committed
Fix and improve internal lint checking for match_type usages
* Check for `const`s and `static`s from external crates * Check for `LangItem`s * Handle inherent functions which have the same name as a field * Also check the following functions: * `match_trait_method` * `match_def_path` * `is_expr_path_def_path` * `is_qpath_def_path` * Handle checking for a constructor to a diagnostic item or `LangItem`
1 parent a5ece81 commit c0a48b9

25 files changed

+479
-178
lines changed

‎clippy_lints/src/infinite_iter.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use clippy_utils::diagnostics::span_lint;
22
use clippy_utils::ty::{implements_trait, is_type_diagnostic_item};
3-
use clippy_utils::{higher, match_def_path, path_def_id, paths};
3+
use clippy_utils::{higher, path_def_id};
44
use rustc_hir::{BorrowKind, Expr, ExprKind};
55
use rustc_lint::{LateContext, LateLintPass};
66
use rustc_session::{declare_lint_pass, declare_tool_lint};
@@ -168,7 +168,7 @@ fn is_infinite(cx: &LateContext<'_>, expr: &Expr<'_>) -> Finiteness {
168168
ExprKind::Block(block, _) => block.expr.as_ref().map_or(Finite, |e| is_infinite(cx, e)),
169169
ExprKind::Box(e) | ExprKind::AddrOf(BorrowKind::Ref, _, e) => is_infinite(cx, e),
170170
ExprKind::Call(path, _) => path_def_id(cx, path)
171-
.map_or(false, |id| match_def_path(cx, id, &paths::ITER_REPEAT))
171+
.map_or(false, |id| cx.tcx.is_diagnostic_item(sym::iter_repeat, id))
172172
.into(),
173173
ExprKind::Struct(..) => higher::Range::hir(expr).map_or(false, |r| r.end.is_none()).into(),
174174
_ => Finite,

‎clippy_lints/src/inherent_to_string.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use clippy_utils::diagnostics::span_lint_and_help;
22
use clippy_utils::ty::{implements_trait, is_type_diagnostic_item};
3-
use clippy_utils::{get_trait_def_id, paths, return_ty, trait_ref_of_method};
3+
use clippy_utils::{return_ty, trait_ref_of_method};
44
use if_chain::if_chain;
55
use rustc_hir::{ImplItem, ImplItemKind};
66
use rustc_lint::{LateContext, LateLintPass};
@@ -126,7 +126,10 @@ impl<'tcx> LateLintPass<'tcx> for InherentToString {
126126
}
127127

128128
fn show_lint(cx: &LateContext<'_>, item: &ImplItem<'_>) {
129-
let display_trait_id = get_trait_def_id(cx, &paths::DISPLAY_TRAIT).expect("Failed to get trait ID of `Display`!");
129+
let display_trait_id = cx
130+
.tcx
131+
.get_diagnostic_item(sym::Display)
132+
.expect("Failed to get trait ID of `Display`!");
130133

131134
// Get the real type of 'self'
132135
let self_type = cx.tcx.fn_sig(item.def_id).input(0);

‎clippy_lints/src/lib.register_internal.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ store.register_group(true, "clippy::internal", Some("clippy_internal"), vec![
1212
LintId::of(utils::internal_lints::INVALID_CLIPPY_VERSION_ATTRIBUTE),
1313
LintId::of(utils::internal_lints::INVALID_PATHS),
1414
LintId::of(utils::internal_lints::LINT_WITHOUT_LINT_PASS),
15-
LintId::of(utils::internal_lints::MATCH_TYPE_ON_DIAGNOSTIC_ITEM),
1615
LintId::of(utils::internal_lints::MISSING_CLIPPY_VERSION_ATTRIBUTE),
1716
LintId::of(utils::internal_lints::MISSING_MSRV_ATTR_IMPL),
1817
LintId::of(utils::internal_lints::OUTER_EXPN_EXPN_DATA),
1918
LintId::of(utils::internal_lints::PRODUCE_ICE),
19+
LintId::of(utils::internal_lints::UNNECESSARY_DEF_PATH),
2020
LintId::of(utils::internal_lints::UNNECESSARY_SYMBOL_STR),
2121
])

‎clippy_lints/src/lib.register_lints.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ store.register_lints(&[
2222
#[cfg(feature = "internal")]
2323
utils::internal_lints::LINT_WITHOUT_LINT_PASS,
2424
#[cfg(feature = "internal")]
25-
utils::internal_lints::MATCH_TYPE_ON_DIAGNOSTIC_ITEM,
26-
#[cfg(feature = "internal")]
2725
utils::internal_lints::MISSING_CLIPPY_VERSION_ATTRIBUTE,
2826
#[cfg(feature = "internal")]
2927
utils::internal_lints::MISSING_MSRV_ATTR_IMPL,
@@ -32,6 +30,8 @@ store.register_lints(&[
3230
#[cfg(feature = "internal")]
3331
utils::internal_lints::PRODUCE_ICE,
3432
#[cfg(feature = "internal")]
33+
utils::internal_lints::UNNECESSARY_DEF_PATH,
34+
#[cfg(feature = "internal")]
3535
utils::internal_lints::UNNECESSARY_SYMBOL_STR,
3636
absurd_extreme_comparisons::ABSURD_EXTREME_COMPARISONS,
3737
approx_const::APPROX_CONSTANT,

‎clippy_lints/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
518518
store.register_late_pass(|| Box::new(utils::internal_lints::InvalidPaths));
519519
store.register_late_pass(|| Box::new(utils::internal_lints::InterningDefinedSymbol::default()));
520520
store.register_late_pass(|| Box::new(utils::internal_lints::LintWithoutLintPass::default()));
521-
store.register_late_pass(|| Box::new(utils::internal_lints::MatchTypeOnDiagItem));
521+
store.register_late_pass(|| Box::new(utils::internal_lints::UnnecessaryDefPath));
522522
store.register_late_pass(|| Box::new(utils::internal_lints::OuterExpnDataPass));
523523
store.register_late_pass(|| Box::new(utils::internal_lints::MsrvAttrImpl));
524524
}

‎clippy_lints/src/loops/while_let_on_iterator.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@ use super::WHILE_LET_ON_ITERATOR;
22
use clippy_utils::diagnostics::span_lint_and_sugg;
33
use clippy_utils::higher;
44
use clippy_utils::source::snippet_with_applicability;
5-
use clippy_utils::{
6-
get_enclosing_loop_or_closure, is_refutable, is_trait_method, match_def_path, paths, visitors::is_res_used,
7-
};
5+
use clippy_utils::{get_enclosing_loop_or_closure, is_lang_item, is_refutable, is_trait_method, visitors::is_res_used};
86
use if_chain::if_chain;
97
use rustc_errors::Applicability;
108
use rustc_hir::intravisit::{walk_expr, Visitor};
11-
use rustc_hir::{def::Res, Expr, ExprKind, HirId, Local, Mutability, PatKind, QPath, UnOp};
9+
use rustc_hir::{def::Res, Expr, ExprKind, HirId, LangItem, Local, Mutability, PatKind, QPath, UnOp};
1210
use rustc_lint::LateContext;
1311
use rustc_middle::ty::adjustment::Adjust;
1412
use rustc_span::{symbol::sym, Symbol};
@@ -19,7 +17,7 @@ pub(super) fn check<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>) {
1917
// check for `Some(..)` pattern
2018
if let PatKind::TupleStruct(QPath::Resolved(None, pat_path), some_pat, _) = let_pat.kind;
2119
if let Res::Def(_, pat_did) = pat_path.res;
22-
if match_def_path(cx, pat_did, &paths::OPTION_SOME);
20+
if is_lang_item(cx, pat_did, LangItem::OptionSome);
2321
// check for call to `Iterator::next`
2422
if let ExprKind::MethodCall(method_name, [iter_expr], _) = let_expr.kind;
2523
if method_name.ident.name == sym::next;

‎clippy_lints/src/methods/filetype_is_file.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
use clippy_utils::diagnostics::span_lint_and_help;
2-
use clippy_utils::ty::match_type;
3-
use clippy_utils::{get_parent_expr, paths};
2+
use clippy_utils::get_parent_expr;
3+
use clippy_utils::ty::is_type_diagnostic_item;
44
use if_chain::if_chain;
55
use rustc_hir as hir;
66
use rustc_lint::LateContext;
77
use rustc_span::source_map::Span;
8+
use rustc_span::sym;
89

910
use super::FILETYPE_IS_FILE;
1011

1112
pub(super) fn check(cx: &LateContext<'_>, expr: &hir::Expr<'_>, recv: &hir::Expr<'_>) {
1213
let ty = cx.typeck_results().expr_ty(recv);
1314

14-
if !match_type(cx, ty, &paths::FILE_TYPE) {
15+
if !is_type_diagnostic_item(cx, ty, sym::FileType) {
1516
return;
1617
}
1718

‎clippy_lints/src/methods/inefficient_to_string.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use clippy_utils::diagnostics::span_lint_and_then;
22
use clippy_utils::source::snippet_with_applicability;
33
use clippy_utils::ty::{is_type_diagnostic_item, walk_ptrs_ty_depth};
4-
use clippy_utils::{match_def_path, paths};
4+
use clippy_utils::{is_diagnostic_item, match_def_path, paths};
55
use if_chain::if_chain;
66
use rustc_errors::Applicability;
77
use rustc_hir as hir;
@@ -60,7 +60,7 @@ fn specializes_tostring(cx: &LateContext<'_>, ty: Ty<'_>) -> bool {
6060
}
6161

6262
if let ty::Adt(adt, substs) = ty.kind() {
63-
match_def_path(cx, adt.did(), &paths::COW) && substs.type_at(1).is_str()
63+
is_diagnostic_item(cx, adt.did(), sym::Cow) && substs.type_at(1).is_str()
6464
} else {
6565
false
6666
}

‎clippy_lints/src/methods/manual_str_repeat.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use clippy_utils::diagnostics::span_lint_and_sugg;
2+
use clippy_utils::is_expr_diagnostic_item;
23
use clippy_utils::source::{snippet_with_applicability, snippet_with_context};
34
use clippy_utils::sugg::Sugg;
4-
use clippy_utils::ty::{is_type_diagnostic_item, is_type_lang_item, match_type};
5-
use clippy_utils::{is_expr_path_def_path, paths};
5+
use clippy_utils::ty::{is_type_diagnostic_item, is_type_lang_item};
66
use if_chain::if_chain;
77
use rustc_ast::LitKind;
88
use rustc_errors::Applicability;
@@ -38,7 +38,7 @@ fn parse_repeat_arg(cx: &LateContext<'_>, e: &Expr<'_>) -> Option<RepeatKind> {
3838
let ty = cx.typeck_results().expr_ty(e);
3939
if is_type_diagnostic_item(cx, ty, sym::String)
4040
|| (is_type_lang_item(cx, ty, LangItem::OwnedBox) && get_ty_param(ty).map_or(false, Ty::is_str))
41-
|| (match_type(cx, ty, &paths::COW) && get_ty_param(ty).map_or(false, Ty::is_str))
41+
|| (is_type_diagnostic_item(cx, ty, sym::Cow) && get_ty_param(ty).map_or(false, Ty::is_str))
4242
{
4343
Some(RepeatKind::String)
4444
} else {
@@ -57,7 +57,7 @@ pub(super) fn check(
5757
) {
5858
if_chain! {
5959
if let ExprKind::Call(repeat_fn, [repeat_arg]) = take_self_arg.kind;
60-
if is_expr_path_def_path(cx, repeat_fn, &paths::ITER_REPEAT);
60+
if is_expr_diagnostic_item(cx, repeat_fn, sym::iter_repeat);
6161
if is_type_diagnostic_item(cx, cx.typeck_results().expr_ty(collect_expr), sym::String);
6262
if let Some(collect_id) = cx.typeck_results().type_dependent_def_id(collect_expr.hir_id);
6363
if let Some(take_id) = cx.typeck_results().type_dependent_def_id(take_expr.hir_id);

‎clippy_lints/src/methods/useless_asref.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
use clippy_utils::diagnostics::span_lint_and_sugg;
22
use clippy_utils::source::snippet_with_applicability;
33
use clippy_utils::ty::walk_ptrs_ty_depth;
4-
use clippy_utils::{get_parent_expr, match_trait_method, paths};
4+
use clippy_utils::{get_parent_expr, is_trait_method};
55
use if_chain::if_chain;
66
use rustc_errors::Applicability;
77
use rustc_hir as hir;
88
use rustc_lint::LateContext;
9+
use rustc_span::sym;
910

1011
use super::USELESS_ASREF;
1112

1213
/// Checks for the `USELESS_ASREF` lint.
1314
pub(super) fn check(cx: &LateContext<'_>, expr: &hir::Expr<'_>, call_name: &str, recvr: &hir::Expr<'_>) {
1415
// when we get here, we've already checked that the call name is "as_ref" or "as_mut"
1516
// check if the call is to the actual `AsRef` or `AsMut` trait
16-
if match_trait_method(cx, expr, &paths::ASREF_TRAIT) || match_trait_method(cx, expr, &paths::ASMUT_TRAIT) {
17+
if is_trait_method(cx, expr, sym::AsRef) || is_trait_method(cx, expr, sym::AsMut) {
1718
// check if the type after `as_ref` or `as_mut` is the same as before
1819
let rcv_ty = cx.typeck_results().expr_ty(recvr);
1920
let res_ty = cx.typeck_results().expr_ty(expr);

‎clippy_lints/src/minmax.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use clippy_utils::consts::{constant_simple, Constant};
22
use clippy_utils::diagnostics::span_lint;
3-
use clippy_utils::{match_trait_method, paths};
3+
use clippy_utils::is_trait_method;
44
use if_chain::if_chain;
55
use rustc_hir::{Expr, ExprKind};
66
use rustc_lint::{LateContext, LateLintPass};
@@ -86,7 +86,7 @@ fn min_max<'a>(cx: &LateContext<'_>, expr: &'a Expr<'a>) -> Option<(MinMax, Cons
8686
ExprKind::MethodCall(path, args, _) => {
8787
if_chain! {
8888
if let [obj, _] = args;
89-
if cx.typeck_results().expr_ty(obj).is_floating_point() || match_trait_method(cx, expr, &paths::ORD);
89+
if cx.typeck_results().expr_ty(obj).is_floating_point() || is_trait_method(cx, expr, sym::Ord);
9090
then {
9191
if path.ident.name == sym!(max) {
9292
fetch_const(cx, args, MinMax::Max)

‎clippy_lints/src/non_octal_unix_permissions.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
use clippy_utils::diagnostics::span_lint_and_sugg;
22
use clippy_utils::source::{snippet_opt, snippet_with_applicability};
3-
use clippy_utils::ty::match_type;
3+
use clippy_utils::ty::{is_type_diagnostic_item, match_type};
44
use clippy_utils::{match_def_path, paths};
55
use if_chain::if_chain;
66
use rustc_errors::Applicability;
77
use rustc_hir::{Expr, ExprKind};
88
use rustc_lint::{LateContext, LateLintPass};
99
use rustc_session::{declare_lint_pass, declare_tool_lint};
10+
use rustc_span::sym;
1011

1112
declare_clippy_lint! {
1213
/// ### What it does
@@ -49,7 +50,7 @@ impl<'tcx> LateLintPass<'tcx> for NonOctalUnixPermissions {
4950
if_chain! {
5051
if (path.ident.name == sym!(mode)
5152
&& (match_type(cx, obj_ty, &paths::OPEN_OPTIONS)
52-
|| match_type(cx, obj_ty, &paths::DIR_BUILDER)))
53+
|| is_type_diagnostic_item(cx, obj_ty, sym::DirBuilder)))
5354
|| (path.ident.name == sym!(set_mode) && match_type(cx, obj_ty, &paths::PERMISSIONS));
5455
if let ExprKind::Lit(_) = param.kind;
5556

‎clippy_lints/src/slow_vector_initialization.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use clippy_utils::diagnostics::span_lint_and_then;
22
use clippy_utils::sugg::Sugg;
33
use clippy_utils::ty::is_type_diagnostic_item;
4-
use clippy_utils::{get_enclosing_block, is_expr_path_def_path, path_to_local, path_to_local_id, paths, SpanlessEq};
4+
use clippy_utils::{get_enclosing_block, is_expr_diagnostic_item, path_to_local, path_to_local_id, SpanlessEq};
55
use if_chain::if_chain;
66
use rustc_ast::ast::LitKind;
77
use rustc_errors::Applicability;
@@ -255,7 +255,7 @@ impl<'a, 'tcx> VectorInitializationVisitor<'a, 'tcx> {
255255
fn is_repeat_zero(&self, expr: &Expr<'_>) -> bool {
256256
if_chain! {
257257
if let ExprKind::Call(fn_expr, [repeat_arg]) = expr.kind;
258-
if is_expr_path_def_path(self.cx, fn_expr, &paths::ITER_REPEAT);
258+
if is_expr_diagnostic_item(self.cx, fn_expr, sym::iter_repeat);
259259
if let ExprKind::Lit(ref lit) = repeat_arg.kind;
260260
if let LitKind::Int(0, _) = lit.node;
261261

‎clippy_lints/src/unused_io_amount.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
use clippy_utils::diagnostics::{span_lint, span_lint_and_help};
2-
use clippy_utils::{is_try, match_trait_method, paths};
2+
use clippy_utils::{is_trait_method, is_try, match_trait_method, paths};
33
use rustc_hir as hir;
44
use rustc_lint::{LateContext, LateLintPass};
55
use rustc_session::{declare_lint_pass, declare_tool_lint};
6+
use rustc_span::sym;
67

78
declare_clippy_lint! {
89
/// ### What it does
@@ -116,13 +117,13 @@ fn check_method_call(cx: &LateContext<'_>, call: &hir::Expr<'_>, expr: &hir::Exp
116117
match_trait_method(cx, call, &paths::FUTURES_IO_ASYNCREADEXT)
117118
|| match_trait_method(cx, call, &paths::TOKIO_IO_ASYNCREADEXT)
118119
} else {
119-
match_trait_method(cx, call, &paths::IO_READ)
120+
is_trait_method(cx, call, sym::IoRead)
120121
};
121122
let write_trait = if is_await {
122123
match_trait_method(cx, call, &paths::FUTURES_IO_ASYNCWRITEEXT)
123124
|| match_trait_method(cx, call, &paths::TOKIO_IO_ASYNCWRITEEXT)
124125
} else {
125-
match_trait_method(cx, call, &paths::IO_WRITE)
126+
is_trait_method(cx, call, sym::IoWrite)
126127
};
127128

128129
match (read_trait, write_trait, symbol, is_await) {

‎clippy_lints/src/useless_conversion.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ use clippy_utils::diagnostics::{span_lint_and_help, span_lint_and_sugg};
22
use clippy_utils::source::{snippet, snippet_with_macro_callsite};
33
use clippy_utils::sugg::Sugg;
44
use clippy_utils::ty::{is_type_diagnostic_item, same_type_and_consts};
5-
use clippy_utils::{get_parent_expr, is_trait_method, match_def_path, paths};
5+
use clippy_utils::{get_parent_expr, is_lang_item, is_trait_method, match_def_path, paths};
66
use if_chain::if_chain;
77
use rustc_errors::Applicability;
8-
use rustc_hir::{Expr, ExprKind, HirId, MatchSource};
8+
use rustc_hir::{Expr, ExprKind, HirId, LangItem, MatchSource};
99
use rustc_lint::{LateContext, LateLintPass};
1010
use rustc_middle::ty;
1111
use rustc_session::{declare_tool_lint, impl_lint_pass};
@@ -154,7 +154,7 @@ impl<'tcx> LateLintPass<'tcx> for UselessConversion {
154154
}
155155

156156
if_chain! {
157-
if match_def_path(cx, def_id, &paths::FROM_FROM);
157+
if is_lang_item(cx, def_id, LangItem::FromFrom);
158158
if same_type_and_consts(a, b);
159159

160160
then {

0 commit comments

Comments
 (0)