Incorporate upstream changes
This commit is contained in:
parent
695bedbe27
commit
cd57add2c3
1 changed files with 2 additions and 2 deletions
|
@ -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;
|
||||
}}
|
||||
|
|
Loading…
Add table
Reference in a new issue