Fix windows compile issues

talpid-core/src/tunnel/mod.rs

@@ -8,7 +8,7 @@ use talpid_openvpn;
 use talpid_routing::RouteManagerHandle;
 pub use talpid_tunnel::{TunnelArgs, TunnelEvent, TunnelMetadata};
 #[cfg(not(target_os = "android"))]
-use talpid_types::net::proxy;
+use talpid_types::net::openvpn as openvpn_types;
 use talpid_types::net::{wireguard as wireguard_types, TunnelParameters};
 
 /// A module for all WireGuard related tunnel management.
@@ -109,14 +109,14 @@ impl TunnelMonitor {
         resource_dir: &path::Path,
         params: &TunnelParameters,
     ) -> Option<path::PathBuf> {
+        use talpid_types::net::proxy::CustomProxy;
+
         let resource_dir = resource_dir.to_path_buf();
         match params {
             TunnelParameters::OpenVpn(params) => match &params.proxy {
-                Some(proxy::CustomProxy::Shadowsocks(_)) => Some(std::env::current_exe().unwrap()),
-                Some(proxy::CustomProxy::Socks5Local(_)) => None,
-                Some(proxy::CustomProxy::Socks5Remote(_)) | None => {
-                    Some(resource_dir.join("openvpn.exe"))
-                }
+                Some(CustomProxy::Shadowsocks(_)) => Some(std::env::current_exe().unwrap()),
+                Some(CustomProxy::Socks5Local(_)) => None,
+                Some(CustomProxy::Socks5Remote(_)) | None => Some(resource_dir.join("openvpn.exe")),
             },
             _ => Some(std::env::current_exe().unwrap()),
         }