From 5a3cd31c9ed76033319a5cb63cbd0acf3d1c43a9 Mon Sep 17 00:00:00 2001 From: flip1995 Date: Wed, 13 Feb 2019 22:06:19 +0100 Subject: [PATCH] Rustup cc rust-lang/rust#58137 --- clippy_lints/src/cyclomatic_complexity.rs | 4 ++-- clippy_lints/src/eta_reduction.rs | 2 +- clippy_lints/src/lib.rs | 1 - clippy_lints/src/loops.rs | 6 +++--- clippy_lints/src/shadow.rs | 2 +- clippy_lints/src/types.rs | 2 +- clippy_lints/src/utils/inspector.rs | 2 +- 7 files changed, 9 insertions(+), 10 deletions(-) diff --git a/clippy_lints/src/cyclomatic_complexity.rs b/clippy_lints/src/cyclomatic_complexity.rs index c6358aed4bdb..6c5c5ecbb027 100644 --- a/clippy_lints/src/cyclomatic_complexity.rs +++ b/clippy_lints/src/cyclomatic_complexity.rs @@ -78,7 +78,7 @@ impl CyclomaticComplexity { returns, .. } = helper; - let ret_ty = cx.tables.node_id_to_type(expr.hir_id); + let ret_ty = cx.tables.node_type(expr.hir_id); let ret_adjust = if match_type(cx, ret_ty, &paths::RESULT) { returns } else { @@ -159,7 +159,7 @@ impl<'a, 'tcx> Visitor<'tcx> for CCHelper<'a, 'tcx> { }, ExprKind::Call(ref callee, _) => { walk_expr(self, e); - let ty = self.cx.tables.node_id_to_type(callee.hir_id); + let ty = self.cx.tables.node_type(callee.hir_id); match ty.sty { ty::FnDef(..) | ty::FnPtr(_) => { let sig = ty.fn_sig(self.cx.tcx); diff --git a/clippy_lints/src/eta_reduction.rs b/clippy_lints/src/eta_reduction.rs index 83aca243275b..87a82b2a169e 100644 --- a/clippy_lints/src/eta_reduction.rs +++ b/clippy_lints/src/eta_reduction.rs @@ -126,7 +126,7 @@ fn get_ufcs_type_name( self_arg: &Expr, ) -> std::option::Option { let expected_type_of_self = &cx.tcx.fn_sig(method_def_id).inputs_and_output().skip_binder()[0].sty; - let actual_type_of_self = &cx.tables.node_id_to_type(self_arg.hir_id).sty; + let actual_type_of_self = &cx.tables.node_type(self_arg.hir_id).sty; if let Some(trait_id) = cx.tcx.trait_of_item(method_def_id) { //if the method expectes &self, ufcs requires explicit borrowing so closure can't be removed diff --git a/clippy_lints/src/lib.rs b/clippy_lints/src/lib.rs index 88224763f0c4..d0032fe78fc3 100644 --- a/clippy_lints/src/lib.rs +++ b/clippy_lints/src/lib.rs @@ -5,7 +5,6 @@ #![feature(slice_patterns)] #![feature(stmt_expr_attributes)] #![feature(range_contains)] -#![feature(str_escape)] #![allow(clippy::missing_docs_in_private_items)] #![recursion_limit = "256"] #![warn(rust_2018_idioms, trivial_casts, trivial_numeric_casts)] diff --git a/clippy_lints/src/loops.rs b/clippy_lints/src/loops.rs index 99ed9fc86fde..058d9adcb514 100644 --- a/clippy_lints/src/loops.rs +++ b/clippy_lints/src/loops.rs @@ -1781,7 +1781,7 @@ impl<'a, 'tcx> VarVisitor<'a, 'tcx> { if index_used_directly { self.indexed_directly.insert( seqvar.segments[0].ident.name, - (Some(extent), self.cx.tables.node_id_to_type(seqexpr.hir_id)), + (Some(extent), self.cx.tables.node_type(seqexpr.hir_id)), ); } return false; // no need to walk further *on the variable* @@ -1793,7 +1793,7 @@ impl<'a, 'tcx> VarVisitor<'a, 'tcx> { if index_used_directly { self.indexed_directly.insert( seqvar.segments[0].ident.name, - (None, self.cx.tables.node_id_to_type(seqexpr.hir_id)), + (None, self.cx.tables.node_type(seqexpr.hir_id)), ); } return false; // no need to walk further *on the variable* @@ -2418,7 +2418,7 @@ fn check_needless_collect<'a, 'tcx>(expr: &'tcx Expr, cx: &LateContext<'a, 'tcx> if let Some(ref generic_args) = chain_method.args; if let Some(GenericArg::Type(ref ty)) = generic_args.args.get(0); then { - let ty = cx.tables.node_id_to_type(ty.hir_id); + let ty = cx.tables.node_type(ty.hir_id); if match_type(cx, ty, &paths::VEC) || match_type(cx, ty, &paths::VEC_DEQUE) || match_type(cx, ty, &paths::BTREEMAP) || diff --git a/clippy_lints/src/shadow.rs b/clippy_lints/src/shadow.rs index 722f64405c79..9adac2f6d7fa 100644 --- a/clippy_lints/src/shadow.rs +++ b/clippy_lints/src/shadow.rs @@ -156,7 +156,7 @@ fn check_local<'a, 'tcx>(cx: &LateContext<'a, 'tcx>, local: &'tcx Local, binding } fn is_binding(cx: &LateContext<'_, '_>, pat_id: HirId) -> bool { - let var_ty = cx.tables.node_id_to_type(pat_id); + let var_ty = cx.tables.node_type(pat_id); match var_ty.sty { ty::Adt(..) => false, _ => true, diff --git a/clippy_lints/src/types.rs b/clippy_lints/src/types.rs index 461bd20b80c2..79e9f4f27d24 100644 --- a/clippy_lints/src/types.rs +++ b/clippy_lints/src/types.rs @@ -2343,7 +2343,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for RefToMut { if let TyKind::Ptr(MutTy { mutbl: Mutability::MutMutable, .. }) = t.node; if let ExprKind::Cast(e, t) = &e.node; if let TyKind::Ptr(MutTy { mutbl: Mutability::MutImmutable, .. }) = t.node; - if let ty::Ref(..) = cx.tables.node_id_to_type(e.hir_id).sty; + if let ty::Ref(..) = cx.tables.node_type(e.hir_id).sty; then { span_lint( cx, diff --git a/clippy_lints/src/utils/inspector.rs b/clippy_lints/src/utils/inspector.rs index 508bf26bab90..7df1b0eb0e3e 100644 --- a/clippy_lints/src/utils/inspector.rs +++ b/clippy_lints/src/utils/inspector.rs @@ -127,7 +127,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass { } match stmt.node { hir::StmtKind::Local(ref local) => { - println!("local variable of type {}", cx.tables.node_id_to_type(local.hir_id)); + println!("local variable of type {}", cx.tables.node_type(local.hir_id)); println!("pattern:"); print_pat(cx, &local.pat, 0); if let Some(ref e) = local.init {