diff options
| author | Andre Bogus <bogusandre@gmail.com> | 2019-09-09 17:22:41 +0200 |
|---|---|---|
| committer | Andre Bogus <bogusandre@gmail.com> | 2019-09-09 17:22:41 +0200 |
| commit | 507c03a85955ab0d165df55a20c781808296017c (patch) | |
| tree | 4e6650867200631c9936c5eaead67a1c528093d9 | |
| parent | 144d940c2fc1055fd9e2bcbd0bd21bf5591a5381 (diff) | |
| download | rust-507c03a85955ab0d165df55a20c781808296017c.tar.gz rust-507c03a85955ab0d165df55a20c781808296017c.zip | |
Changed more Vec paths to diagnostic_items
| -rw-r--r-- | clippy_lints/src/get_last_with_len.rs | 4 | ||||
| -rw-r--r-- | clippy_lints/src/loops.rs | 2 | ||||
| -rw-r--r-- | clippy_lints/src/methods/mod.rs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/clippy_lints/src/get_last_with_len.rs b/clippy_lints/src/get_last_with_len.rs index d6b739e7790..7431b7818e7 100644 --- a/clippy_lints/src/get_last_with_len.rs +++ b/clippy_lints/src/get_last_with_len.rs @@ -1,6 +1,6 @@ //! lint on using `x.get(x.len() - 1)` instead of `x.last()` -use crate::utils::{match_type, paths, snippet_with_applicability, span_lint_and_sugg, SpanlessEq}; +use crate::utils::{is_type_diagnostic_item, snippet_with_applicability, span_lint_and_sugg, SpanlessEq}; use if_chain::if_chain; use rustc::hir::{BinOpKind, Expr, ExprKind}; use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; @@ -56,7 +56,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for GetLastWithLen { // Argument 0 (the struct we're calling the method on) is a vector if let Some(struct_calling_on) = args.get(0); let struct_ty = cx.tables.expr_ty(struct_calling_on); - if match_type(cx, struct_ty, &paths::VEC); + if is_type_diagnostic_item(cx, struct_ty, Symbol::intern("vec_type")); // Argument to "get" is a subtraction if let Some(get_index_arg) = args.get(1); diff --git a/clippy_lints/src/loops.rs b/clippy_lints/src/loops.rs index faf6a55fbb0..5816224a275 100644 --- a/clippy_lints/src/loops.rs +++ b/clippy_lints/src/loops.rs @@ -2399,7 +2399,7 @@ fn check_needless_collect<'a, 'tcx>(expr: &'tcx Expr, cx: &LateContext<'a, 'tcx> if let Some(GenericArg::Type(ref ty)) = generic_args.args.get(0); then { let ty = cx.tables.node_type(ty.hir_id); - if match_type(cx, ty, &paths::VEC) || + if is_type_diagnostic_item(cx, ty, Symbol::intern("vec_type")) || match_type(cx, ty, &paths::VEC_DEQUE) || match_type(cx, ty, &paths::BTREEMAP) || match_type(cx, ty, &paths::HASHMAP) { diff --git a/clippy_lints/src/methods/mod.rs b/clippy_lints/src/methods/mod.rs index a4904483c24..1e8bead94a6 100644 --- a/clippy_lints/src/methods/mod.rs +++ b/clippy_lints/src/methods/mod.rs @@ -1987,7 +1987,7 @@ fn derefs_to_slice<'a, 'tcx>( match ty.sty { ty::Slice(_) => true, ty::Adt(def, _) if def.is_box() => may_slice(cx, ty.boxed_ty()), - ty::Adt(..) => match_type(cx, ty, &paths::VEC), + ty::Adt(..) => is_type_diagnostic_item(cx, ty, Symbol::intern("vec_type")), ty::Array(_, size) => size.eval_usize(cx.tcx, cx.param_env) < 32, ty::Ref(_, inner, _) => may_slice(cx, inner), _ => false, |