From 83519d3ca0264def693a2c2552ba4394c3f08c37 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Mon, 29 Apr 2019 22:31:39 -0700 Subject: [PATCH] Rustup to rustc 1.36.0-nightly (f843ad60e 2019-04-30) --- clippy_lints/src/redundant_clone.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/clippy_lints/src/redundant_clone.rs b/clippy_lints/src/redundant_clone.rs index 92628cfb4a4..db25b74cd08 100644 --- a/clippy_lints/src/redundant_clone.rs +++ b/clippy_lints/src/redundant_clone.rs @@ -305,7 +305,7 @@ impl<'tcx> mir::visit::Visitor<'tcx> for LocalUseVisitor { fn visit_basic_block_data(&mut self, block: mir::BasicBlock, data: &mir::BasicBlockData<'tcx>) { let statements = &data.statements; for (statement_index, statement) in statements.iter().enumerate() { - self.visit_statement(block, statement, mir::Location { block, statement_index }); + self.visit_statement(statement, mir::Location { block, statement_index }); // Once flagged, skip remaining statements if self.used_other_than_drop { @@ -314,7 +314,6 @@ impl<'tcx> mir::visit::Visitor<'tcx> for LocalUseVisitor { } self.visit_terminator( - block, data.terminator(), mir::Location { block, @@ -323,7 +322,7 @@ impl<'tcx> mir::visit::Visitor<'tcx> for LocalUseVisitor { ); } - fn visit_local(&mut self, local: &mir::Local, ctx: PlaceContext<'tcx>, _: mir::Location) { + fn visit_local(&mut self, local: &mir::Local, ctx: PlaceContext, _: mir::Location) { match ctx { PlaceContext::MutatingUse(MutatingUseContext::Drop) | PlaceContext::NonUse(_) => return, _ => {},