fix FutureExt::flatten

kpp · kpp · commit bde692204f88 · 2019-07-24T11:40:45.000+03:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,7 +12,7 @@ edition = "2018"
 
 [dependencies]
 pin-utils = "=0.1.0-alpha.4"
-async-trait = "0.1"
+async-trait = "0.1.2"
 
 [dependencies.futures]
 version = "=0.3.0-alpha.17"
diff --git a/src/future.rs b/src/future.rs
@@ -27,8 +27,8 @@ pub trait FutureExt: Future {
         new_future.await
     }
 
-    async fn flatten(self) -> <<Self as Future>::Output as Future>::Output
-        where <Self as Future>::Output: Future + Send,
+    async fn flatten(self) -> <Self::Output as Future>::Output
+        where Self::Output: Future + Send,
               Self: Sized,
     {
         let nested_future = self.await;
@@ -45,8 +45,6 @@ pub trait FutureExt: Future {
     }
 }
 
-
-
 pub async fn and_then<FutA, FutB, F, T, U, E>(future: FutA, f: F) -> Result<U, E>
     where F: FnOnce(T) -> FutB,
           FutA: Future<Output = Result<T,E>>,

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,8 @@ pub trait FutureExt: Future {`
`27`	`27`	`new_future.await`
`28`	`28`	`}`
`29`	`29`
`30`		`- async fn flatten(self) -> <<Self as Future>::Output as Future>::Output`
`31`		`- where <Self as Future>::Output: Future + Send,`
	`30`	`+ async fn flatten(self) -> <Self::Output as Future>::Output`
	`31`	`+ where Self::Output: Future + Send,`
`32`	`32`	`Self: Sized,`
`33`	`33`	`{`
`34`	`34`	`let nested_future = self.await;`
`@@ -45,8 +45,6 @@ pub trait FutureExt: Future {`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
`48`		`-`
`49`		`-`
`50`	`48`	`pub async fn and_then<FutA, FutB, F, T, U, E>(future: FutA, f: F) -> Result<U, E>`
`51`	`49`	`where F: FnOnce(T) -> FutB,`
`52`	`50`	`FutA: Future<Output = Result<T,E>>,`