Move talpid-windows-net into talpid-windows

4 files changed, 10 insertions, 12 deletions

diff --git a/talpid-routing/src/windows/default_route_monitor.rs b/talpid-routing/src/windows/default_route_monitor.rs
index 0f7d64e3a8..4e452ef319 100644
--- a/talpid-routing/src/windows/default_route_monitor.rs
+++ b/talpid-routing/src/windows/default_route_monitor.rs
@@ -22,7 +22,7 @@ use windows_sys::Win32::{
     },
 };
 
-use talpid_windows_net::AddressFamily;
+use talpid_windows::net::AddressFamily;
 
 const WIN_FALSE: BOOLEAN = 0;
 
diff --git a/talpid-routing/src/windows/get_best_default_route.rs b/talpid-routing/src/windows/get_best_default_route.rs
index 4a1f254a79..f513130348 100644
--- a/talpid-routing/src/windows/get_best_default_route.rs
+++ b/talpid-routing/src/windows/get_best_default_route.rs
@@ -1,7 +1,7 @@
 use super::{Error, Result};
 use std::{net::SocketAddr, slice};
 use talpid_types::win32_err;
-use talpid_windows_net::{
+use talpid_windows::net::{
     get_ip_interface_entry, try_socketaddr_from_inet_sockaddr, AddressFamily,
 };
 use widestring::{widecstr, WideCStr};
diff --git a/talpid-routing/src/windows/mod.rs b/talpid-routing/src/windows/mod.rs
index 51ac345f82..7924d4c7ab 100644
--- a/talpid-routing/src/windows/mod.rs
+++ b/talpid-routing/src/windows/mod.rs
@@ -12,7 +12,7 @@ use net::AddressFamily;
 pub use route_manager::{Callback, CallbackHandle, Route, RouteManagerInternal};
 use std::{collections::HashSet, io, net::IpAddr};
 use talpid_types::ErrorExt;
-use talpid_windows_net as net;
+use talpid_windows::net;
 
 mod default_route_monitor;
 mod get_best_default_route;
@@ -284,12 +284,10 @@ fn get_mtu_for_route(addr_family: AddressFamily) -> Result<Option<u16>> {
     match get_best_default_route(addr_family) {
         Ok(Some(route)) => {
             let interface_row =
-                talpid_windows_net::get_ip_interface_entry(addr_family, &route.iface).map_err(
-                    |e| {
-                        log::error!("Could not get ip interface entry: {}", e);
-                        Error::GetMtu
-                    },
-                )?;
+                net::get_ip_interface_entry(addr_family, &route.iface).map_err(|e| {
+                    log::error!("Could not get ip interface entry: {}", e);
+                    Error::GetMtu
+                })?;
             let mtu = interface_row.NlMtu;
             let mtu = u16::try_from(mtu).map_err(|_| Error::GetMtu)?;
             Ok(Some(mtu))
diff --git a/talpid-routing/src/windows/route_manager.rs b/talpid-routing/src/windows/route_manager.rs
index 277832eaa9..a122a29003 100644
--- a/talpid-routing/src/windows/route_manager.rs
+++ b/talpid-routing/src/windows/route_manager.rs
@@ -11,7 +11,7 @@ use std::{
     sync::{Arc, Mutex},
 };
 use talpid_types::win32_err;
-use talpid_windows_net::{
+use talpid_windows::net::{
     inet_sockaddr_from_socketaddr, try_socketaddr_from_inet_sockaddr, AddressFamily,
 };
 use widestring::{WideCStr, WideCString};
@@ -824,7 +824,7 @@ impl<'a> Iterator for AdaptersIterator<'a> {
 pub fn win_ip_address_prefix_from_ipnetwork_port_zero(from: IpNetwork) -> IP_ADDRESS_PREFIX {
     // Port should not matter so we set it to 0
     let prefix =
-        talpid_windows_net::inet_sockaddr_from_socketaddr(std::net::SocketAddr::new(from.ip(), 0));
+        talpid_windows::net::inet_sockaddr_from_socketaddr(std::net::SocketAddr::new(from.ip(), 0));
     IP_ADDRESS_PREFIX {
         Prefix: prefix,
         PrefixLength: from.prefix(),
@@ -834,7 +834,7 @@ pub fn win_ip_address_prefix_from_ipnetwork_port_zero(from: IpNetwork) -> IP_ADD
 /// Convert to a windows defined `SOCKADDR_INET` from a `IpAddr` but set the port to 0
 pub fn inet_sockaddr_from_ipaddr(from: IpAddr) -> SOCKADDR_INET {
     // Port should not matter so we set it to 0
-    talpid_windows_net::inet_sockaddr_from_socketaddr(std::net::SocketAddr::new(from, 0))
+    talpid_windows::net::inet_sockaddr_from_socketaddr(std::net::SocketAddr::new(from, 0))
 }
 
 /// Convert to a `AddressFamily` from a `ipnetwork::IpNetwork`