diff options
| author | David Lönnhager <david.l@mullvad.net> | 2020-06-02 13:11:36 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2020-06-04 14:48:25 +0200 |
| commit | 1551534cdb1cada7579a1f2e281f2d9927474455 (patch) | |
| tree | 99e286364d34d8d4f26f838bfe09b2f7c39e8bd4 | |
| parent | 76a75a268abb1ac8daeffd39087c96cc6fe688c0 (diff) | |
| download | mullvadvpn-1551534cdb1cada7579a1f2e281f2d9927474455.tar.xz mullvadvpn-1551534cdb1cada7579a1f2e281f2d9927474455.zip | |
Fix names conflicting with split_tunnel modules on Windows
| -rw-r--r-- | mullvad-cli/src/cmds/split_tunnel/linux.rs (renamed from mullvad-cli/src/cmds/split_tunnel.rs) | 0 | ||||
| -rw-r--r-- | mullvad-cli/src/cmds/split_tunnel/mod.rs | 6 | ||||
| -rw-r--r-- | talpid-core/src/split_tunnel/linux.rs (renamed from talpid-core/src/split_tunnel.rs) | 1 | ||||
| -rw-r--r-- | talpid-core/src/split_tunnel/mod.rs | 6 |
4 files changed, 12 insertions, 1 deletions
diff --git a/mullvad-cli/src/cmds/split_tunnel.rs b/mullvad-cli/src/cmds/split_tunnel/linux.rs index 95b172eb6b..95b172eb6b 100644 --- a/mullvad-cli/src/cmds/split_tunnel.rs +++ b/mullvad-cli/src/cmds/split_tunnel/linux.rs diff --git a/mullvad-cli/src/cmds/split_tunnel/mod.rs b/mullvad-cli/src/cmds/split_tunnel/mod.rs new file mode 100644 index 0000000000..c7c366d6ea --- /dev/null +++ b/mullvad-cli/src/cmds/split_tunnel/mod.rs @@ -0,0 +1,6 @@ +#[cfg(target_os = "linux")] +#[path = "linux.rs"] +mod imp; + +#[cfg(target_os = "linux")] +pub use imp::*; diff --git a/talpid-core/src/split_tunnel.rs b/talpid-core/src/split_tunnel/linux.rs index d9054ad4d8..1f54b1b405 100644 --- a/talpid-core/src/split_tunnel.rs +++ b/talpid-core/src/split_tunnel/linux.rs @@ -1,4 +1,3 @@ -#![cfg(target_os = "linux")] use std::{ fs, io::{self, BufRead, BufReader, BufWriter, Write}, diff --git a/talpid-core/src/split_tunnel/mod.rs b/talpid-core/src/split_tunnel/mod.rs new file mode 100644 index 0000000000..c7c366d6ea --- /dev/null +++ b/talpid-core/src/split_tunnel/mod.rs @@ -0,0 +1,6 @@ +#[cfg(target_os = "linux")] +#[path = "linux.rs"] +mod imp; + +#[cfg(target_os = "linux")] +pub use imp::*; |