From 81538f6ff310e0d8e7ec62542b5eb29f08043081 Mon Sep 17 00:00:00 2001 From: Stanislav Tkach Date: Wed, 23 Aug 2017 17:13:51 +0300 Subject: [PATCH] Fix 'cyclomatic complexity' warning --- clippy_lints/src/types.rs | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/clippy_lints/src/types.rs b/clippy_lints/src/types.rs index b537ad5e717..1c56be53296 100644 --- a/clippy_lints/src/types.rs +++ b/clippy_lints/src/types.rs @@ -212,16 +212,10 @@ fn check_ty(cx: &LateContext, ast_ty: &hir::Ty, is_local: bool) { let PathParameters::AngleBracketedParameters(ref ab_data) = bx.parameters, let [ref inner] = *ab_data.types ], { - if_let_chain! {[ - let TyTraitObject(ref traits, _) = inner.node, - traits.len() >= 1, - // Only Send/Sync can be used as additional traits, so it is enough to - // check only the first trait. - match_path_old(&traits[0].trait_ref.path, &paths::ANY_TRAIT) - ], { + if is_any_trait(inner) { // Ignore `Box` types, see #1884 for details. return; - }} + } let ltopt = if lt.is_elided() { "".to_owned() @@ -260,6 +254,21 @@ fn check_ty(cx: &LateContext, ast_ty: &hir::Ty, is_local: bool) { } } +// Returns true if given type is `Any` trait. +fn is_any_trait(t: &hir::Ty) -> bool { + if_let_chain! {[ + let TyTraitObject(ref traits, _) = t.node, + traits.len() >= 1, + // Only Send/Sync can be used as additional traits, so it is enough to + // check only the first trait. + match_path_old(&traits[0].trait_ref.path, &paths::ANY_TRAIT) + ], { + return true; + }} + + false +} + #[allow(missing_copy_implementations)] pub struct LetPass; -- 2.44.0