fixup

Author: Frando

netwatch/src/interfaces/windows.rs

@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use n0_error::{StdResultExt, e, stack_error};
+use n0_error::{e, stack_error};
 use serde::Deserialize;
 use tracing::warn;
 use wmi::{COMLibrary, FilterValue, WMIConnection};
@@ -14,15 +14,12 @@ struct Win32_IP4RouteTable {
     Name: String,
 }
 
-#[stack_error(derive, add_meta)]
+#[stack_error(derive, add_meta, std_sources)]
 #[non_exhaustive]
 pub enum Error {
     #[allow(dead_code)] // not sure why we have this here?
     #[error(transparent)]
-    Io {
-        #[error(std_err)]
-        source: std::io::Error,
-    },
+    Io { source: std::io::Error },
     #[error("not route found")]
     NoRoute {},
     #[error("WMI")]

netwatch/src/netmon/android.rs

@@ -2,12 +2,9 @@ use tokio::sync::mpsc;
 
 use super::actor::NetworkMessage;
 
-#[derive(Debug, derive_more::Display)]
-#[display("error")]
+#[derive(n0_error::Error)]
 pub struct Error;
 
-impl std::error::Error for Error {}
-
 #[derive(Debug)]
 pub(super) struct RouteMonitor {
     _sender: mpsc::Sender<NetworkMessage>,

netwatch/src/netmon/windows.rs

@@ -19,14 +19,11 @@ pub(super) struct RouteMonitor {
     cb_handler: CallbackHandler,
 }
 
-#[stack_error(derive, add_meta)]
+#[stack_error(derive, add_meta, std_sources)]
 #[non_exhaustive]
 pub enum Error {
     #[error(transparent)]
-    Io {
-        #[error(std_err)]
-        source: std::io::Error,
-    },
+    Io { source: std::io::Error },
     #[error("win32")]
     Win32 { source: windows_result::Error },
 }