Remove #[macro_use] from log crate

24 files changed, 70 insertions, 75 deletions

diff --git a/talpid-core/src/lib.rs b/talpid-core/src/lib.rs
index ed21df7fec..9747b2fa92 100644
--- a/talpid-core/src/lib.rs
+++ b/talpid-core/src/lib.rs
@@ -12,7 +12,6 @@
 
 extern crate atty;
 extern crate duct;
-#[macro_use]
 extern crate log;
 
 #[macro_use]
@@ -42,10 +41,6 @@ extern crate openvpn_plugin;
 extern crate talpid_ipc;
 extern crate talpid_types;
 
-#[cfg(target_os = "linux")]
-#[macro_use]
-extern crate nftnl;
-
 #[cfg(windows)]
 mod winnet;
 
diff --git a/talpid-core/src/logging.rs b/talpid-core/src/logging.rs
index 5b5d4ddfbe..4927262643 100644
--- a/talpid-core/src/logging.rs
+++ b/talpid-core/src/logging.rs
@@ -11,7 +11,7 @@ pub fn rotate_log(file: &Path) -> Result<()> {
     let backup = file.with_extension("old.log");
     if let Err(error) = fs::rename(file, backup) {
         if error.kind() != io::ErrorKind::NotFound {
-            warn!("Failed to rotate log file ({})", error);
+            log::warn!("Failed to rotate log file ({})", error);
         }
     }
 
diff --git a/talpid-core/src/mktemp.rs b/talpid-core/src/mktemp.rs
index 424fffe171..5e72044809 100644
--- a/talpid-core/src/mktemp.rs
+++ b/talpid-core/src/mktemp.rs
@@ -33,7 +33,7 @@ impl Drop for TempFile {
     fn drop(&mut self) {
         if let Err(e) = fs::remove_file(&self.path) {
             if e.kind() != io::ErrorKind::NotFound {
-                error!(
+                log::error!(
                     "Unable to remove temp file {}: {:?}",
                     self.path.display(),
                     e
diff --git a/talpid-core/src/process/openvpn.rs b/talpid-core/src/process/openvpn.rs
index e25e2bf652..761d4e6206 100644
--- a/talpid-core/src/process/openvpn.rs
+++ b/talpid-core/src/process/openvpn.rs
@@ -127,7 +127,7 @@ impl OpenVpnCommand {
 
     /// Build a runnable expression from the current state of the command.
     pub fn build(&self) -> duct::Expression {
-        debug!("Building expression: {}", &self);
+        log::debug!("Building expression: {}", &self);
         duct::cmd(&self.openvpn_bin, self.get_arguments()).unchecked()
     }
 
diff --git a/talpid-core/src/process/stoppable_process.rs b/talpid-core/src/process/stoppable_process.rs
index 84963ef0cd..bcbd71973d 100644
--- a/talpid-core/src/process/stoppable_process.rs
+++ b/talpid-core/src/process/stoppable_process.rs
@@ -1,3 +1,4 @@
+use log::{debug, trace, warn};
 use std::io;
 use std::thread;
 use std::time::{Duration, Instant};
diff --git a/talpid-core/src/security/linux/dns/mod.rs b/talpid-core/src/security/linux/dns/mod.rs
index 4013ec1cab..7c44208bb4 100644
--- a/talpid-core/src/security/linux/dns/mod.rs
+++ b/talpid-core/src/security/linux/dns/mod.rs
@@ -59,7 +59,7 @@ impl DnsSettings {
             Some("network-manager") => DnsSettings::NetworkManager(NetworkManager::new()?),
             Some(_) | None => Self::with_detected_dns_manager()?,
         };
-        debug!("Managing DNS via {}", manager);
+        log::debug!("Managing DNS via {}", manager);
         Ok(manager)
     }
 
diff --git a/talpid-core/src/security/linux/dns/network_manager.rs b/talpid-core/src/security/linux/dns/network_manager.rs
index 775ac283b3..bc87685399 100644
--- a/talpid-core/src/security/linux/dns/network_manager.rs
+++ b/talpid-core/src/security/linux/dns/network_manager.rs
@@ -72,7 +72,7 @@ impl NetworkManager {
 
         match management_mode {
             Err(e) => {
-                debug!("Failed to get NM management mode - {}", e.display_chain());
+                log::debug!("Failed to get NM management mode - {}", e.display_chain());
                 return Err(e);
             }
             Ok(management_mode) => {
@@ -85,7 +85,7 @@ impl NetworkManager {
         let expected_resolv_conf = "/var/run/NetworkManager/resolv.conf";
         let actual_resolv_conf = "/etc/resolv.conf";
         if !eq_file_content(&expected_resolv_conf, &actual_resolv_conf) {
-            debug!("/etc/resolv.conf differs from reference resolv.conf, therefore NM is not manaing DNS");
+            log::debug!("/etc/resolv.conf differs from reference resolv.conf, therefore NM is not manaing DNS");
             bail!(ErrorKind::NmNotManagingDns);
         }
 
@@ -159,14 +159,14 @@ fn eq_file_content<P: AsRef<Path>>(a: &P, b: &P) -> bool {
     let file_a = match File::open(a).map(BufReader::new) {
         Ok(file) => file,
         Err(e) => {
-            debug!("Failed top open file {}: {}", a.as_ref().display(), e);
+            log::debug!("Failed top open file {}: {}", a.as_ref().display(), e);
             return false;
         }
     };
     let file_b = match File::open(b).map(BufReader::new) {
         Ok(file) => file,
         Err(e) => {
-            debug!("Failed top open file {}: {}", b.as_ref().display(), e);
+            log::debug!("Failed top open file {}: {}", b.as_ref().display(), e);
             return false;
         }
     };
diff --git a/talpid-core/src/security/linux/dns/resolvconf.rs b/talpid-core/src/security/linux/dns/resolvconf.rs
index b8238fab0d..58ff878685 100644
--- a/talpid-core/src/security/linux/dns/resolvconf.rs
+++ b/talpid-core/src/security/linux/dns/resolvconf.rs
@@ -69,7 +69,7 @@ impl Resolvconf {
                 .chain_err(|| ErrorKind::RunResolvconf)?;
 
             if !output.status.success() {
-                error!(
+                log::error!(
                     "Failed to delete 'resolvconf' record '{}':\n{}",
                     record_name,
                     String::from_utf8_lossy(&output.stderr)
diff --git a/talpid-core/src/security/linux/dns/static_resolv_conf.rs b/talpid-core/src/security/linux/dns/static_resolv_conf.rs
index 06d3bf3134..37d20c49f1 100644
--- a/talpid-core/src/security/linux/dns/static_resolv_conf.rs
+++ b/talpid-core/src/security/linux/dns/static_resolv_conf.rs
@@ -4,11 +4,10 @@ use std::net::IpAddr;
 use std::sync::{mpsc, Arc, Mutex, MutexGuard};
 use std::{fs, io, thread};
 
-use error_chain::ChainedError;
-
 use self::notify::{RecommendedWatcher, RecursiveMode, Watcher};
 use super::resolv_conf::{Config, ScopedIp};
 use super::RESOLV_CONF_PATH;
+use error_chain::ChainedError;
 
 const RESOLV_CONF_BACKUP_PATH: &str = "/etc/resolv.conf.mullvadbackup";
 
@@ -137,7 +136,7 @@ impl DnsWatcher {
             if let Err(error) = Self::update(locked_state.as_mut()) {
                 let chained_error = error
                     .chain_err(|| "Failed to update DNS state after DNS settings have changed.");
-                error!("{}", chained_error.display_chain());
+                log::error!("{}", chained_error.display_chain());
             }
         }
     }
@@ -191,7 +190,7 @@ fn write_backup(backup: &Config) -> Result<()> {
 fn restore_from_backup() -> Result<()> {
     match fs::read_to_string(RESOLV_CONF_BACKUP_PATH) {
         Ok(backup) => {
-            info!("Restoring DNS state from backup");
+            log::info!("Restoring DNS state from backup");
             let config = Config::parse(&backup)
                 .chain_err(|| "Backup of /etc/resolv.conf could not be parsed")?;
 
@@ -201,7 +200,7 @@ fn restore_from_backup() -> Result<()> {
                 .chain_err(|| "Failed to remove stale backup of /etc/resolv.conf")
         }
         Err(ref error) if error.kind() == io::ErrorKind::NotFound => {
-            debug!("No DNS state backup to restore");
+            log::debug!("No DNS state backup to restore");
             Ok(())
         }
         Err(error) => Err(Error::with_chain(
diff --git a/talpid-core/src/security/linux/dns/systemd_resolved.rs b/talpid-core/src/security/linux/dns/systemd_resolved.rs
index af84de8a81..f4c00012b5 100644
--- a/talpid-core/src/security/linux/dns/systemd_resolved.rs
+++ b/talpid-core/src/security/linux/dns/systemd_resolved.rs
@@ -134,7 +134,7 @@ impl SystemdResolved {
     pub fn set_dns(&mut self, interface_name: &str, servers: &[IpAddr]) -> Result<()> {
         let link_object_path = self.fetch_link(interface_name)?;
         if let Err(e) = self.reset() {
-            debug!(
+            log::debug!(
                 "Failed to reset previous DNS settings - {}",
                 e.display_chain()
             );
@@ -192,7 +192,7 @@ impl SystemdResolved {
                     )
                 })?;
         } else {
-            trace!("No DNS settings to reset");
+            log::trace!("No DNS settings to reset");
         };
         Ok(())
     }
@@ -211,7 +211,7 @@ impl SystemdResolved {
                 .chain_err(|| ErrorKind::RevertDnsError),
             Err(error) => {
                 if error.name() == Some("org.freedesktop.DBus.Error.UnknownObject") {
-                    info!(
+                    log::info!(
                         "Not reseting DNS of interface {} because it no longer exists",
                         interface_name
                     );
diff --git a/talpid-core/src/security/linux/mod.rs b/talpid-core/src/security/linux/mod.rs
index f0b20f84de..83b0816988 100644
--- a/talpid-core/src/security/linux/mod.rs
+++ b/talpid-core/src/security/linux/mod.rs
@@ -1,23 +1,26 @@
 extern crate mnl;
+extern crate nftnl;
 
 use error_chain::ChainedError;
 
+use self::nftnl::{
+    expr::{self, Verdict},
+    nft_expr, nft_expr_bitwise, nft_expr_cmp, nft_expr_ct, nft_expr_meta, nft_expr_payload, Batch,
+    Chain, FinalizedBatch, ProtoFamily, Rule, Table,
+};
 use ipnetwork::IpNetwork;
 use lazy_static::lazy_static;
 use libc;
-use nftnl::{
-    self,
-    expr::{self, Verdict},
-    Batch, Chain, FinalizedBatch, ProtoFamily, Rule, Table,
-};
 use talpid_types::net::{Endpoint, TransportProtocol};
 use tunnel;
 
-use std::env;
-use std::ffi::CString;
-use std::io;
-use std::net::{IpAddr, Ipv4Addr};
-use std::path::Path;
+use std::{
+    env,
+    ffi::CString,
+    io,
+    net::{IpAddr, Ipv4Addr},
+    path::Path,
+};
 
 use super::{NetworkSecurityT, SecurityPolicy};
 
@@ -101,7 +104,7 @@ impl NetworkSecurityT for NetworkSecurity {
 
     fn reset_policy(&mut self) -> Result<()> {
         if let Err(error) = self.dns_settings.reset() {
-            error!("Failed to reset DNS settings: {}", error.display_chain());
+            log::error!("Failed to reset DNS settings: {}", error.display_chain());
         }
 
         let table = Table::new(&self.table_name, ProtoFamily::Inet)?;
@@ -114,7 +117,7 @@ impl NetworkSecurityT for NetworkSecurity {
             batch.finalize()?
         };
 
-        debug!("Removing table and chain from netfilter");
+        log::debug!("Removing table and chain from netfilter");
         self.send_and_process(&batch)
     }
 }
@@ -134,10 +137,10 @@ impl NetworkSecurity {
         while let Some(message) = Self::socket_recv(&socket, &mut buffer[..])? {
             match mnl::cb_run(message, 2, portid).chain_err(|| ErrorKind::ProcessNetlinkError)? {
                 mnl::CbResult::Stop => {
-                    trace!("cb_run STOP");
+                    log::trace!("cb_run STOP");
                     break;
                 }
-                mnl::CbResult::Ok => trace!("cb_run OK"),
+                mnl::CbResult::Ok => log::trace!("cb_run OK"),
             }
         }
 
@@ -146,7 +149,7 @@ impl NetworkSecurity {
 
     fn socket_recv<'a>(socket: &mnl::Socket, buf: &'a mut [u8]) -> Result<Option<&'a [u8]>> {
         let ret = socket.recv(buf).chain_err(|| ErrorKind::NetlinkRecvError)?;
-        trace!("Read {} bytes from netlink", ret);
+        log::trace!("Read {} bytes from netlink", ret);
         if ret > 0 {
             Ok(Some(&buf[..ret]))
         } else {
diff --git a/talpid-core/src/security/macos/dns.rs b/talpid-core/src/security/macos/dns.rs
index f75ab69e4f..391dbe7887 100644
--- a/talpid-core/src/security/macos/dns.rs
+++ b/talpid-core/src/security/macos/dns.rs
@@ -13,6 +13,7 @@ use self::system_configuration::{
     sys::schema_definitions::kSCPropNetDNSServerAddresses,
 };
 use error_chain::ChainedError;
+use log::{debug, trace};
 use std::{
     collections::HashMap,
     fmt,
@@ -108,7 +109,7 @@ impl DnsSettings {
             if let Some(string) = item.downcast::<CFString>() {
                 strings.push(string.to_string());
             } else {
-                error!("DNS server entry is not a string: {:?}", item);
+                log::error!("DNS server entry is not a string: {:?}", item);
                 return None;
             };
         }
@@ -148,7 +149,7 @@ impl DnsMonitor {
                 result_tx.send(Ok(())).unwrap();
                 run_dynamic_store_runloop(store);
                 // TODO(linus): This is critical. Improve later by sending error signal to Daemon
-                error!("Core Foundation main loop exited! It should run forever");
+                log::error!("Core Foundation main loop exited! It should run forever");
             }
             Err(e) => result_tx.send(Err(e)).unwrap(),
         });
@@ -257,7 +258,7 @@ fn dns_change_callback(
         }
         Some(ref mut state) => {
             if let Err(e) = dns_change_callback_internal(store, changed_keys, state) {
-                error!("{}", e.display_chain());
+                log::error!("{}", e.display_chain());
             }
         }
     }
diff --git a/talpid-core/src/security/mod.rs b/talpid-core/src/security/mod.rs
index 53198ade9e..a18ecc26da 100644
--- a/talpid-core/src/security/mod.rs
+++ b/talpid-core/src/security/mod.rs
@@ -119,14 +119,14 @@ impl NetworkSecurity {
     /// Applies and starts enforcing the given `SecurityPolicy` Makes sure it is being kept in place
     /// until this method is called again with another policy, or until `reset_policy` is called.
     pub fn apply_policy(&mut self, policy: SecurityPolicy) -> Result<(), Error> {
-        info!("Applying security policy: {}", policy);
+        log::info!("Applying security policy: {}", policy);
         self.inner.apply_policy(policy)
     }
 
     /// Resets/removes any currently enforced `SecurityPolicy`. Returns the system to the same state
     /// it had before any policy was applied through this `NetworkSecurity` instance.
     pub fn reset_policy(&mut self) -> Result<(), Error> {
-        info!("Resetting security policy");
+        log::info!("Resetting security policy");
         self.inner.reset_policy()
     }
 }
diff --git a/talpid-core/src/security/windows/dns.rs b/talpid-core/src/security/windows/dns.rs
index 6d0d034a09..276776661e 100644
--- a/talpid-core/src/security/windows/dns.rs
+++ b/talpid-core/src/security/windows/dns.rs
@@ -1,3 +1,4 @@
+use log::{debug, error, info, trace, warn};
 use std::borrow::Borrow;
 use std::net::IpAddr;
 use std::os::raw::{c_char, c_void};
diff --git a/talpid-core/src/security/windows/mod.rs b/talpid-core/src/security/windows/mod.rs
index 2dba99d724..75961aa69f 100644
--- a/talpid-core/src/security/windows/mod.rs
+++ b/talpid-core/src/security/windows/mod.rs
@@ -2,6 +2,7 @@ use std::net::IpAddr;
 use std::path::Path;
 use std::ptr;
 
+use log::{debug, error, trace};
 use talpid_types::net::Endpoint;
 use widestring::WideCString;
 
diff --git a/talpid-core/src/tunnel/mod.rs b/talpid-core/src/tunnel/mod.rs
index 791c83ce2d..3084341af5 100644
--- a/talpid-core/src/tunnel/mod.rs
+++ b/talpid-core/src/tunnel/mod.rs
@@ -1,7 +1,5 @@
 use mktemp;
-
 use openvpn_plugin::types::OpenVpnPluginEvent;
-
 use process::openvpn::OpenVpnCommand;
 
 use std::collections::HashMap;
@@ -182,7 +180,7 @@ impl TunnelMonitor {
             }
             match TunnelEvent::from_openvpn_event(event, &env) {
                 Some(tunnel_event) => on_event(tunnel_event),
-                None => debug!("Ignoring OpenVpnEvent {:?}", event),
+                None => log::debug!("Ignoring OpenVpnEvent {:?}", event),
             }
         };
 
@@ -247,7 +245,7 @@ impl TunnelMonitor {
     fn get_openvpn_bin(resource_dir: &Path) -> Result<PathBuf> {
         let path = resource_dir.join(OPENVPN_BIN_FILENAME);
         if path.exists() {
-            trace!("Using OpenVPN at {}", path.display());
+            log::trace!("Using OpenVPN at {}", path.display());
             Ok(path)
         } else {
             bail!(ErrorKind::OpenVpnNotFound(path));
@@ -257,7 +255,7 @@ impl TunnelMonitor {
     fn get_plugin_path(resource_dir: &Path) -> Result<PathBuf> {
         let path = resource_dir.join(OPENVPN_PLUGIN_FILENAME);
         if path.exists() {
-            trace!("Using OpenVPN plugin at {}", path.display());
+            log::trace!("Using OpenVPN plugin at {}", path.display());
             Ok(path)
         } else {
             bail!(ErrorKind::PluginNotFound(path));
@@ -275,7 +273,7 @@ impl TunnelMonitor {
 
     fn create_user_pass_file(username: &str) -> io::Result<mktemp::TempFile> {
         let temp_file = mktemp::TempFile::new();
-        debug!(
+        log::debug!(
             "Writing user-pass credentials to {}",
             temp_file.as_ref().display()
         );
@@ -343,10 +341,10 @@ fn is_ipv6_enabled_in_os() -> bool {
         let enabled_on_tap = ::winnet::get_tap_interface_ipv6_status().unwrap_or(false);
 
         if !globally_enabled {
-            debug!("IPv6 disabled in tunnel interfaces");
+            log::debug!("IPv6 disabled in tunnel interfaces");
         }
         if !enabled_on_tap {
-            debug!("IPv6 disabled in TAP adapter");
+            log::debug!("IPv6 disabled in TAP adapter");
         }
 
         globally_enabled && enabled_on_tap
diff --git a/talpid-core/src/tunnel/openvpn.rs b/talpid-core/src/tunnel/openvpn.rs
index d3956ad5db..5999dc781d 100644
--- a/talpid-core/src/tunnel/openvpn.rs
+++ b/talpid-core/src/tunnel/openvpn.rs
@@ -91,22 +91,22 @@ impl<C: OpenVpnBuilder> OpenVpnMonitor<C> {
         match self.wait_result() {
             WaitResult::Child(Ok(exit_status), closed) => {
                 if exit_status.success() || closed {
-                    debug!(
+                    log::debug!(
                         "OpenVPN exited, as expected, with exit status: {}",
                         exit_status
                     );
                     Ok(())
                 } else {
-                    error!("OpenVPN died unexpectedly with status: {}", exit_status);
+                    log::error!("OpenVPN died unexpectedly with status: {}", exit_status);
                     Err(ErrorKind::ChildProcessError("Died unexpectedly").into())
                 }
             }
             WaitResult::Child(Err(e), _) => {
-                error!("OpenVPN process wait error: {}", e);
+                log::error!("OpenVPN process wait error: {}", e);
                 Err(e).chain_err(|| ErrorKind::ChildProcessError("Error when waiting"))
             }
             WaitResult::EventDispatcher => {
-                error!("OpenVPN Event server exited unexpectedly");
+                log::error!("OpenVPN Event server exited unexpectedly");
                 Err(ErrorKind::EventDispatcherError.into())
             }
         }
@@ -258,7 +258,7 @@ mod event_server {
             event: OpenVpnPluginEvent,
             env: HashMap<String, String>,
         ) -> Result<(), Error> {
-            trace!("OpenVPN event {:?}", event);
+            log::trace!("OpenVPN event {:?}", event);
             (self.on_event)(event, env);
             Ok(())
         }
diff --git a/talpid-core/src/tunnel_state_machine/blocked_state.rs b/talpid-core/src/tunnel_state_machine/blocked_state.rs
index 8c73ccd0c5..d268ba1e4a 100644
--- a/talpid-core/src/tunnel_state_machine/blocked_state.rs
+++ b/talpid-core/src/tunnel_state_machine/blocked_state.rs
@@ -1,7 +1,6 @@
 use error_chain::ChainedError;
 use futures::sync::mpsc;
 use futures::Stream;
-
 use talpid_types::tunnel::BlockReason;
 
 use super::{
@@ -23,7 +22,7 @@ impl BlockedState {
             .apply_policy(policy)
             .chain_err(|| "Failed to apply security policy for blocked state")
         {
-            error!("{}", error.display_chain());
+            log::error!("{}", error.display_chain());
         }
     }
 }
diff --git a/talpid-core/src/tunnel_state_machine/connected_state.rs b/talpid-core/src/tunnel_state_machine/connected_state.rs
index d648b43ec4..c9004556c5 100644
--- a/talpid-core/src/tunnel_state_machine/connected_state.rs
+++ b/talpid-core/src/tunnel_state_machine/connected_state.rs
@@ -1,7 +1,6 @@
 use error_chain::ChainedError;
 use futures::sync::{mpsc, oneshot};
 use futures::{Async, Future, Stream};
-
 use talpid_types::tunnel::BlockReason;
 
 use super::{
@@ -66,7 +65,7 @@ impl ConnectedState {
                 match self.set_security_policy(shared_values) {
                     Ok(()) => SameState(self),
                     Err(error) => {
-                        error!("{}", error.display_chain());
+                        log::error!("{}", error.display_chain());
 
                         NewState(DisconnectingState::enter(
                             shared_values,
@@ -134,10 +133,10 @@ impl ConnectedState {
         match self.tunnel_close_event.poll() {
             Ok(Async::Ready(_)) => {}
             Ok(Async::NotReady) => return NoEvents(self),
-            Err(_cancelled) => warn!("Tunnel monitor thread has stopped unexpectedly"),
+            Err(_cancelled) => log::warn!("Tunnel monitor thread has stopped unexpectedly"),
         }
 
-        info!("Tunnel closed. Reconnecting.");
+        log::info!("Tunnel closed. Reconnecting.");
         NewState(ConnectingState::enter(shared_values, 0))
     }
 }
@@ -158,7 +157,7 @@ impl TunnelState for ConnectedState {
                 TunnelStateTransition::Connected(tunnel_endpoint),
             ),
             Err(error) => {
-                error!("{}", error.display_chain());
+                log::error!("{}", error.display_chain());
 
                 DisconnectingState::enter(
                     shared_values,
diff --git a/talpid-core/src/tunnel_state_machine/connecting_state.rs b/talpid-core/src/tunnel_state_machine/connecting_state.rs
index f86b34f1e0..cc30d88ac9 100644
--- a/talpid-core/src/tunnel_state_machine/connecting_state.rs
+++ b/talpid-core/src/tunnel_state_machine/connecting_state.rs
@@ -6,7 +6,7 @@ use std::time::{Duration, Instant};
 use error_chain::ChainedError;
 use futures::sync::{mpsc, oneshot};
 use futures::{Async, Future, Stream};
-
+use log::{debug, error, info, trace, warn};
 use talpid_types::net::{TunnelEndpoint, TunnelEndpointData};
 use talpid_types::tunnel::BlockReason;
 
diff --git a/talpid-core/src/tunnel_state_machine/disconnected_state.rs b/talpid-core/src/tunnel_state_machine/disconnected_state.rs
index 227e019323..b1819af3f0 100644
--- a/talpid-core/src/tunnel_state_machine/disconnected_state.rs
+++ b/talpid-core/src/tunnel_state_machine/disconnected_state.rs
@@ -1,11 +1,10 @@
-use error_chain::ChainedError;
-use futures::sync::mpsc;
-use futures::Stream;
-
 use super::{
     BlockedState, ConnectingState, Error, EventConsequence, SharedTunnelStateValues, TunnelCommand,
     TunnelState, TunnelStateTransition, TunnelStateWrapper,
 };
+use error_chain::ChainedError;
+use futures::sync::mpsc;
+use futures::Stream;
 
 /// No tunnel is running.
 pub struct DisconnectedState;
@@ -14,7 +13,7 @@ impl DisconnectedState {
     fn reset_security_policy(shared_values: &mut SharedTunnelStateValues) {
         if let Err(error) = shared_values.security.reset_policy() {
             let chained_error = Error::with_chain(error, "Failed to reset security policy");
-            error!("{}", chained_error.display_chain());
+            log::error!("{}", chained_error.display_chain());
         }
     }
 }
diff --git a/talpid-core/src/tunnel_state_machine/disconnecting_state.rs b/talpid-core/src/tunnel_state_machine/disconnecting_state.rs
index 864b11ab4b..2e09aab322 100644
--- a/talpid-core/src/tunnel_state_machine/disconnecting_state.rs
+++ b/talpid-core/src/tunnel_state_machine/disconnecting_state.rs
@@ -3,7 +3,6 @@ use std::thread;
 use error_chain::ChainedError;
 use futures::sync::{mpsc, oneshot};
 use futures::{Async, Future, Stream};
-
 use talpid_types::tunnel::{ActionAfterDisconnect, BlockReason};
 
 use super::{
@@ -101,7 +100,7 @@ impl TunnelState for DisconnectingState {
                 .chain_err(|| "Failed to close the tunnel");
 
             if let Err(error) = close_result {
-                error!("{}", error.display_chain());
+                log::error!("{}", error.display_chain());
             }
         });
 
diff --git a/talpid-core/src/tunnel_state_machine/mod.rs b/talpid-core/src/tunnel_state_machine/mod.rs
index 66e86de9de..6582eb0fbc 100644
--- a/talpid-core/src/tunnel_state_machine/mod.rs
+++ b/talpid-core/src/tunnel_state_machine/mod.rs
@@ -75,7 +75,7 @@ where
                 if let Err(error) = reactor.run(event_loop) {
                     let chained_error =
                         Error::with_chain(error, "Tunnel state machine exited with an error");
-                    error!("{}", chained_error.display_chain());
+                    log::error!("{}", chained_error.display_chain());
                 }
             }
             Err(startup_error) => {
diff --git a/talpid-core/src/winnet.rs b/talpid-core/src/winnet.rs
index ef3930649c..cde325e63e 100644
--- a/talpid-core/src/winnet.rs
+++ b/talpid-core/src/winnet.rs
@@ -23,9 +23,9 @@ pub type ErrorSink = extern "system" fn(msg: *const c_char, ctx: *mut c_void);
 pub extern "system" fn error_sink(msg: *const c_char, _ctx: *mut c_void) {
     use std::ffi::CStr;
     if msg.is_null() {
-        error!("Log message from FFI boundary is NULL");
+        log::error!("Log message from FFI boundary is NULL");
     } else {
-        error!("{}", unsafe { CStr::from_ptr(msg).to_string_lossy() });
+        log::error!("{}", unsafe { CStr::from_ptr(msg).to_string_lossy() });
     }
 }
 
@@ -51,7 +51,7 @@ pub fn ensure_top_metric_for_interface(interface_alias: &str) -> Result<bool> {
         2 => Err(Error::from(ErrorKind::MetricApplication)),
         // Unexpected value
         _ => {
-            error!("Unexpected return code from WinRoute_EnsureTopMetric");
+            log::error!("Unexpected return code from WinRoute_EnsureTopMetric");
             Err(Error::from(ErrorKind::MetricApplication))
         }
     }
@@ -80,7 +80,7 @@ pub fn get_tap_interface_ipv6_status() -> Result<bool> {
         2 => Err(Error::from(ErrorKind::GetIpv6Status)),
         // Unexpected value
         _ => {
-            error!("Unexpected return code from GetTapInterfaceIpv6Status");
+            log::error!("Unexpected return code from GetTapInterfaceIpv6Status");
             Err(Error::from(ErrorKind::GetIpv6Status))
         }
     }