refactor: move has_debug_impl
to clippy_utils::ty
This commit is contained in:
parent
cd69d86c89
commit
bdb13cd887
@ -1,7 +1,7 @@
|
|||||||
use clippy_utils::diagnostics::span_lint_and_sugg;
|
use clippy_utils::diagnostics::span_lint_and_sugg;
|
||||||
use clippy_utils::macros::{find_assert_args, root_macro_call_first_node, PanicExpn};
|
use clippy_utils::macros::{find_assert_args, root_macro_call_first_node, PanicExpn};
|
||||||
use clippy_utils::source::snippet_with_context;
|
use clippy_utils::source::snippet_with_context;
|
||||||
use clippy_utils::ty::{implements_trait, is_copy, is_type_diagnostic_item};
|
use clippy_utils::ty::{has_debug_impl, is_copy, is_type_diagnostic_item};
|
||||||
use clippy_utils::usage::local_used_after_expr;
|
use clippy_utils::usage::local_used_after_expr;
|
||||||
use clippy_utils::{is_expr_final_block_expr, path_res};
|
use clippy_utils::{is_expr_final_block_expr, path_res};
|
||||||
use rustc_errors::Applicability;
|
use rustc_errors::Applicability;
|
||||||
@ -97,13 +97,6 @@ impl<'tcx> LateLintPass<'tcx> for AssertionsOnResultStates {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// This checks whether a given type is known to implement Debug.
|
|
||||||
fn has_debug_impl<'tcx>(cx: &LateContext<'tcx>, ty: Ty<'tcx>) -> bool {
|
|
||||||
cx.tcx
|
|
||||||
.get_diagnostic_item(sym::Debug)
|
|
||||||
.map_or(false, |debug| implements_trait(cx, ty, debug, &[]))
|
|
||||||
}
|
|
||||||
|
|
||||||
fn type_suitable_to_unwrap<'tcx>(cx: &LateContext<'tcx>, ty: Ty<'tcx>) -> bool {
|
fn type_suitable_to_unwrap<'tcx>(cx: &LateContext<'tcx>, ty: Ty<'tcx>) -> bool {
|
||||||
has_debug_impl(cx, ty) && !ty.is_unit() && !ty.is_never()
|
has_debug_impl(cx, ty) && !ty.is_unit() && !ty.is_never()
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
use super::ERR_EXPECT;
|
use super::ERR_EXPECT;
|
||||||
use clippy_utils::diagnostics::span_lint_and_sugg;
|
use clippy_utils::diagnostics::span_lint_and_sugg;
|
||||||
use clippy_utils::ty::implements_trait;
|
use clippy_utils::ty::has_debug_impl;
|
||||||
use clippy_utils::{meets_msrv, msrvs, ty::is_type_diagnostic_item};
|
use clippy_utils::{meets_msrv, msrvs, ty::is_type_diagnostic_item};
|
||||||
use rustc_errors::Applicability;
|
use rustc_errors::Applicability;
|
||||||
use rustc_lint::LateContext;
|
use rustc_lint::LateContext;
|
||||||
@ -28,7 +28,7 @@ pub(super) fn check(
|
|||||||
// Tests if the T type in a `Result<T, E>` is not None
|
// Tests if the T type in a `Result<T, E>` is not None
|
||||||
if let Some(data_type) = get_data_type(cx, result_type);
|
if let Some(data_type) = get_data_type(cx, result_type);
|
||||||
// Tests if the T type in a `Result<T, E>` implements debug
|
// Tests if the T type in a `Result<T, E>` implements debug
|
||||||
if has_debug_impl(data_type, cx);
|
if has_debug_impl(cx, data_type);
|
||||||
|
|
||||||
then {
|
then {
|
||||||
span_lint_and_sugg(
|
span_lint_and_sugg(
|
||||||
@ -51,10 +51,3 @@ fn get_data_type<'a>(cx: &LateContext<'_>, ty: Ty<'a>) -> Option<Ty<'a>> {
|
|||||||
_ => None,
|
_ => None,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Given a type, very if the Debug trait has been impl'd
|
|
||||||
fn has_debug_impl<'tcx>(ty: Ty<'tcx>, cx: &LateContext<'tcx>) -> bool {
|
|
||||||
cx.tcx
|
|
||||||
.get_diagnostic_item(sym::Debug)
|
|
||||||
.map_or(false, |debug| implements_trait(cx, ty, debug, &[]))
|
|
||||||
}
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
use clippy_utils::diagnostics::span_lint_and_help;
|
use clippy_utils::diagnostics::span_lint_and_help;
|
||||||
use clippy_utils::ty::{implements_trait, is_type_diagnostic_item};
|
use clippy_utils::ty::{has_debug_impl, is_type_diagnostic_item};
|
||||||
use if_chain::if_chain;
|
use if_chain::if_chain;
|
||||||
use rustc_hir as hir;
|
use rustc_hir as hir;
|
||||||
use rustc_lint::LateContext;
|
use rustc_lint::LateContext;
|
||||||
@ -15,7 +15,7 @@ pub(super) fn check(cx: &LateContext<'_>, expr: &hir::Expr<'_>, recv: &hir::Expr
|
|||||||
if is_type_diagnostic_item(cx, cx.typeck_results().expr_ty(recv), sym::Result);
|
if is_type_diagnostic_item(cx, cx.typeck_results().expr_ty(recv), sym::Result);
|
||||||
let result_type = cx.typeck_results().expr_ty(recv);
|
let result_type = cx.typeck_results().expr_ty(recv);
|
||||||
if let Some(error_type) = get_error_type(cx, result_type);
|
if let Some(error_type) = get_error_type(cx, result_type);
|
||||||
if has_debug_impl(error_type, cx);
|
if has_debug_impl(cx, error_type);
|
||||||
|
|
||||||
then {
|
then {
|
||||||
span_lint_and_help(
|
span_lint_and_help(
|
||||||
@ -37,10 +37,3 @@ fn get_error_type<'a>(cx: &LateContext<'_>, ty: Ty<'a>) -> Option<Ty<'a>> {
|
|||||||
_ => None,
|
_ => None,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// This checks whether a given type is known to implement Debug.
|
|
||||||
fn has_debug_impl<'tcx>(ty: Ty<'tcx>, cx: &LateContext<'tcx>) -> bool {
|
|
||||||
cx.tcx
|
|
||||||
.get_diagnostic_item(sym::Debug)
|
|
||||||
.map_or(false, |debug| implements_trait(cx, ty, debug, &[]))
|
|
||||||
}
|
|
||||||
|
@ -31,6 +31,13 @@ pub fn is_copy<'tcx>(cx: &LateContext<'tcx>, ty: Ty<'tcx>) -> bool {
|
|||||||
ty.is_copy_modulo_regions(cx.tcx.at(DUMMY_SP), cx.param_env)
|
ty.is_copy_modulo_regions(cx.tcx.at(DUMMY_SP), cx.param_env)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// This checks whether a given type is known to implement Debug.
|
||||||
|
pub fn has_debug_impl<'tcx>(cx: &LateContext<'tcx>, ty: Ty<'tcx>) -> bool {
|
||||||
|
cx.tcx
|
||||||
|
.get_diagnostic_item(sym::Debug)
|
||||||
|
.map_or(false, |debug| implements_trait(cx, ty, debug, &[]))
|
||||||
|
}
|
||||||
|
|
||||||
/// Checks whether a type can be partially moved.
|
/// Checks whether a type can be partially moved.
|
||||||
pub fn can_partially_move_ty<'tcx>(cx: &LateContext<'tcx>, ty: Ty<'tcx>) -> bool {
|
pub fn can_partially_move_ty<'tcx>(cx: &LateContext<'tcx>, ty: Ty<'tcx>) -> bool {
|
||||||
if has_drop(cx, ty) || is_copy(cx, ty) {
|
if has_drop(cx, ty) || is_copy(cx, ty) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user