Move talpid-core DNS code out to own module

12 files changed, 17 insertions, 14 deletions

diff --git a/talpid-core/src/security/linux/dns/mod.rs b/talpid-core/src/dns/linux/mod.rs
index 74267e2c19..74267e2c19 100644
--- a/talpid-core/src/security/linux/dns/mod.rs
+++ b/talpid-core/src/dns/linux/mod.rs
diff --git a/talpid-core/src/security/linux/dns/network_manager.rs b/talpid-core/src/dns/linux/network_manager.rs
index 73d49eb1a8..73d49eb1a8 100644
--- a/talpid-core/src/security/linux/dns/network_manager.rs
+++ b/talpid-core/src/dns/linux/network_manager.rs
diff --git a/talpid-core/src/security/linux/dns/resolvconf.rs b/talpid-core/src/dns/linux/resolvconf.rs
index 32b8fcd6b9..32b8fcd6b9 100644
--- a/talpid-core/src/security/linux/dns/resolvconf.rs
+++ b/talpid-core/src/dns/linux/resolvconf.rs
diff --git a/talpid-core/src/security/linux/dns/static_resolv_conf.rs b/talpid-core/src/dns/linux/static_resolv_conf.rs
index cea1b1ac2f..cea1b1ac2f 100644
--- a/talpid-core/src/security/linux/dns/static_resolv_conf.rs
+++ b/talpid-core/src/dns/linux/static_resolv_conf.rs
diff --git a/talpid-core/src/security/linux/dns/systemd_resolved.rs b/talpid-core/src/dns/linux/systemd_resolved.rs
index f4eac9e486..f4eac9e486 100644
--- a/talpid-core/src/security/linux/dns/systemd_resolved.rs
+++ b/talpid-core/src/dns/linux/systemd_resolved.rs
diff --git a/talpid-core/src/security/macos/dns.rs b/talpid-core/src/dns/macos.rs
index a1fad021de..a1fad021de 100644
--- a/talpid-core/src/security/macos/dns.rs
+++ b/talpid-core/src/dns/macos.rs
diff --git a/talpid-core/src/dns/mod.rs b/talpid-core/src/dns/mod.rs
new file mode 100644
index 0000000000..a997abd665
--- /dev/null
+++ b/talpid-core/src/dns/mod.rs
@@ -0,0 +1,15 @@
+#[cfg(target_os = "macos")]
+#[path = "macos.rs"]
+mod imp;
+
+#[cfg(target_os = "linux")]
+#[path = "linux/mod.rs"]
+mod imp;
+
+#[cfg(windows)]
+#[path = "windows.rs"]
+mod imp;
+
+pub use self::imp::{DnsError, Error};
+
+pub use self::imp::{DnsMonitor, Error as DnsError};
\ No newline at end of file
diff --git a/talpid-core/src/security/windows/dns.rs b/talpid-core/src/dns/windows.rs
index 6c04c03e57..6c04c03e57 100644
--- a/talpid-core/src/security/windows/dns.rs
+++ b/talpid-core/src/dns/windows.rs
diff --git a/talpid-core/src/security/linux/mod.rs b/talpid-core/src/security/linux.rs
index 76bfef07ac..464ed515f1 100644
--- a/talpid-core/src/security/linux/mod.rs
+++ b/talpid-core/src/security/linux.rs
@@ -16,10 +16,6 @@ use std::{
 };
 use talpid_types::net::{Endpoint, TransportProtocol};
 
-
-mod dns;
-pub use self::dns::{DnsMonitor, Error as DnsError};
-
 error_chain! {
     errors {
         /// Unable to open netlink socket to netfilter
diff --git a/talpid-core/src/security/macos/mod.rs b/talpid-core/src/security/macos.rs
index cc14fbfd6e..4e6f5e2325 100644
--- a/talpid-core/src/security/macos/mod.rs
+++ b/talpid-core/src/security/macos.rs
@@ -6,9 +6,6 @@ use std::{
 };
 use talpid_types::net;
 
-mod dns;
-pub use self::dns::{DnsMonitor, Error as DnsError};
-
 pub use pfctl::Error;
 
 type Result<T> = ::std::result::Result<T, Error>;
diff --git a/talpid-core/src/security/mod.rs b/talpid-core/src/security/mod.rs
index 892041b363..10ad9d8556 100644
--- a/talpid-core/src/security/mod.rs
+++ b/talpid-core/src/security/mod.rs
@@ -9,19 +9,17 @@ use talpid_types::net::Endpoint;
 
 
 #[cfg(target_os = "macos")]
-#[path = "macos/mod.rs"]
+#[path = "macos.rs"]
 mod imp;
 
 #[cfg(target_os = "linux")]
-#[path = "linux/mod.rs"]
+#[path = "linux.rs"]
 mod imp;
 
 #[cfg(windows)]
 #[path = "windows/mod.rs"]
 mod imp;
 
-pub use self::imp::{DnsError, Error};
-
 
 #[cfg(unix)]
 lazy_static! {
diff --git a/talpid-core/src/security/windows/mod.rs b/talpid-core/src/security/windows/mod.rs
index 1a021d593a..afe8dbc472 100644
--- a/talpid-core/src/security/windows/mod.rs
+++ b/talpid-core/src/security/windows/mod.rs
@@ -10,9 +10,6 @@ use widestring::WideCString;
 #[macro_use]
 mod ffi;
 
-mod dns;
-pub use self::dns::{DnsMonitor, Error as DnsError};
-
 mod system_state;
 
 error_chain! {