diff --git a/src/librustc_mir/transform/inline.rs b/src/librustc_mir/transform/inline.rs index 1d45c1fe186..ebfadd0cfd3 100644 --- a/src/librustc_mir/transform/inline.rs +++ b/src/librustc_mir/transform/inline.rs @@ -496,7 +496,7 @@ fn dest_needs_borrow(place: &Place<'_>) -> bool { kind: TerminatorKind::Goto { target: BasicBlock::new(bb_len) } }; - caller_body[callsite.bb].terminator= Some(terminator); + caller_body[callsite.bb].terminator = Some(terminator); true } diff --git a/src/librustc_mir/transform/mod.rs b/src/librustc_mir/transform/mod.rs index 76e89ce5cf2..156ef4c3b8a 100644 --- a/src/librustc_mir/transform/mod.rs +++ b/src/librustc_mir/transform/mod.rs @@ -297,8 +297,6 @@ fn run_optimization_passes<'tcx>( &uniform_array_move_out::RestoreSubsliceArrayMoveOut::new(tcx), &inline::Inline, - // State transform requires that predecessors have been predefined - &ensure_predecessors_cache::EnsurePredecessorsCache::new("pre-state-transform"), // Lowering generator control-flow and variables // has to happen before we do anything else to them. &generator::StateTransform, diff --git a/src/librustc_mir/transform/simplify.rs b/src/librustc_mir/transform/simplify.rs index 2cd13daf31b..040bc5c309a 100644 --- a/src/librustc_mir/transform/simplify.rs +++ b/src/librustc_mir/transform/simplify.rs @@ -124,11 +124,9 @@ pub fn simplify(mut self) { changed |= inner_changed; } - { - let data = &mut self.basic_blocks[bb]; - data.statements.extend(new_stmts); - data.terminator = Some(terminator); - } + let data = &mut self.basic_blocks[bb]; + data.statements.extend(new_stmts); + data.terminator = Some(terminator); changed |= inner_changed; }