diff options
| author | Yuki Okushi <huyuumi.dev@gmail.com> | 2020-01-09 16:13:22 +0900 |
|---|---|---|
| committer | Yuki Okushi <huyuumi.dev@gmail.com> | 2020-01-09 16:43:51 +0900 |
| commit | e58cfac458aad876e1a6e8b07626519d5178badb (patch) | |
| tree | 0b868edf092c3a54da773006cd609113a76ab8e7 /clippy_lints/src/mutable_debug_assertion.rs | |
| parent | c24251b5fd178a19729561d41b43f5dab0e2aa5c (diff) | |
| download | rust-e58cfac458aad876e1a6e8b07626519d5178badb.tar.gz rust-e58cfac458aad876e1a6e8b07626519d5178badb.zip | |
Rustup to rust-lang/rust#67979
Diffstat (limited to 'clippy_lints/src/mutable_debug_assertion.rs')
| -rw-r--r-- | clippy_lints/src/mutable_debug_assertion.rs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/clippy_lints/src/mutable_debug_assertion.rs b/clippy_lints/src/mutable_debug_assertion.rs index bbcfcd43613..0918886a979 100644 --- a/clippy_lints/src/mutable_debug_assertion.rs +++ b/clippy_lints/src/mutable_debug_assertion.rs @@ -1,9 +1,10 @@ use crate::utils::{is_direct_expn_of, span_lint}; use if_chain::if_chain; use matches::matches; -use rustc::hir::intravisit::{walk_expr, NestedVisitorMap, Visitor}; +use rustc::hir::map::Map; use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass}; use rustc::{declare_lint_pass, ty}; +use rustc_hir::intravisit::{walk_expr, NestedVisitorMap, Visitor}; use rustc_hir::{BorrowKind, Expr, ExprKind, Mutability, StmtKind, UnOp}; use rustc_session::declare_tool_lint; use rustc_span::Span; @@ -127,6 +128,8 @@ impl<'a, 'tcx> MutArgVisitor<'a, 'tcx> { } impl<'a, 'tcx> Visitor<'tcx> for MutArgVisitor<'a, 'tcx> { + type Map = Map<'tcx>; + fn visit_expr(&mut self, expr: &'tcx Expr<'_>) { match expr.kind { ExprKind::AddrOf(BorrowKind::Ref, Mutability::Mut, _) => { @@ -150,7 +153,7 @@ impl<'a, 'tcx> Visitor<'tcx> for MutArgVisitor<'a, 'tcx> { walk_expr(self, expr) } - fn nested_visit_map<'this>(&'this mut self) -> NestedVisitorMap<'this, 'tcx> { + fn nested_visit_map(&mut self) -> NestedVisitorMap<'_, Self::Map> { NestedVisitorMap::OnlyBodies(&self.cx.tcx.hir()) } } |
