Ignore all enum and struct constructors in lints about *or(call())
This commit is contained in:
@@ -20,11 +20,11 @@ use syntax::symbol::LocalInternedString;
|
|||||||
use crate::utils::paths;
|
use crate::utils::paths;
|
||||||
use crate::utils::sugg;
|
use crate::utils::sugg;
|
||||||
use crate::utils::{
|
use crate::utils::{
|
||||||
get_arg_name, get_parent_expr, get_trait_def_id, has_iter_method, implements_trait, in_macro, is_copy, is_expn_of,
|
get_arg_name, get_parent_expr, get_trait_def_id, has_iter_method, implements_trait, in_macro, is_copy,
|
||||||
is_self, is_self_ty, iter_input_pats, last_path_segment, match_path, match_qpath, match_trait_method, match_type,
|
is_ctor_function, is_expn_of, is_self, is_self_ty, iter_input_pats, last_path_segment, match_path, match_qpath,
|
||||||
match_var, method_calls, method_chain_args, remove_blocks, return_ty, same_tys, single_segment_path, snippet,
|
match_trait_method, match_type, match_var, method_calls, method_chain_args, remove_blocks, return_ty, same_tys,
|
||||||
snippet_with_applicability, snippet_with_macro_callsite, span_lint, span_lint_and_sugg, span_lint_and_then,
|
single_segment_path, snippet, snippet_with_applicability, snippet_with_macro_callsite, span_lint,
|
||||||
span_note_and_lint, walk_ptrs_ty, walk_ptrs_ty_depth, SpanlessEq,
|
span_lint_and_sugg, span_lint_and_then, span_note_and_lint, walk_ptrs_ty, walk_ptrs_ty_depth, SpanlessEq,
|
||||||
};
|
};
|
||||||
|
|
||||||
declare_clippy_lint! {
|
declare_clippy_lint! {
|
||||||
@@ -1072,6 +1072,11 @@ fn lint_or_fun_call(cx: &LateContext<'_, '_>, expr: &hir::Expr, method_span: Spa
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ignore enum and struct constructors
|
||||||
|
if is_ctor_function(cx, &arg) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// don't lint for constant values
|
// don't lint for constant values
|
||||||
let owner_def = cx.tcx.hir().get_parent_did_by_hir_id(arg.hir_id);
|
let owner_def = cx.tcx.hir().get_parent_did_by_hir_id(arg.hir_id);
|
||||||
let promotable = cx.tcx.rvalue_promotable_map(owner_def).contains(&arg.hir_id.local_id);
|
let promotable = cx.tcx.rvalue_promotable_map(owner_def).contains(&arg.hir_id.local_id);
|
||||||
|
|||||||
@@ -742,6 +742,19 @@ pub fn is_copy<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, ty: Ty<'tcx>) -> bool {
|
|||||||
ty.is_copy_modulo_regions(cx.tcx.global_tcx(), cx.param_env, DUMMY_SP)
|
ty.is_copy_modulo_regions(cx.tcx.global_tcx(), cx.param_env, DUMMY_SP)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Checks if an expression is constructing a tuple-like enum variant or struct
|
||||||
|
pub fn is_ctor_function(cx: &LateContext<'_, '_>, expr: &Expr) -> bool {
|
||||||
|
if let ExprKind::Call(ref fun, _) = expr.node {
|
||||||
|
if let ExprKind::Path(ref qp) = fun.node {
|
||||||
|
return matches!(
|
||||||
|
cx.tables.qpath_def(qp, fun.hir_id),
|
||||||
|
def::Def::Variant(..) | def::Def::Ctor(..)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
false
|
||||||
|
}
|
||||||
|
|
||||||
/// Returns `true` if a pattern is refutable.
|
/// Returns `true` if a pattern is refutable.
|
||||||
pub fn is_refutable(cx: &LateContext<'_, '_>, pat: &Pat) -> bool {
|
pub fn is_refutable(cx: &LateContext<'_, '_>, pat: &Pat) -> bool {
|
||||||
fn is_enum_variant(cx: &LateContext<'_, '_>, qpath: &QPath, id: HirId) -> bool {
|
fn is_enum_variant(cx: &LateContext<'_, '_>, qpath: &QPath, id: HirId) -> bool {
|
||||||
|
|||||||
Reference in New Issue
Block a user