Turn combinators into async trait methods

kpp · Aug 22, 2019 · 522689b · 522689b
1 parent 80ac73f
commit 522689b
Show file tree

Hide file tree

Showing 4 changed files with 405 additions and 381 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,6 +19,7 @@ maintenance = { status = "experimental" }
 
 [dependencies]
 pin-utils = "=0.1.0-alpha.4"
+async-trait = "0.1.3"
 
 [dependencies.futures]
 version = "=0.3.0-alpha.18"

diff --git a/benches/future.rs b/benches/future.rs
@@ -58,7 +58,7 @@ fn bench_map(c: &mut Criterion) {
                 b.iter(async move || {
                     use futures_async_combinators::future::*;
                     let fut = ready(40);
-                    let fut = map(fut, |x| x + 2);
+                    let fut = fut.map(|x| x + 2);
                     black_box(fut).await
                 })
             }),

diff --git a/examples/future.rs b/examples/future.rs
@@ -4,8 +4,8 @@ use futures_async_combinators::future::*;
 fn main() {
     executor::block_on(async {
         let future = ready(Ok::<i32, i32>(1));
-        let future = and_then(future, |x| ready(Ok::<i32, i32>(x + 3)));
-        let future = inspect(future, |x| {
+        let future = future.and_then(|x| ready(Ok::<i32, i32>(x + 3)));
+        let future = future.inspect(|x| {
             dbg!(x);
         });
         assert_eq!(future.await, Ok(4));