From 1b7c969f6a9d39dba5485e6b54e2badc6caff47d Mon Sep 17 00:00:00 2001
From: Erich Gubler <erichdongubler@gmail.com>
Date: Wed, 26 Feb 2020 09:15:21 -0700
Subject: [PATCH] `actix-rt`: minimize `futures` dependencies to
`futures-{channel,util}` with default features off (#104)
* build(deps): minimize `futures` deps by using `futures-channel` and `futures-util` directly
* style(actix-rt): enforce spaces around equals in `Cargo.toml`
---
actix-rt/Cargo.toml | 5 +++--
actix-rt/src/arbiter.rs | 6 +++---
actix-rt/src/builder.rs | 6 +++---
actix-rt/src/lib.rs | 2 +-
actix-rt/src/system.rs | 2 +-
5 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/actix-rt/Cargo.toml b/actix-rt/Cargo.toml
index 3ab88ba0..a7918a99 100644
--- a/actix-rt/Cargo.toml
+++ b/actix-rt/Cargo.toml
@@ -18,6 +18,7 @@ path = "src/lib.rs"
[dependencies]
actix-macros = "0.1.0"
actix-threadpool = "0.3"
-futures = "0.3.1"
+futures-channel = { version = "0.3.1", default-features = false }
+futures-util = { version = "0.3.1", default-features = false }
copyless = "0.1.4"
-tokio = { version = "0.2.6", default-features=false, features = ["rt-core", "rt-util", "io-driver", "tcp", "uds", "udp", "time", "signal", "stream"] }
+tokio = { version = "0.2.6", default-features = false, features = ["rt-core", "rt-util", "io-driver", "tcp", "uds", "udp", "time", "signal", "stream"] }
diff --git a/actix-rt/src/arbiter.rs b/actix-rt/src/arbiter.rs
index 08d3089c..aadb5f37 100644
--- a/actix-rt/src/arbiter.rs
+++ b/actix-rt/src/arbiter.rs
@@ -6,9 +6,9 @@ use std::sync::atomic::{AtomicUsize, Ordering};
use std::task::{Context, Poll};
use std::{fmt, thread};
-use futures::channel::mpsc::{unbounded, UnboundedReceiver, UnboundedSender};
-use futures::channel::oneshot::{channel, Canceled, Sender};
-use futures::{future, Future, FutureExt, Stream};
+use futures_channel::mpsc::{unbounded, UnboundedReceiver, UnboundedSender};
+use futures_channel::oneshot::{channel, Canceled, Sender};
+use futures_util::{future::{self, Future, FutureExt}, stream::Stream};
use crate::runtime::Runtime;
use crate::system::System;
diff --git a/actix-rt/src/builder.rs b/actix-rt/src/builder.rs
index 2ca77b3c..29963703 100644
--- a/actix-rt/src/builder.rs
+++ b/actix-rt/src/builder.rs
@@ -1,9 +1,9 @@
use std::borrow::Cow;
use std::io;
-use futures::channel::mpsc::unbounded;
-use futures::channel::oneshot::{channel, Receiver};
-use futures::future::{lazy, Future, FutureExt};
+use futures_channel::mpsc::unbounded;
+use futures_channel::oneshot::{channel, Receiver};
+use futures_util::future::{lazy, Future, FutureExt};
use tokio::task::LocalSet;
use crate::arbiter::{Arbiter, SystemArbiter};
diff --git a/actix-rt/src/lib.rs b/actix-rt/src/lib.rs
index 3ef7460e..aef78f12 100644
--- a/actix-rt/src/lib.rs
+++ b/actix-rt/src/lib.rs
@@ -25,7 +25,7 @@ pub use actix_threadpool as blocking;
/// This function panics if actix system is not running.
pub fn spawn<F>(f: F)
where
- F: futures::Future<Output = ()> + 'static,
+ F: futures_util::future::Future<Output = ()> + 'static,
{
if !System::is_set() {
panic!("System is not running");
diff --git a/actix-rt/src/system.rs b/actix-rt/src/system.rs
index 1e5beec7..f89fe9f3 100644
--- a/actix-rt/src/system.rs
+++ b/actix-rt/src/system.rs
@@ -3,7 +3,7 @@ use std::future::Future;
use std::io;
use std::sync::atomic::{AtomicUsize, Ordering};
-use futures::channel::mpsc::UnboundedSender;
+use futures_channel::mpsc::UnboundedSender;
use tokio::task::LocalSet;
use crate::arbiter::{Arbiter, SystemCommand};