futures: tests/join_all.rs: Don't break w/o "executor" feature
Symbols/Imports pushed down / localised
Tests gated with cfg()
Tests now build and pass with all valid feature combinations
See previous commits for details and rationale
-use futures_util::future::*;
+#[cfg(feature = "executor")]
+mod util {
use std::future::Future;
-use futures::executor::block_on;
use std::fmt::Debug;
-fn assert_done<T, F>(actual_fut: F, expected: T)
+ 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],
)
