more fixes

Author: dignifiedquire

Cargo.lock

@@ -58,6 +58,7 @@ rtnetlink = "=0.13.1" # pinned because of https://github.com/rust-netlink/rtnetl
 [target.'cfg(target_os = "windows")'.dependencies]
 wmi = "0.14"
 windows = { version = "0.58", features = ["Win32_NetworkManagement_IpHelper", "Win32_Foundation", "Win32_NetworkManagement_Ndis", "Win32_Networking_WinSock"] }
+windows-result = "0.3"
 serde = { version = "1", features = ["derive"] }
 derive_more = { version = "1.0.0", features = ["debug"] }
 

netwatch/Cargo.toml

@@ -95,7 +95,7 @@ pub async fn default_route_android_ip_route() -> Result<Option<DefaultRouteDetai
         .kill_on_drop(true)
         .output()
         .await?;
-    let stdout = std::str::from_utf8(&output.stdout)?;
+    let stdout = std::string::String::from_utf8_lossy(&output.stdout);
     let details = parse_android_ip_route(&stdout).map(|iface| DefaultRouteDetails {
         interface_name: iface.to_string(),
     });
@@ -186,7 +186,7 @@ async fn iface_by_index(handle: &rtnetlink::Handle, index: u32) -> Result<String
     use netlink_packet_route::link::LinkAttribute;
 
     let mut links = handle.link().get().match_index(index).execute();
-    let msg = links.try_next().await?.ok_or_else(|| Error::NoResponse)?;
+    let msg = links.try_next().await?.ok_or(Error::NoResponse)?;
 
     for nla in msg.attributes {
         if let LinkAttribute::IfName(name) = nla {

netwatch/src/interfaces/linux.rs

@@ -4,7 +4,7 @@ use libc::c_void;
 use tokio::sync::mpsc;
 use tracing::{trace, warn};
 use windows::Win32::{
-    Foundation::{BOOLEAN, HANDLE as Handle, WIN32_ERROR},
+    Foundation::{BOOLEAN, HANDLE as Handle},
     NetworkManagement::IpHelper::{
         MIB_IPFORWARD_ROW2, MIB_NOTIFICATION_TYPE, MIB_UNICASTIPADDRESS_ROW,
     },
@@ -23,7 +23,7 @@ pub enum Error {
     #[error("IO {0}")]
     Io(#[from] std::io::Error),
     #[error("win32: {0}")]
-    Win32(#[from] windows::Win32::Foundation::Error),
+    Win32(#[from] windows_result::Error),
 }
 
 impl RouteMonitor {