dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #4047 - rust-lang:rustup, r=Centril 

Rustup to rustc 1.36.0-nightly (f843ad60e 2019-04-30)

None
This commit is contained in:
bors 2019-04-30 05:34:55 +00:00
parent f1eda09ea1 83519d3ca0
commit d0ff1a585f
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clippy_lints/src/redundant_clone.rs
View File

@ -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>) { fn visit_basic_block_data(&mut self, block: mir::BasicBlock, data: &mir::BasicBlockData<'tcx>) {
let statements = &data.statements; let statements = &data.statements;
for (statement_index, statement) in statements.iter().enumerate() { 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 // Once flagged, skip remaining statements
if self.used_other_than_drop { if self.used_other_than_drop {
@ -314,7 +314,6 @@ impl<'tcx> mir::visit::Visitor<'tcx> for LocalUseVisitor {
} }
self.visit_terminator( self.visit_terminator(
block,
data.terminator(), data.terminator(),
mir::Location { mir::Location {
block, 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 { match ctx {
PlaceContext::MutatingUse(MutatingUseContext::Drop) | PlaceContext::NonUse(_) => return, PlaceContext::MutatingUse(MutatingUseContext::Drop) | PlaceContext::NonUse(_) => return,
_ => {}, _ => {},