diff --git a/talpid-wireguard/build.rs b/talpid-wireguard/build.rs index 23c2f3bb67b2..deba05655e87 100644 --- a/talpid-wireguard/build.rs +++ b/talpid-wireguard/build.rs @@ -6,9 +6,6 @@ fn main() { if target_os == "windows" { declare_libs_dir("../dist-assets/binaries"); } - // Wireguard-Go can be used on all platforms - println!("cargo::rustc-check-cfg=cfg(wireguard_go)"); - println!("cargo::rustc-cfg=wireguard_go"); // Enable DAITA by default on desktop and android println!("cargo::rustc-check-cfg=cfg(daita)"); diff --git a/talpid-wireguard/src/lib.rs b/talpid-wireguard/src/lib.rs index 6dfe19000408..89823be3a97f 100644 --- a/talpid-wireguard/src/lib.rs +++ b/talpid-wireguard/src/lib.rs @@ -42,7 +42,6 @@ mod ephemeral; mod logging; mod obfuscation; mod stats; -#[cfg(wireguard_go)] mod wireguard_go; #[cfg(target_os = "linux")] pub(crate) mod wireguard_kernel; @@ -52,7 +51,6 @@ mod wireguard_nt; #[cfg(not(target_os = "android"))] mod mtu_detection; -#[cfg(wireguard_go)] use self::wireguard_go::WgGoTunnel; // On android we only have Wireguard Go tunnel @@ -668,8 +666,7 @@ impl WireguardMonitor { ) -> Result { log::debug!("Tunnel MTU: {}", config.mtu); - let userspace_wireguard = - cfg!(wireguard_go) && (*FORCE_USERSPACE_WIREGUARD || config.daita); + let userspace_wireguard = *FORCE_USERSPACE_WIREGUARD || config.daita; if userspace_wireguard { log::debug!("Using userspace WireGuard implementation"); @@ -752,7 +749,6 @@ impl WireguardMonitor { } /// Configure and start a Wireguard-go tunnel. - #[cfg(wireguard_go)] fn open_wireguard_go_tunnel( #[cfg(windows)] runtime: tokio::runtime::Handle, config: &Config, diff --git a/talpid-wireguard/src/logging.rs b/talpid-wireguard/src/logging.rs index dcb33b11e303..946d614f0172 100644 --- a/talpid-wireguard/src/logging.rs +++ b/talpid-wireguard/src/logging.rs @@ -47,9 +47,7 @@ pub fn clean_up_logging(ordinal: u64) { pub enum LogLevel { #[cfg_attr(windows, allow(dead_code))] Verbose, - #[cfg_attr(wireguard_go, allow(dead_code))] Info, - #[cfg_attr(wireguard_go, allow(dead_code))] Warning, Error, }