From 84ada5576ff9167328257542ed8c23454f6309d5 Mon Sep 17 00:00:00 2001 From: futile Date: Tue, 31 Dec 2024 08:42:28 +0000 Subject: [PATCH] make Error enum variants clearer --- src/error.rs | 8 ++++---- src/process/handle.rs | 4 ++-- src/process/memory.rs | 4 ++-- src/process/process.rs | 4 ++-- src/process/snapshot.rs | 8 ++++---- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/error.rs b/src/error.rs index 21b8261..0c5816f 100644 --- a/src/error.rs +++ b/src/error.rs @@ -3,13 +3,13 @@ use thiserror::Error; #[derive(Debug, Error)] pub enum Error { #[error("failed to obtain handle")] - HandleError(String), + ObtainHandleError(String), #[error("failed to access process memory")] - MemoryError(String), + AccessMemoryError(String), #[error("failed to create process")] - ProcessError(String), + CreateProcessError(String), #[error("failed to create snapshot")] - SnapshotError(String), + CreateSnapshotError(String), #[error("failed to convert integer")] ConvertIntegerError(#[from] std::num::TryFromIntError), } diff --git a/src/process/handle.rs b/src/process/handle.rs index 064b62f..aa6bc9c 100644 --- a/src/process/handle.rs +++ b/src/process/handle.rs @@ -35,13 +35,13 @@ impl Handle { OpenProcess(PROCESS_ALL_ACCESS, false, pid) .or_else(|_| OpenProcess(PROCESS_VM_READ | PROCESS_VM_WRITE, false, pid)) .map_err(|why| { - crate::Error::HandleError(format!( + crate::Error::ObtainHandleError(format!( "failed to open process with needed access: {why}", )) })? }; if handle == INVALID_HANDLE_VALUE { - return Err(crate::Error::HandleError( + return Err(crate::Error::ObtainHandleError( "failed to get a valid handle".to_string(), )); } diff --git a/src/process/memory.rs b/src/process/memory.rs index 6c77ae4..2657857 100644 --- a/src/process/memory.rs +++ b/src/process/memory.rs @@ -14,7 +14,7 @@ pub fn read(handle: &Handle, address: usize, value: &mut T) -> Result<(), cra None, ) { Ok(()) => Ok(()), - Err(why) => Err(crate::Error::MemoryError(format!( + Err(why) => Err(crate::Error::AccessMemoryError(format!( "failed to read memory: {why}" ))), } @@ -31,7 +31,7 @@ pub fn write(handle: &Handle, address: usize, value: &mut T) -> Result<(), cr None, ) { Ok(()) => Ok(()), - Err(why) => Err(crate::Error::MemoryError(format!( + Err(why) => Err(crate::Error::AccessMemoryError(format!( "failed to write memory: {why}" ))), } diff --git a/src/process/process.rs b/src/process/process.rs index dda229e..3c52f4d 100644 --- a/src/process/process.rs +++ b/src/process/process.rs @@ -42,7 +42,7 @@ impl Process { .into_iter() .find(|snapshot| snapshot.name == *name), }) else { - return Err(crate::Error::ProcessError(format!( + return Err(crate::Error::CreateProcessError(format!( "failed to find a process with identifier `{identifier}`", ))); }; @@ -61,7 +61,7 @@ impl Process { .into_iter() .find(|snapshot| snapshot.name == name) else { - return Err(crate::Error::ProcessError(format!( + return Err(crate::Error::CreateProcessError(format!( "failed to find a module with identifier `{name}`", ))); }; diff --git a/src/process/snapshot.rs b/src/process/snapshot.rs index a1443f7..f44c7fb 100644 --- a/src/process/snapshot.rs +++ b/src/process/snapshot.rs @@ -17,7 +17,7 @@ impl ProcessSnapshot { match CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0) { Ok(snapshot) => snapshot, Err(why) => { - return Err(crate::Error::SnapshotError(format!( + return Err(crate::Error::CreateSnapshotError(format!( "failed to create process snapshot: {why}" ))) } @@ -31,7 +31,7 @@ impl ProcessSnapshot { match Process32FirstW(snapshot, &mut process_entry_32_w) { Ok(()) => {} Err(why) => { - return Err(crate::Error::SnapshotError(format!( + return Err(crate::Error::CreateSnapshotError(format!( "failed to get first process from snapshot: {why}" ))) } @@ -71,7 +71,7 @@ impl ModuleSnapshot { match CreateToolhelp32Snapshot(TH32CS_SNAPMODULE | TH32CS_SNAPMODULE32, pid) { Ok(snapshot) => snapshot, Err(why) => { - return Err(crate::Error::SnapshotError(format!( + return Err(crate::Error::CreateSnapshotError(format!( "failed to create module snapshot: {why}" ))) } @@ -85,7 +85,7 @@ impl ModuleSnapshot { match Module32FirstW(snapshot, &mut module_entry_32_w) { Ok(()) => {} Err(why) => { - return Err(crate::Error::SnapshotError(format!( + return Err(crate::Error::CreateSnapshotError(format!( "failed to get first module from snapshot: {why}" ))) }