Merge pull request #732 from stuhood/stuhood/join-all-into-iter

Join all into iter

Author: alexcrichton

src/future/join_all.rs

@@ -19,18 +19,16 @@ enum ElemState<T> where T: Future {
 ///
 /// This future is created with the `join_all` method.
 #[must_use = "futures do nothing unless polled"]
-pub struct JoinAll<I>
-    where I: IntoIterator,
-          I::Item: IntoFuture,
+pub struct JoinAll<Item>
+    where Item: IntoFuture,
 {
-    elems: Vec<ElemState<<I::Item as IntoFuture>::Future>>,
+    elems: Vec<ElemState<<Item as IntoFuture>::Future>>,
 }
 
 impl<I> fmt::Debug for JoinAll<I>
-    where I: IntoIterator,
-          I::Item: IntoFuture,
-          <<I as IntoIterator>::Item as IntoFuture>::Future: fmt::Debug,
-          <<I as IntoIterator>::Item as IntoFuture>::Item: fmt::Debug,
+    where I: IntoFuture,
+          <I as IntoFuture>::Future: fmt::Debug,
+          <I as IntoFuture>::Item: fmt::Debug,
 {
     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
         fmt.debug_struct("JoinAll")
@@ -73,7 +71,7 @@ impl<I> fmt::Debug for JoinAll<I>
 ///     x
 /// });
 /// ```
-pub fn join_all<I>(i: I) -> JoinAll<I>
+pub fn join_all<I>(i: I) -> JoinAll<I::Item>
     where I: IntoIterator,
           I::Item: IntoFuture,
 {
@@ -83,12 +81,11 @@ pub fn join_all<I>(i: I) -> JoinAll<I>
     JoinAll { elems: elems }
 }
 
-impl<I> Future for JoinAll<I>
-    where I: IntoIterator,
-          I::Item: IntoFuture,
+impl<Item> Future for JoinAll<Item>
+    where Item: IntoFuture,
 {
-    type Item = Vec<<I::Item as IntoFuture>::Item>;
-    type Error = <I::Item as IntoFuture>::Error;
+    type Item = Vec<<Item as IntoFuture>::Item>;
+    type Error = <Item as IntoFuture>::Error;
 
 
     fn poll(&mut self) -> Poll<Self::Item, Self::Error> {

tests/all.rs

@@ -251,6 +251,18 @@ fn collect_collects() {
     // TODO: needs more tests
 }
 
+#[test]
+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<Future<Item=Vec<usize>, Error=()> + 'static> {
+        let iter = bufs.into_iter().map(|b| future::ok::<usize, ()>(b.len()));
+        Box::new(join_all(iter))
+    }
+
+    assert_done(|| sizes(vec![&[1,2,3], &[], &[0]]), Ok(vec![3, 0, 1]));
+}
+
 #[test]
 fn select2() {
     fn d<T, U, E>(r: Result<(T, U), (E, U)>) -> Result<T, E> {