hand-held formatting for remaining files

Author: RalfJung

src/diagnostics.rs

@@ -22,16 +22,11 @@ impl fmt::Display for TerminationInfo {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         use TerminationInfo::*;
         match self {
-            Exit(code) =>
-                write!(f, "the evaluated program completed with exit code {}", code),
-            Abort(msg) =>
-                write!(f, "{}", msg),
-            UnsupportedInIsolation(msg) =>
-                write!(f, "{}", msg),
-            ExperimentalUb { msg, .. } =>
-                write!(f, "{}", msg),
-            Deadlock =>
-                write!(f, "the evaluated program deadlocked"),
+            Exit(code) => write!(f, "the evaluated program completed with exit code {}", code),
+            Abort(msg) => write!(f, "{}", msg),
+            UnsupportedInIsolation(msg) => write!(f, "{}", msg),
+            ExperimentalUb { msg, .. } => write!(f, "{}", msg),
+            Deadlock => write!(f, "the evaluated program deadlocked"),
         }
     }
 }
@@ -60,14 +55,12 @@ pub fn report_error<'tcx, 'mir>(
             use TerminationInfo::*;
             let title = match info {
                 Exit(code) => return Some(*code),
-                Abort(_) =>
-                    "abnormal termination",
-                UnsupportedInIsolation(_) =>
-                    "unsupported operation",
-                ExperimentalUb { .. } =>
-                    "Undefined Behavior",
+                Abort(_) => "abnormal termination",
+                UnsupportedInIsolation(_) => "unsupported operation",
+                ExperimentalUb { .. } => "Undefined Behavior",
                 Deadlock => "deadlock",
             };
+            #[rustfmt::skip]
             let helps = match info {
                 UnsupportedInIsolation(_) =>
                     vec![format!("pass the flag `-Zmiri-disable-isolation` to disable isolation")],
@@ -81,6 +74,7 @@ pub fn report_error<'tcx, 'mir>(
             (title, helps)
         }
         _ => {
+            #[rustfmt::skip]
             let title = match e.kind() {
                 Unsupported(_) =>
                     "unsupported operation",
@@ -93,6 +87,7 @@ pub fn report_error<'tcx, 'mir>(
                 _ =>
                     bug!("This error should be impossible in Miri: {}", e),
             };
+            #[rustfmt::skip]
             let helps = match e.kind() {
                 Unsupported(UnsupportedOpInfo::NoMirFor(..)) =>
                     vec![format!("make sure to use a Miri sysroot, which you can prepare with `cargo miri setup`")],
@@ -120,7 +115,14 @@ pub fn report_error<'tcx, 'mir>(
 
     e.print_backtrace();
     let msg = e.to_string();
-    report_msg(*ecx.tcx, /*error*/true, &format!("{}: {}", title, msg), msg, helps, &ecx.generate_stacktrace());
+    report_msg(
+        *ecx.tcx,
+        /*error*/ true,
+        &format!("{}: {}", title, msg),
+        msg,
+        helps,
+        &ecx.generate_stacktrace(),
+    );
 
     // Debug-dump all locals.
     for (i, frame) in ecx.active_thread_stack().iter().enumerate() {
@@ -249,7 +251,10 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
             }
             // Add popped frame back.
             if stacktrace.len() < info.stack_size {
-                assert!(stacktrace.len() == info.stack_size-1, "we should never pop more than one frame at once");
+                assert!(
+                    stacktrace.len() == info.stack_size - 1,
+                    "we should never pop more than one frame at once"
+                );
                 let frame_info = FrameInfo {
                     instance: info.instance.unwrap(),
                     span: info.span,
@@ -259,25 +264,30 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
             } else if let Some(instance) = info.instance {
                 // Adjust topmost frame.
                 stacktrace[0].span = info.span;
-                assert_eq!(stacktrace[0].instance, instance, "we should not pop and push a frame in one step");
+                assert_eq!(
+                    stacktrace[0].instance, instance,
+                    "we should not pop and push a frame in one step"
+                );
             }
 
             // Show diagnostics.
             for e in diagnostics.drain(..) {
                 use NonHaltingDiagnostic::*;
                 let msg = match e {
-                    CreatedPointerTag(tag) =>
-                        format!("created tag {:?}", tag),
-                    PoppedPointerTag(item) =>
-                        format!("popped tracked tag for item {:?}", item),
-                    CreatedCallId(id) =>
-                        format!("function call with id {}", id),
-                    CreatedAlloc(AllocId(id)) =>
-                        format!("created allocation with id {}", id),
-                    FreedAlloc(AllocId(id)) =>
-                        format!("freed allocation with id {}", id),
+                    CreatedPointerTag(tag) => format!("created tag {:?}", tag),
+                    PoppedPointerTag(item) => format!("popped tracked tag for item {:?}", item),
+                    CreatedCallId(id) => format!("function call with id {}", id),
+                    CreatedAlloc(AllocId(id)) => format!("created allocation with id {}", id),
+                    FreedAlloc(AllocId(id)) => format!("freed allocation with id {}", id),
                 };
-                report_msg(*this.tcx, /*error*/false, "tracking was triggered", msg, vec![], &stacktrace);
+                report_msg(
+                    *this.tcx,
+                    /*error*/ false,
+                    "tracking was triggered",
+                    msg,
+                    vec![],
+                    &stacktrace,
+                );
             }
         });
     }

src/shims/foreign_items.rs

@@ -114,7 +114,6 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
     /// by this function.
     /// Returns Ok(Some(body)) if processing the foreign item
     /// is delegated to another function.
-    #[rustfmt::skip]
     fn emulate_foreign_item(
         &mut self,
         def_id: DefId,
@@ -149,6 +148,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
                     let panic_impl_instance = ty::Instance::mono(tcx, panic_impl_id);
                     return Ok(Some(&*this.load_mir(panic_impl_instance.def, None)?));
                 }
+                #[rustfmt::skip]
                 | "exit"
                 | "ExitProcess"
                 => {
@@ -160,7 +160,9 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
                 }
                 "abort" => {
                     check_abi(abi, Abi::C { unwind: false })?;
-                    throw_machine_stop!(TerminationInfo::Abort("the program aborted execution".to_owned()))
+                    throw_machine_stop!(TerminationInfo::Abort(
+                        "the program aborted execution".to_owned()
+                    ))
                 }
                 _ => throw_unsup_format!("can't call (diverging) foreign function: {}", link_name),
             },
@@ -175,7 +177,9 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
             // We forward this to the underlying *implementation* in the panic runtime crate.
             // Normally, this will be either `libpanic_unwind` or `libpanic_abort`, but it could
             // also be a custom user-provided implementation via `#![feature(panic_runtime)]`
-            "__rust_start_panic" | "__rust_panic_cleanup" => {
+            #[rustfmt::skip]
+            "__rust_start_panic" |
+            "__rust_panic_cleanup" => {
                 check_abi(abi, Abi::C { unwind: false })?;
                 // This replicates some of the logic in `inject_panic_runtime`.
                 // FIXME: is there a way to reuse that logic?
@@ -406,6 +410,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
             }
 
             // math functions
+            #[rustfmt::skip]
             | "cbrtf"
             | "coshf"
             | "sinhf"
@@ -430,6 +435,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
                 };
                 this.write_scalar(Scalar::from_u32(f.to_bits()), dest)?;
             }
+            #[rustfmt::skip]
             | "_hypotf"
             | "hypotf"
             | "atan2f"
@@ -448,6 +454,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
                 };
                 this.write_scalar(Scalar::from_u32(n.to_bits()), dest)?;
             }
+            #[rustfmt::skip]
             | "cbrt"
             | "cosh"
             | "sinh"
@@ -472,6 +479,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
                 };
                 this.write_scalar(Scalar::from_u64(f.to_bits()), dest)?;
             }
+            #[rustfmt::skip]
             | "_hypot"
             | "hypot"
             | "atan2"
@@ -488,6 +496,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
                 };
                 this.write_scalar(Scalar::from_u64(n.to_bits()), dest)?;
             }
+            #[rustfmt::skip]
             | "_ldexp"
             | "ldexp"
             | "scalbn"