From cd57add2c321a280bfed6e31bf86a2cfac829890 Mon Sep 17 00:00:00 2001 From: Alexey Zabelin Date: Thu, 24 Aug 2017 20:46:40 -0400 Subject: [PATCH] Incorporate upstream changes --- clippy_lints/src/types.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clippy_lints/src/types.rs b/clippy_lints/src/types.rs index e48f6a9042b..3eca9ad1baf 100644 --- a/clippy_lints/src/types.rs +++ b/clippy_lints/src/types.rs @@ -10,7 +10,7 @@ use syntax::ast::{IntTy, UintTy, FloatTy}; use syntax::attr::IntType; use syntax::codemap::Span; use utils::{comparisons, higher, in_external_macro, in_macro, match_def_path, snippet, span_help_and_lint, span_lint, - span_lint_and_sugg, opt_def_id, last_path_segment, type_size, match_path_old}; + span_lint_and_sugg, opt_def_id, last_path_segment, type_size, match_path}; use utils::paths; /// Handles all the linting of funky types @@ -261,7 +261,7 @@ fn is_any_trait(t: &hir::Ty) -> bool { 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) + match_path(&traits[0].trait_ref.path, &paths::ANY_TRAIT) ], { return true; }}