address review comments

Author: branchseer

crates/fspy_detours_sys/Cargo.toml

@@ -7,7 +7,7 @@ license.workspace = true
 rust-version.workspace = true
 
 [build-dependencies]
-cc ={ workspace = true }
+cc = { workspace = true }
 
 [dependencies]
 winapi = { workspace = true, features = ["minwindef", "libloaderapi", "processthreadsapi", "windef"] }

crates/fspy_detours_sys/src/generated_bindings.rs

@@ -1,10 +1,11 @@
-use winapi::shared::minwindef::*;
-use winapi::um::winnt::*;
-use winapi::um::winnt::{INT};
-use winapi::um::minwinbase::*;
-use winapi::um::processthreadsapi::*;
-use winapi::shared::guiddef::*;
-use winapi::shared::windef::*;
+use winapi::{
+    shared::{guiddef::*, minwindef::*, windef::*},
+    um::{
+        minwinbase::*,
+        processthreadsapi::*,
+        winnt::{INT, *},
+    },
+};
 
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
@@ -14,11 +15,7 @@ pub struct _DETOUR_TRAMPOLINE {
 pub type PDETOUR_TRAMPOLINE = *mut _DETOUR_TRAMPOLINE;
 /// Binary Typedefs.
 pub type PF_DETOUR_BINARY_BYWAY_CALLBACK = ::std::option::Option<
-    unsafe extern "system" fn(
-        pContext: PVOID,
-        pszFile: LPCSTR,
-        ppszOutFile: *mut LPCSTR,
-    ) -> BOOL,
+    unsafe extern "system" fn(pContext: PVOID, pszFile: LPCSTR, ppszOutFile: *mut LPCSTR) -> BOOL,
 >;
 pub type PF_DETOUR_BINARY_FILE_CALLBACK = ::std::option::Option<
     unsafe extern "system" fn(
@@ -39,9 +36,8 @@ pub type PF_DETOUR_BINARY_SYMBOL_CALLBACK = ::std::option::Option<
         ppszOutSymbol: *mut LPCSTR,
     ) -> BOOL,
 >;
-pub type PF_DETOUR_BINARY_COMMIT_CALLBACK = ::std::option::Option<
-    unsafe extern "system" fn(pContext: PVOID) -> BOOL,
->;
+pub type PF_DETOUR_BINARY_COMMIT_CALLBACK =
+    ::std::option::Option<unsafe extern "system" fn(pContext: PVOID) -> BOOL>;
 pub type PF_DETOUR_ENUMERATE_EXPORT_CALLBACK = ::std::option::Option<
     unsafe extern "system" fn(
         pContext: PVOID,
@@ -178,11 +174,7 @@ unsafe extern "system" {
     ) -> BOOL;
 }
 unsafe extern "system" {
-    pub fn DetourFindPayload(
-        hModule: HMODULE,
-        rguid: *const GUID,
-        pcbData: *mut DWORD,
-    ) -> PVOID;
+    pub fn DetourFindPayload(hModule: HMODULE, rguid: *const GUID, pcbData: *mut DWORD) -> PVOID;
 }
 unsafe extern "system" {
     pub fn DetourFindPayloadEx(rguid: *const GUID, pcbData: *mut DWORD) -> PVOID;
@@ -221,10 +213,7 @@ unsafe extern "system" {
     ) -> PVOID;
 }
 unsafe extern "system" {
-    pub fn DetourBinaryDeletePayload(
-        pBinary: PDETOUR_BINARY,
-        rguid: *const GUID,
-    ) -> BOOL;
+    pub fn DetourBinaryDeletePayload(pBinary: PDETOUR_BINARY, rguid: *const GUID) -> BOOL;
 }
 unsafe extern "system" {
     pub fn DetourBinaryPurgePayloads(pBinary: PDETOUR_BINARY) -> BOOL;
@@ -413,11 +402,8 @@ unsafe extern "system" {
     ) -> BOOL;
 }
 unsafe extern "system" {
-    pub fn DetourUpdateProcessWithDll(
-        hProcess: HANDLE,
-        rlpDlls: *mut LPCSTR,
-        nDlls: DWORD,
-    ) -> BOOL;
+    pub fn DetourUpdateProcessWithDll(hProcess: HANDLE, rlpDlls: *mut LPCSTR, nDlls: DWORD)
+    -> BOOL;
 }
 unsafe extern "system" {
     pub fn DetourUpdateProcessWithDllEx(
@@ -454,10 +440,5 @@ unsafe extern "system" {
     pub fn DetourIsHelperProcess() -> BOOL;
 }
 unsafe extern "system" {
-    pub fn DetourFinishHelperProcess(
-        arg1: HWND,
-        arg2: HINSTANCE,
-        arg3: LPSTR,
-        arg4: INT,
-    );
+    pub fn DetourFinishHelperProcess(arg1: HWND, arg2: HINSTANCE, arg3: LPSTR, arg4: INT);
 }

crates/fspy_detours_sys/tests/bindings.rs

@@ -35,7 +35,7 @@ fn detours_bindings() {
         .disable_header_comment()
         .raw_line("use winapi::shared::minwindef::*;")
         .raw_line("use winapi::um::winnt::*;")
-        .raw_line("use winapi::um::winnt::{INT};")
+        .raw_line("use winapi::um::winnt::INT;")
         .raw_line("use winapi::um::minwinbase::*;")
         .raw_line("use winapi::um::processthreadsapi::*;")
         .raw_line("use winapi::shared::guiddef::*;")