Add try_join_all tests, tweak formatting

Author: ebkalderon

futures-util/src/try_future/mod.rs

@@ -55,10 +55,10 @@ mod unwrap_or_else;
 pub use self::unwrap_or_else::UnwrapOrElse;
 
 #[cfg(feature = "std")]
-mod join_all;
+mod try_join_all;
 
 #[cfg(feature = "std")]
-pub use self::join_all::{join_all, JoinAll};
+pub use self::try_join_all::{try_join_all, TryJoinAll};
 
 // Implementation details
 mod try_chain;

futures/tests/join_all.rs

@@ -5,9 +5,12 @@ use std::future::Future;
 use futures::executor::block_on;
 use std::fmt::Debug;
 
-fn assert_done<T: PartialEq + Debug, F: FnOnce() -> Box<dyn Future<Output=T> + Unpin>>(actual_fut: F, expected: T) {
+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);
 }
 
@@ -25,7 +28,7 @@ fn collect_collects() {
 fn join_all_iter_lifetime() {
     // 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> {
+    fn sizes<'a>(bufs: Vec<&'a [u8]>) -> Box<dyn Future<Output = Vec<usize>> + Unpin> {
         let iter = bufs.into_iter().map(|b| ready::<usize>(b.len()));
         Box::new(join_all(iter))
     }

futures/tests/try_join_all.rs

@@ -0,0 +1,47 @@
+#![feature(async_await, futures_api)]
+
+use futures_util::future::*;
+use futures_util::try_future::{try_join_all, TryJoinAll};
+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);
+}
+
+#[test]
+fn collect_collects() {
+    assert_done(|| Box::new(try_join_all(vec![ok(1), ok(2)])), Ok::<_, usize>(vec![1, 2]));
+    assert_done(|| Box::new(try_join_all(vec![ok(1), err(2)])), Err(2));
+    assert_done(|| Box::new(try_join_all(vec![ok(1)])), Ok::<_, usize>(vec![1]));
+    // REVIEW: should this be implemented?
+    // assert_done(|| Box::new(try_join_all(Vec::<i32>::new())), Ok(vec![]));
+
+    // TODO: needs more tests
+}
+
+#[test]
+fn try_join_all_iter_lifetime() {
+    // In futures-rs version 0.1, this function would fail to typecheck due to an overly
+    // conservative type parameterization of `TryJoinAll`.
+    fn sizes<'a>(bufs: Vec<&'a [u8]>) -> Box<dyn Future<Output = Result<Vec<usize>, ()>> + Unpin> {
+        let iter = bufs.into_iter().map(|b| ok::<usize, ()>(b.len()));
+        Box::new(try_join_all(iter))
+    }
+
+    assert_done(|| sizes(vec![&[1,2,3], &[], &[0]]), Ok(vec![3 as usize, 0, 1]));
+}
+
+#[test]
+fn try_join_all_from_iter() {
+    assert_done(
+        || Box::new(vec![ok(1), ok(2)].into_iter().collect::<TryJoinAll<_>>()),
+        Ok::<_, usize>(vec![1, 2]),
+    )
+}