From 22e77dfa981487181b7a89117eb59b2bc04158b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= Date: Wed, 29 May 2019 00:41:34 +0200 Subject: [PATCH] rustup https://github.com/rust-lang/rust/pull/60928 --- clippy_lints/src/redundant_clone.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/clippy_lints/src/redundant_clone.rs b/clippy_lints/src/redundant_clone.rs index db275ef9e585..edcf41f758c0 100644 --- a/clippy_lints/src/redundant_clone.rs +++ b/clippy_lints/src/redundant_clone.rs @@ -212,7 +212,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for RedundantClone { /// If `kind` is `y = func(x: &T)` where `T: !Copy`, returns `(DefId of func, x, T, y)`. fn is_call_with_ref_arg<'tcx>( cx: &LateContext<'_, 'tcx>, - mir: &'tcx mir::Mir<'tcx>, + mir: &'tcx mir::Body<'tcx>, kind: &'tcx mir::TerminatorKind<'tcx>, ) -> Option<(def_id::DefId, mir::Local, Ty<'tcx>, Option<&'tcx mir::Place<'tcx>>)> { if_chain! { @@ -236,7 +236,7 @@ type CannotMoveOut = bool; /// ``Some((from, [`true` if `from` cannot be moved out]))``. fn find_stmt_assigns_to<'a, 'tcx: 'a>( cx: &LateContext<'_, 'tcx>, - mir: &mir::Mir<'tcx>, + mir: &mir::Body<'tcx>, to: mir::Local, by_ref: bool, stmts: impl DoubleEndedIterator>, @@ -270,7 +270,7 @@ fn find_stmt_assigns_to<'a, 'tcx: 'a>( /// Also reports whether given `place` cannot be moved out. fn base_local_and_movability<'tcx>( cx: &LateContext<'_, 'tcx>, - mir: &mir::Mir<'tcx>, + mir: &mir::Body<'tcx>, mut place: &mir::Place<'tcx>, ) -> Option<(mir::Local, CannotMoveOut)> { use rustc::mir::Place::*;