Skip to content

Commit d0ff1a5

Browse files
committed
Auto merge of #4047 - rust-lang:rustup, r=Centril
Rustup to rustc 1.36.0-nightly (f843ad6 2019-04-30) None
2 parents f1eda09 + 83519d3 commit d0ff1a5

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

clippy_lints/src/redundant_clone.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ impl<'tcx> mir::visit::Visitor<'tcx> for LocalUseVisitor {
305305
fn visit_basic_block_data(&mut self, block: mir::BasicBlock, data: &mir::BasicBlockData<'tcx>) {
306306
let statements = &data.statements;
307307
for (statement_index, statement) in statements.iter().enumerate() {
308-
self.visit_statement(block, statement, mir::Location { block, statement_index });
308+
self.visit_statement(statement, mir::Location { block, statement_index });
309309

310310
// Once flagged, skip remaining statements
311311
if self.used_other_than_drop {
@@ -314,7 +314,6 @@ impl<'tcx> mir::visit::Visitor<'tcx> for LocalUseVisitor {
314314
}
315315

316316
self.visit_terminator(
317-
block,
318317
data.terminator(),
319318
mir::Location {
320319
block,
@@ -323,7 +322,7 @@ impl<'tcx> mir::visit::Visitor<'tcx> for LocalUseVisitor {
323322
);
324323
}
325324

326-
fn visit_local(&mut self, local: &mir::Local, ctx: PlaceContext<'tcx>, _: mir::Location) {
325+
fn visit_local(&mut self, local: &mir::Local, ctx: PlaceContext, _: mir::Location) {
327326
match ctx {
328327
PlaceContext::MutatingUse(MutatingUseContext::Drop) | PlaceContext::NonUse(_) => return,
329328
_ => {},

0 commit comments

Comments
 (0)