Rename old futures import

16 files changed, 27 insertions, 22 deletions

diff --git a/talpid-core/Cargo.toml b/talpid-core/Cargo.toml
index 6d7c5effe5..4ac081cd7e 100644
--- a/talpid-core/Cargo.toml
+++ b/talpid-core/Cargo.toml
@@ -12,7 +12,7 @@ atty = "0.2"
 cfg-if = "0.1"
 duct = "0.13"
 err-derive = "0.2.1"
-futures = "0.1"
+futures01 = { package = "futures", version = "0.1" }
 hex = "0.4"
 ipnetwork = "0.15"
 jsonrpc-core = { git = "https://github.com/mullvad/jsonrpc", branch = "mullvad-fork" }
diff --git a/talpid-core/src/offline/android.rs b/talpid-core/src/offline/android.rs
index 4fa45112d6..3863415cfb 100644
--- a/talpid-core/src/offline/android.rs
+++ b/talpid-core/src/offline/android.rs
@@ -1,5 +1,5 @@
 use crate::tunnel_state_machine::TunnelCommand;
-use futures::sync::mpsc::UnboundedSender;
+use futures01::sync::mpsc::UnboundedSender;
 use jnix::{
     jni::{
         self,
diff --git a/talpid-core/src/offline/macos.rs b/talpid-core/src/offline/macos.rs
index ab9fee3b38..fa0cd3c906 100644
--- a/talpid-core/src/offline/macos.rs
+++ b/talpid-core/src/offline/macos.rs
@@ -1,5 +1,5 @@
 use crate::tunnel_state_machine::TunnelCommand;
-use futures::sync::mpsc::UnboundedSender;
+use futures01::sync::mpsc::UnboundedSender;
 use log::{debug, trace};
 use std::{
     sync::{mpsc, Weak},
diff --git a/talpid-core/src/offline/mod.rs b/talpid-core/src/offline/mod.rs
index 268193407e..cff84ce163 100644
--- a/talpid-core/src/offline/mod.rs
+++ b/talpid-core/src/offline/mod.rs
@@ -1,5 +1,5 @@
 use crate::tunnel_state_machine::TunnelCommand;
-use futures::sync::mpsc::UnboundedSender;
+use futures01::sync::mpsc::UnboundedSender;
 use std::sync::Weak;
 #[cfg(target_os = "android")]
 use talpid_types::android::AndroidContext;
diff --git a/talpid-core/src/offline/windows.rs b/talpid-core/src/offline/windows.rs
index 1b685fe8c9..c7a86e4073 100644
--- a/talpid-core/src/offline/windows.rs
+++ b/talpid-core/src/offline/windows.rs
@@ -1,5 +1,5 @@
 use crate::{logging::windows::log_sink, tunnel_state_machine::TunnelCommand, winnet};
-use futures::sync::mpsc::UnboundedSender;
+use futures01::sync::mpsc::UnboundedSender;
 use parking_lot::Mutex;
 use std::{
     ffi::c_void,
diff --git a/talpid-core/src/routing/android.rs b/talpid-core/src/routing/android.rs
index e7697ba350..a10d9d711d 100644
--- a/talpid-core/src/routing/android.rs
+++ b/talpid-core/src/routing/android.rs
@@ -1,4 +1,4 @@
-use futures::{sync::oneshot, Async, Future};
+use futures01::{sync::oneshot, Async, Future};
 use ipnetwork::IpNetwork;
 use std::collections::HashMap;
 
diff --git a/talpid-core/src/routing/macos.rs b/talpid-core/src/routing/macos.rs
index 1d02d87de1..1d364b43f3 100644
--- a/talpid-core/src/routing/macos.rs
+++ b/talpid-core/src/routing/macos.rs
@@ -8,7 +8,7 @@ use std::{
     process::{Command, ExitStatus, Stdio},
 };
 
-use futures::{stream, sync::oneshot, Async, Future, IntoFuture, Stream};
+use futures01::{stream, sync::oneshot, Async, Future, IntoFuture, Stream};
 use tokio_process::{Child, CommandExt};
 
 
@@ -208,7 +208,7 @@ impl RouteManagerImpl {
             .arg(ip_vers(destination))
             .arg(destination.to_string());
 
-        futures::lazy(move || cmd.spawn_async().into_future().and_then(|f| f))
+        futures01::lazy(move || cmd.spawn_async().into_future().and_then(|f| f))
             .map_err(Error::FailedToRemoveRoute)
     }
 
@@ -226,7 +226,7 @@ impl RouteManagerImpl {
             cmd.arg("-interface").arg(device);
         }
 
-        futures::lazy(move || cmd.spawn_async().into_future().and_then(|f| f))
+        futures01::lazy(move || cmd.spawn_async().into_future().and_then(|f| f))
             .map_err(Error::FailedToAddRoute)
     }
 
diff --git a/talpid-core/src/routing/mod.rs b/talpid-core/src/routing/mod.rs
index 2baf625f2f..e98bf1992f 100644
--- a/talpid-core/src/routing/mod.rs
+++ b/talpid-core/src/routing/mod.rs
@@ -30,6 +30,10 @@ impl Route {
             metric: None,
         }
     }
+
+    fn is_ipv4(&self) -> bool {
+        self.prefix.is_ipv4()
+    }
 }
 
 impl fmt::Display for Route {
diff --git a/talpid-core/src/routing/unix.rs b/talpid-core/src/routing/unix.rs
index 146c371ceb..6a379e1eca 100644
--- a/talpid-core/src/routing/unix.rs
+++ b/talpid-core/src/routing/unix.rs
@@ -2,9 +2,9 @@
 #![cfg_attr(target_os = "windows", allow(dead_code))]
 // TODO: remove the allow(dead_code) for android once it's up to scratch.
 use super::NetNode;
-use futures::{sync::oneshot, Future};
+use futures01::{sync::oneshot, Future};
 use ipnetwork::IpNetwork;
-use std::collections::HashMap;
+use std::{collections::HashMap, sync::mpsc::sync_channel};
 
 #[cfg(target_os = "macos")]
 #[path = "macos.rs"]
@@ -47,7 +47,7 @@ impl RouteManager {
     /// routes.
     pub fn new(required_routes: HashMap<IpNetwork, NetNode>) -> Result<Self, Error> {
         let (tx, rx) = oneshot::channel();
-        let (start_tx, start_rx) = oneshot::channel();
+        let (start_tx, start_rx) = sync_channel(1);
 
         std::thread::spawn(
             move || match imp::RouteManagerImpl::new(required_routes, rx) {
@@ -62,7 +62,7 @@ impl RouteManager {
                 }
             },
         );
-        match start_rx.wait() {
+        match start_rx.recv() {
             Ok(Ok(())) => Ok(Self { tx: Some(tx) }),
             Ok(Err(e)) => Err(e),
             Err(_) => Err(Error::RoutingManagerThreadPanic),
diff --git a/talpid-core/src/tunnel_state_machine/connected_state.rs b/talpid-core/src/tunnel_state_machine/connected_state.rs
index 1c0407a615..47bc8d0f36 100644
--- a/talpid-core/src/tunnel_state_machine/connected_state.rs
+++ b/talpid-core/src/tunnel_state_machine/connected_state.rs
@@ -6,7 +6,7 @@ use crate::{
     firewall::FirewallPolicy,
     tunnel::{CloseHandle, TunnelEvent, TunnelMetadata},
 };
-use futures::{
+use futures01::{
     sync::{mpsc, oneshot},
     Async, Future, Stream,
 };
diff --git a/talpid-core/src/tunnel_state_machine/connecting_state.rs b/talpid-core/src/tunnel_state_machine/connecting_state.rs
index 77608c4c3d..204d1e5ebb 100644
--- a/talpid-core/src/tunnel_state_machine/connecting_state.rs
+++ b/talpid-core/src/tunnel_state_machine/connecting_state.rs
@@ -9,7 +9,7 @@ use crate::{
         self, tun_provider::TunProvider, CloseHandle, TunnelEvent, TunnelMetadata, TunnelMonitor,
     },
 };
-use futures::{
+use futures01::{
     sync::{mpsc, oneshot},
     Async, Future, Stream,
 };
diff --git a/talpid-core/src/tunnel_state_machine/disconnected_state.rs b/talpid-core/src/tunnel_state_machine/disconnected_state.rs
index 0eb02252dd..0ad48366d9 100644
--- a/talpid-core/src/tunnel_state_machine/disconnected_state.rs
+++ b/talpid-core/src/tunnel_state_machine/disconnected_state.rs
@@ -3,7 +3,7 @@ use super::{
     TunnelState, TunnelStateTransition, TunnelStateWrapper,
 };
 use crate::firewall::FirewallPolicy;
-use futures::{sync::mpsc, Stream};
+use futures01::{sync::mpsc, Stream};
 use talpid_types::ErrorExt;
 
 /// No tunnel is running.
diff --git a/talpid-core/src/tunnel_state_machine/disconnecting_state.rs b/talpid-core/src/tunnel_state_machine/disconnecting_state.rs
index c07ecbf8f7..21e3198978 100644
--- a/talpid-core/src/tunnel_state_machine/disconnecting_state.rs
+++ b/talpid-core/src/tunnel_state_machine/disconnecting_state.rs
@@ -3,7 +3,7 @@ use super::{
     TunnelCommand, TunnelState, TunnelStateTransition, TunnelStateWrapper,
 };
 use crate::tunnel::CloseHandle;
-use futures::{
+use futures01::{
     sync::{mpsc, oneshot},
     Async, Future, Stream,
 };
diff --git a/talpid-core/src/tunnel_state_machine/error_state.rs b/talpid-core/src/tunnel_state_machine/error_state.rs
index b1bf5183b2..692a69b3d3 100644
--- a/talpid-core/src/tunnel_state_machine/error_state.rs
+++ b/talpid-core/src/tunnel_state_machine/error_state.rs
@@ -3,7 +3,7 @@ use super::{
     TunnelState, TunnelStateTransition, TunnelStateWrapper,
 };
 use crate::firewall::FirewallPolicy;
-use futures::{sync::mpsc, Stream};
+use futures01::{sync::mpsc, Stream};
 use talpid_types::{
     tunnel::{self as talpid_tunnel, ErrorStateCause},
     ErrorExt,
diff --git a/talpid-core/src/tunnel_state_machine/macros.rs b/talpid-core/src/tunnel_state_machine/macros.rs
index 332d518de5..deccd29fdd 100644
--- a/talpid-core/src/tunnel_state_machine/macros.rs
+++ b/talpid-core/src/tunnel_state_machine/macros.rs
@@ -10,9 +10,9 @@
 macro_rules! try_handle_event {
     ($same_state:expr, $event:expr) => {
         match $event {
-            Ok(futures::Async::Ready(Some(event))) => Ok(event),
-            Ok(futures::Async::Ready(None)) => Err(None),
-            Ok(futures::Async::NotReady) => {
+            Ok(futures01::Async::Ready(Some(event))) => Ok(event),
+            Ok(futures01::Async::Ready(None)) => Err(None),
+            Ok(futures01::Async::NotReady) => {
                 return crate::tunnel_state_machine::EventConsequence::NoEvents($same_state);
             }
             Err(error) => Err(Some(error)),
diff --git a/talpid-core/src/tunnel_state_machine/mod.rs b/talpid-core/src/tunnel_state_machine/mod.rs
index 5379a76740..e5c6ea397f 100644
--- a/talpid-core/src/tunnel_state_machine/mod.rs
+++ b/talpid-core/src/tunnel_state_machine/mod.rs
@@ -21,7 +21,8 @@ use crate::{
     offline,
     tunnel::tun_provider::TunProvider,
 };
-use futures::{
+
+use futures01::{
     sync::{mpsc, oneshot},
     Async, Future, Poll, Stream,
 };