improve scoping of unsafe blocks

src/process/handle.rs

@@ -21,25 +21,21 @@ impl Deref for Handle {
 
 impl Drop for Handle {
     fn drop(&mut self) {
-        unsafe {
+        if let Err(why) = unsafe { CloseHandle(**self) } {
-            if let Err(why) = CloseHandle(**self) {
             log::error!("failed to close handle: {why}");
         };
     }
-    }
 }
 
 impl Handle {
     pub fn from_pid(pid: u32) -> Result<Self, crate::Error> {
-        let handle = unsafe {
+        let handle = unsafe { OpenProcess(PROCESS_ALL_ACCESS, false, pid) }
-            OpenProcess(PROCESS_ALL_ACCESS, false, pid)
+            .or_else(|_| unsafe { OpenProcess(PROCESS_VM_READ | PROCESS_VM_WRITE, false, pid) })
-                .or_else(|_| OpenProcess(PROCESS_VM_READ | PROCESS_VM_WRITE, false, pid))
             .map_err(|why| {
                 crate::Error::ObtainHandleError(format!(
                     "failed to open process with needed access: {why}",
                 ))
-                })?
+            })?;
-        };
         if handle == INVALID_HANDLE_VALUE {
             return Err(crate::Error::ObtainHandleError(
                 "failed to get a valid handle".to_string(),

src/process/memory.rs

@@ -5,35 +5,35 @@ use std::{ffi::c_void, ptr};
 use windows::Win32::System::Diagnostics::Debug::{ReadProcessMemory, WriteProcessMemory};
 
 pub fn read<T>(handle: &Handle, address: usize, value: &mut T) -> Result<(), crate::Error> {
-    unsafe {
+    match unsafe {
-        match ReadProcessMemory(
+        ReadProcessMemory(
             handle.0,
             address as *const c_void,
             (ptr::from_mut::<T>(value)).cast::<c_void>(),
             size_of::<T>(),
             None,
-        ) {
+        )
+    } {
         Ok(()) => Ok(()),
         Err(why) => Err(crate::Error::AccessMemoryError(format!(
             "failed to read memory: {why}"
         ))),
     }
-    }
 }
 
 pub fn write<T>(handle: &Handle, address: usize, value: &mut T) -> Result<(), crate::Error> {
-    unsafe {
+    match unsafe {
-        match WriteProcessMemory(
+        WriteProcessMemory(
             handle.0,
             address as *const c_void,
             (ptr::from_mut::<T>(value)).cast::<c_void>(),
             size_of::<T>(),
             None,
-        ) {
+        )
+    } {
         Ok(()) => Ok(()),
         Err(why) => Err(crate::Error::AccessMemoryError(format!(
             "failed to write memory: {why}"
         ))),
     }
-    }
 }

src/process/snapshot.rs

@@ -13,22 +13,19 @@ pub struct ProcessSnapshot {
 
 impl ProcessSnapshot {
     pub fn get_processes() -> Result<Vec<Self>, crate::Error> {
-        let snapshot = unsafe {
+        let snapshot = match unsafe { CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0) } {
-            match CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0) {
             Ok(snapshot) => snapshot,
             Err(why) => {
                 return Err(crate::Error::CreateSnapshotError(format!(
                     "failed to create process snapshot: {why}"
                 )))
             }
-            }
         };
         let mut process_entry_32_w = PROCESSENTRY32W {
             dwSize: u32::try_from(size_of::<PROCESSENTRY32W>())?,
             ..Default::default()
         };
-        unsafe {
+        match unsafe { Process32FirstW(snapshot, &mut process_entry_32_w) } {
-            match Process32FirstW(snapshot, &mut process_entry_32_w) {
             Ok(()) => {}
             Err(why) => {
                 return Err(crate::Error::CreateSnapshotError(format!(
@@ -36,7 +33,6 @@ impl ProcessSnapshot {
                 )))
             }
         };
-        }
         let mut processes = Vec::new();
         loop {
             let name = String::from_utf16_lossy(&process_entry_32_w.szExeFile)
@@ -47,12 +43,10 @@ impl ProcessSnapshot {
                 name,
             };
             processes.push(process);
-            unsafe {
+            if unsafe { Process32NextW(snapshot, &mut process_entry_32_w) }.is_err() {
-                if Process32NextW(snapshot, &mut process_entry_32_w).is_err() {
                 break;
             };
         }
-        }
         Ok(processes)
     }
 }
@@ -67,22 +61,21 @@ pub struct ModuleSnapshot {
 
 impl ModuleSnapshot {
     pub fn get_modules(pid: u32) -> Result<Vec<Self>, crate::Error> {
-        let snapshot = unsafe {
+        let snapshot =
-            match CreateToolhelp32Snapshot(TH32CS_SNAPMODULE | TH32CS_SNAPMODULE32, pid) {
+            match unsafe { CreateToolhelp32Snapshot(TH32CS_SNAPMODULE | TH32CS_SNAPMODULE32, pid) }
+            {
                 Ok(snapshot) => snapshot,
                 Err(why) => {
                     return Err(crate::Error::CreateSnapshotError(format!(
                         "failed to create module snapshot: {why}"
                     )))
                 }
-            }
             };
         let mut module_entry_32_w = MODULEENTRY32W {
             dwSize: u32::try_from(size_of::<MODULEENTRY32W>())?,
             ..Default::default()
         };
-        unsafe {
+        match unsafe { Module32FirstW(snapshot, &mut module_entry_32_w) } {
-            match Module32FirstW(snapshot, &mut module_entry_32_w) {
             Ok(()) => {}
             Err(why) => {
                 return Err(crate::Error::CreateSnapshotError(format!(
@@ -90,7 +83,6 @@ impl ModuleSnapshot {
                 )))
             }
         }
-        }
         let mut modules = Vec::new();
         loop {
             let name = String::from_utf16_lossy(&module_entry_32_w.szModule)
@@ -106,12 +98,10 @@ impl ModuleSnapshot {
                 base_size: module_entry_32_w.modBaseSize as usize,
             };
             modules.push(module);
-            unsafe {
+            if unsafe { Module32NextW(snapshot, &mut module_entry_32_w).is_err() } {
-                if Module32NextW(snapshot, &mut module_entry_32_w).is_err() {
                 break;
             }
         }
-        }
         Ok(modules)
     }
 }