??

Author: nia-e

Cargo.lock

@@ -46,13 +46,6 @@ ipc-channel = "0.19.0"
 serde = { version = "1.0.219", features = ["derive"] }
 capstone = "0.13"
 
-[target.'cfg(target_family = "windows")'.dependencies]
-windows-sys = { version = "0.59", features = [
-    "Win32_Foundation",
-    "Win32_System_IO",
-    "Win32_Storage_FileSystem",
-] }
-
 [dev-dependencies]
 ui_test = "0.29.1"
 colored = "2"

Cargo.toml

@@ -484,7 +484,10 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
     /// called before the FFI (with `paranoid` set to false) then some of the writes may be
     /// lost!
     #[cfg(target_os = "linux")]
-    fn apply_events(&mut self, events: crate::shims::trace::messages::MemEvents) -> InterpResult<'tcx> {
+    fn apply_events(
+        &mut self,
+        events: crate::shims::trace::messages::MemEvents,
+    ) -> InterpResult<'tcx> {
         let this = self.eval_context_mut();
 
         let mut reads = vec![];

src/alloc_addresses/mod.rs

@@ -15,7 +15,8 @@ use crate::alloc::isolated_alloc::IsolatedAlloc;
 use crate::*;
 
 #[cfg(target_os = "linux")]
-type CallResult<'tcx> = InterpResult<'tcx, (ImmTy<'tcx>, Option<shims::trace::messages::MemEvents>)>;
+type CallResult<'tcx> =
+    InterpResult<'tcx, (ImmTy<'tcx>, Option<shims::trace::messages::MemEvents>)>;
 #[cfg(not(target_os = "linux"))]
 type CallResult<'tcx> = InterpResult<'tcx, (ImmTy<'tcx>, Option<!>)>;
 

src/shims/native_lib.rs

@@ -8,7 +8,7 @@ pub(super) enum TraceRequest {
     /// Requests that tracing begins. Following this being sent, the child must
     /// wait to receive a `Confirmation` on the respective channel and then
     /// `raise(SIGSTOP)`.
-    /// 
+    ///
     /// To avoid possible issues while allocating memory for IPC channels, ending
     /// the tracing is instead done via `raise(SIGUSR1)`.
     StartFfi(super::StartFfiInfo),
@@ -19,14 +19,14 @@ pub(super) enum TraceRequest {
 
 /// A marker type confirming that the supervisor has received the request to begin
 /// tracing and is now waiting for a `SIGSTOP`.
-/// 
+///
 /// The sender for this channel should live on the parent process.
 #[derive(serde::Serialize, serde::Deserialize, Debug)]
 pub(super) struct Confirmation;
 
 /// The final results of an FFI trace, containing every relevant event detected
 /// by the tracer. Sent by the supervisor.
-/// 
+///
 /// The sender for this channel should live on the parent process.
 #[derive(serde::Serialize, serde::Deserialize, Debug)]
 pub struct MemEvents {
@@ -36,4 +36,4 @@ pub struct MemEvents {
     /// it is reported as whatever would be safest to assume; i.e. a read + maybe-write
     /// becomes a read + write, etc.
     pub acc_events: Vec<super::AccessEvent>,
-}
+}

src/shims/trace/messages.rs

@@ -1,6 +1,6 @@
 mod child;
-mod parent;
 pub mod messages;
+mod parent;
 
 use std::ops::Range;