1 files changed, 28 insertions, 16 deletions

diff --git a/tests/join_all.rs b/tests/join_all.rs
index 63967bf..0d8fbf2 100644
--- a/tests/join_all.rs
+++ b/tests/join_all.rs
@@ -1,29 +1,38 @@
-use futures_util::future::*;
-use std::future::Future;
-use futures::executor::block_on;
-use std::fmt::Debug;
-
-fn assert_done<T, F>(actual_fut: F, expected: T)
-where
-    T: PartialEq + Debug,
-    F: FnOnce() -> Box<dyn Future<Output = T> + Unpin>,
-{
-    let output = block_on(actual_fut());
-    assert_eq!(output, expected);
+#[cfg(feature = "executor")]
+mod util {
+    use std::future::Future;
+    use std::fmt::Debug;
+
+    pub fn assert_done<T, F>(actual_fut: F, expected: T)
+    where
+        T: PartialEq + Debug,
+        F: FnOnce() -> Box<dyn Future<Output = T> + Unpin>,
+    {
+        use futures::executor::block_on;
+
+        let output = block_on(actual_fut());
+        assert_eq!(output, expected);
+    }
 }
 
+#[cfg(feature = "executor")]
 #[test]
 fn collect_collects() {
-    assert_done(|| Box::new(join_all(vec![ready(1), ready(2)])), vec![1, 2]);
-    assert_done(|| Box::new(join_all(vec![ready(1)])), vec![1]);
+    use futures_util::future::{join_all,ready};
+
+    util::assert_done(|| Box::new(join_all(vec![ready(1), ready(2)])), vec![1, 2]);
+    util::assert_done(|| Box::new(join_all(vec![ready(1)])), vec![1]);
     // REVIEW: should this be implemented?
     // assert_done(|| Box::new(join_all(Vec::<i32>::new())), vec![]);
 
     // TODO: needs more tests
 }
 
+#[cfg(feature = "executor")]
 #[test]
 fn join_all_iter_lifetime() {
+    use futures_util::future::{join_all,ready};
+    use std::future::Future;
     // In futures-rs version 0.1, this function would fail to typecheck due to an overly
     // conservative type parameterization of `JoinAll`.
     fn sizes<'a>(bufs: Vec<&'a [u8]>) -> Box<dyn Future<Output = Vec<usize>> + Unpin> {
@@ -31,12 +40,15 @@ fn join_all_iter_lifetime() {
         Box::new(join_all(iter))
     }
 
-    assert_done(|| sizes(vec![&[1,2,3], &[], &[0]]), vec![3 as usize, 0, 1]);
+    util::assert_done(|| sizes(vec![&[1,2,3], &[], &[0]]), vec![3 as usize, 0, 1]);
 }
 
+#[cfg(feature = "executor")]
 #[test]
 fn join_all_from_iter() {
-    assert_done(
+    use futures_util::future::{JoinAll,ready};
+
+    util::assert_done(
         || Box::new(vec![ready(1), ready(2)].into_iter().collect::<JoinAll<_>>()),
         vec![1, 2],
     )