some more work

Author: Narfinger

src/error.rs

@@ -11,11 +11,6 @@ use thiserror::Error;
         target_os = "illumos",
     )
 ))]
-pub use crate::platform::UnixError;
-
-#[cfg(target_os = "macos")]
-pub use crate::platform::MachError;
-
 #[derive(Debug, Error)]
 pub enum IpcError {
     #[error("Error in decoding or encoding")]
@@ -24,21 +19,6 @@ pub enum IpcError {
     Io(#[from] io::Error),
     #[error("Ipc Disconnected")]
     Disconnected,
-    #[error("Platform Error")]
-    #[cfg(all(
-        not(feature = "force-inprocess"),
-        any(
-            target_os = "linux",
-            target_os = "openbsd",
-            target_os = "freebsd",
-            target_os = "illumos",
-        )
-    ))]
-    PlatformError(UnixError),
-    #[cfg(all(not(feature = "force-inprocess"), target_os = "windows"))]
-    PlatformError(#[from] windows::core::Error),
-    #[cfg(target_os = "macos")]
-    PlatformError(#[from] crate::platform::macos::MachError),
 }
 
 #[derive(Debug, Error)]

src/platform/inprocess/mod.rs

@@ -387,11 +387,15 @@ impl OsIpcSharedMemory {
     }
 }
 
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Error)]
 pub enum ChannelError {
+    #[error("Channel Closed")]
     ChannelClosedError,
+    #[error("Broken Pipe")]
     BrokenPipeError,
+    #[error("Channel Empty")]
     ChannelEmpty,
+    #[error("Unknown Error")]
     UnknownError,
 }
 
@@ -402,30 +406,11 @@ impl ChannelError {
     }
 }
 
-impl fmt::Display for ChannelError {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        match *self {
-            ChannelError::ChannelClosedError => write!(fmt, "channel closed"),
-            ChannelError::BrokenPipeError => write!(fmt, "broken pipe"),
-            ChannelError::ChannelEmpty => write!(fmt, "channel empty"),
-            ChannelError::UnknownError => write!(fmt, "unknown error"),
-        }
-    }
-}
-
-impl StdError for ChannelError {}
-
-impl From<ChannelError> for bincode::Error {
-    fn from(crossbeam_error: ChannelError) -> Self {
-        io::Error::from(crossbeam_error).into()
-    }
-}
-
 impl From<ChannelError> for ipc::IpcError {
     fn from(error: ChannelError) -> Self {
         match error {
             ChannelError::ChannelClosedError => ipc::IpcError::Disconnected,
-            e => ipc::IpcError::Bincode(io::Error::from(e).into()),
+            e => ipc::IpcError::Io(io::Error::from(e).into()),
         }
     }
 }
@@ -437,7 +422,7 @@ impl From<ChannelError> for ipc::TryRecvError {
                 ipc::TryRecvError::IpcError(ipc::IpcError::Disconnected)
             },
             ChannelError::ChannelEmpty => ipc::TryRecvError::Empty,
-            e => ipc::TryRecvError::IpcError(ipc::IpcError::Bincode(io::Error::from(e).into())),
+            e => ipc::TryRecvError::IpcError(ipc::IpcError::Io(io::Error::from(e).into())),
         }
     }
 }

src/platform/mod.rs

@@ -67,18 +67,5 @@ pub use self::os::{channel, OsOpaqueIpcChannel};
 pub use self::os::{OsIpcChannel, OsIpcOneShotServer, OsIpcReceiver, OsIpcReceiverSet};
 pub use self::os::{OsIpcSelectionResult, OsIpcSender, OsIpcSharedMemory};
 
-#[cfg(all(not(feature = "force-inprocess"), target_os = "macos"))]
-pub use macos::MachError;
-#[cfg(all(
-    not(feature = "force-inprocess"),
-    any(
-        target_os = "linux",
-        target_os = "openbsd",
-        target_os = "freebsd",
-        target_os = "illumos",
-    )
-))]
-pub use unix::UnixError;
-
 #[cfg(test)]
 mod test;

src/platform/windows/mod.rs

@@ -1967,12 +1967,6 @@ impl WinIpcError {
     }
 }
 
-impl From<WinError> for WinIpcError {
-    fn from(e: WinError) -> Self {
-        Self::WinError(e)
-    }
-}
-
 impl From<WinIpcError> for ipc::IpcError {
     fn from(error: WinIpcError) -> Self {
         match error {