Rustfmt

4 files changed, 51 insertions, 38 deletions

diff --git a/compiler/rustc_mir_dataflow/src/elaborate_drops.rs b/compiler/rustc_mir_dataflow/src/elaborate_drops.rs
index 74b0e84068c..c1c47ecccf3 100644
--- a/compiler/rustc_mir_dataflow/src/elaborate_drops.rs
+++ b/compiler/rustc_mir_dataflow/src/elaborate_drops.rs
@@ -233,12 +233,15 @@ where
                     .patch_terminator(bb, TerminatorKind::Goto { target: self.succ });
             }
             DropStyle::Static => {
-                self.elaborator.patch().patch_terminator(bb, TerminatorKind::Drop {
-                    place: self.place,
-                    target: self.succ,
-                    unwind: self.unwind.into_action(),
-                    replace: false,
-                });
+                self.elaborator.patch().patch_terminator(
+                    bb,
+                    TerminatorKind::Drop {
+                        place: self.place,
+                        target: self.succ,
+                        unwind: self.unwind.into_action(),
+                        replace: false,
+                    },
+                );
             }
             DropStyle::Conditional => {
                 let drop_bb = self.complete_drop(self.succ, self.unwind);
@@ -729,12 +732,15 @@ where
         };
         let loop_block = self.elaborator.patch().new_block(loop_block);
 
-        self.elaborator.patch().patch_terminator(drop_block, TerminatorKind::Drop {
-            place: tcx.mk_place_deref(ptr),
-            target: loop_block,
-            unwind: unwind.into_action(),
-            replace: false,
-        });
+        self.elaborator.patch().patch_terminator(
+            drop_block,
+            TerminatorKind::Drop {
+                place: tcx.mk_place_deref(ptr),
+                target: loop_block,
+                unwind: unwind.into_action(),
+                replace: false,
+            },
+        );
 
         loop_block
     }
diff --git a/compiler/rustc_mir_dataflow/src/framework/direction.rs b/compiler/rustc_mir_dataflow/src/framework/direction.rs
index 6427fd0fd29..07517d7edab 100644
--- a/compiler/rustc_mir_dataflow/src/framework/direction.rs
+++ b/compiler/rustc_mir_dataflow/src/framework/direction.rs
@@ -305,10 +305,11 @@ impl Direction for Forward {
                     // `exit_state`, so pass it directly to `apply_switch_int_edge_effect` to save
                     // a clone of the dataflow state.
                     let otherwise = targets.otherwise();
-                    analysis.apply_switch_int_edge_effect(&mut data, exit_state, SwitchIntTarget {
-                        value: None,
-                        target: otherwise,
-                    });
+                    analysis.apply_switch_int_edge_effect(
+                        &mut data,
+                        exit_state,
+                        SwitchIntTarget { value: None, target: otherwise },
+                    );
                     propagate(otherwise, exit_state);
                 } else {
                     for target in targets.all_targets() {
diff --git a/compiler/rustc_mir_dataflow/src/framework/graphviz.rs b/compiler/rustc_mir_dataflow/src/framework/graphviz.rs
index 9ccabb46c63..448fad2dc3e 100644
--- a/compiler/rustc_mir_dataflow/src/framework/graphviz.rs
+++ b/compiler/rustc_mir_dataflow/src/framework/graphviz.rs
@@ -670,10 +670,10 @@ where
                 r#"<td colspan="{colspan}" {fmt} align="left">{state}</td>"#,
                 colspan = this.style.num_state_columns(),
                 fmt = fmt,
-                state = dot::escape_html(&format!("{:?}", DebugWithAdapter {
-                    this: state,
-                    ctxt: analysis
-                })),
+                state = dot::escape_html(&format!(
+                    "{:?}",
+                    DebugWithAdapter { this: state, ctxt: analysis }
+                )),
             )
         })
     }
diff --git a/compiler/rustc_mir_dataflow/src/framework/tests.rs b/compiler/rustc_mir_dataflow/src/framework/tests.rs
index 5b3a9ccba69..ae0f1179e6f 100644
--- a/compiler/rustc_mir_dataflow/src/framework/tests.rs
+++ b/compiler/rustc_mir_dataflow/src/framework/tests.rs
@@ -30,26 +30,32 @@ fn mock_body<'tcx>() -> mir::Body<'tcx> {
 
     block(4, mir::TerminatorKind::Return);
     block(1, mir::TerminatorKind::Return);
-    block(2, mir::TerminatorKind::Call {
-        func: mir::Operand::Copy(dummy_place.clone()),
-        args: [].into(),
-        destination: dummy_place.clone(),
-        target: Some(mir::START_BLOCK),
-        unwind: mir::UnwindAction::Continue,
-        call_source: mir::CallSource::Misc,
-        fn_span: DUMMY_SP,
-    });
+    block(
+        2,
+        mir::TerminatorKind::Call {
+            func: mir::Operand::Copy(dummy_place.clone()),
+            args: [].into(),
+            destination: dummy_place.clone(),
+            target: Some(mir::START_BLOCK),
+            unwind: mir::UnwindAction::Continue,
+            call_source: mir::CallSource::Misc,
+            fn_span: DUMMY_SP,
+        },
+    );
     block(3, mir::TerminatorKind::Return);
     block(0, mir::TerminatorKind::Return);
-    block(4, mir::TerminatorKind::Call {
-        func: mir::Operand::Copy(dummy_place.clone()),
-        args: [].into(),
-        destination: dummy_place.clone(),
-        target: Some(mir::START_BLOCK),
-        unwind: mir::UnwindAction::Continue,
-        call_source: mir::CallSource::Misc,
-        fn_span: DUMMY_SP,
-    });
+    block(
+        4,
+        mir::TerminatorKind::Call {
+            func: mir::Operand::Copy(dummy_place.clone()),
+            args: [].into(),
+            destination: dummy_place.clone(),
+            target: Some(mir::START_BLOCK),
+            unwind: mir::UnwindAction::Continue,
+            call_source: mir::CallSource::Misc,
+            fn_span: DUMMY_SP,
+        },
+    );
 
     mir::Body::new_cfg_only(blocks)
 }