bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #77037 - matthiaskrgr:cl42ppy, r=Dylan-DPC

Browse source 
more tiny clippy cleanups

commits stand alone and can be reviewed one by one
This commit is contained in:
Jonas Schievink 2020-09-30 20:56:05 +02:00 • committed by GitHub
commit 248d6bf1e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/rustc_mir/src/borrow_check/type_check/constraint_conversion.rs
View file

@ -62,8 +62,7 @@ impl<'a, 'tcx> ConstraintConversion<'a, 'tcx> {
// `self.constraints`, but we also want to be mutating // `self.constraints`, but we also want to be mutating
// `self.member_constraints`. For now, just swap out the value // `self.member_constraints`. For now, just swap out the value
// we want and replace at the end. // we want and replace at the end.
let mut tmp = let mut tmp = std::mem::take(&mut self.constraints.member_constraints);
std::mem::replace(&mut self.constraints.member_constraints, Default::default());
for member_constraint in member_constraints { for member_constraint in member_constraints {
tmp.push_constraint(member_constraint, |r| self.to_region_vid(r)); tmp.push_constraint(member_constraint, |r| self.to_region_vid(r));
} }

2
compiler/rustc_mir/src/transform/early_otherwise_branch.rs
View file

@ -91,7 +91,7 @@ impl<'tcx> MirPass<'tcx> for EarlyOtherwiseBranch {
let not_equal_rvalue = Rvalue::BinaryOp( let not_equal_rvalue = Rvalue::BinaryOp(
not_equal, not_equal,
Operand::Copy(Place::from(second_discriminant_temp)), Operand::Copy(Place::from(second_discriminant_temp)),
Operand::Copy(Place::from(first_descriminant_place)), Operand::Copy(first_descriminant_place),
); );
patch.add_statement( patch.add_statement(
end_of_block_location, end_of_block_location,

6
compiler/rustc_typeck/src/check/writeback.rs
View file

@ -70,10 +70,8 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
debug!("used_trait_imports({:?}) = {:?}", item_def_id, used_trait_imports); debug!("used_trait_imports({:?}) = {:?}", item_def_id, used_trait_imports);
wbcx.typeck_results.used_trait_imports = used_trait_imports; wbcx.typeck_results.used_trait_imports = used_trait_imports;
wbcx.typeck_results.closure_captures = mem::replace( wbcx.typeck_results.closure_captures =
&mut self.typeck_results.borrow_mut().closure_captures, mem::take(&mut self.typeck_results.borrow_mut().closure_captures);
Default::default(),
);
if self.is_tainted_by_errors() { if self.is_tainted_by_errors() {
// FIXME(eddyb) keep track of `ErrorReported` from where the error was emitted. // FIXME(eddyb) keep track of `ErrorReported` from where the error was emitted.