update to std::future::Future #265

jxs · 2019-08-26T23:00:55Z

No description provided.

dbcfd · 2019-09-16T15:21:54Z

async tokio-tungstenite for websocket support snapview/tokio-tungstenite#68

zimond · 2019-09-17T16:45:07Z

src/filter/or.rs

-                return Err(e.combine(err1));
-            }
+            pin.original_path_index.reset_path();
+            pin.state = State::Second(Some(err1), fut2);


This loop seems to be breaking tests/path.rs#or

yeah, that one is solved thanks
some more to go 😀

zimond · 2019-09-20T02:49:53Z

There is a way to bring the websocket module back I think... tokio-tungstenite

bstrie · 2019-09-20T15:14:01Z

We literally just switched to warp to take advantage of its websocket support, so I'd love if that could stay first-class in the long run. :)

Cargo.toml

dbcfd · 2019-09-20T17:29:21Z

We literally just switched to warp to take advantage of its websocket support, so I'd love if that could stay first-class in the long run. :)

The tokio-tungstenite branch I put above seems to be working. Would be great to pull it into this branch and do some more testing on it. I do need to add more tests to it.

dbcfd · 2019-09-20T20:19:20Z

examples/errors.rs

    let hello = warp::path::end().map(warp::reply);

    let oops =
-        warp::path("oops").and_then(|| Err::<StatusCode, _>(warp::reject::custom(Error::Oops)));
+        warp::path("oops").and_then(|| async { Err::<StatusCode, _>(warp::reject::custom(Error::Oops))});


Rather than doing an async closure, use futures::future::ready

dbcfd · 2019-09-20T20:19:56Z

examples/errors.rs

+            Err(err)
+        }
+    };
+    async { err }


Same as above, use futures::future::ready so we're not paying the generator cost.

thanks! had missed that

dbcfd · 2019-09-20T20:25:51Z

src/filter/map_err.rs

-    fn poll(&mut self) -> Poll<Self::Item, Self::Error> {
-        self.extract.poll().map_err(|err| (self.callback)(err))
+    fn poll(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Self::Output> {
+        let extract = &mut get_unchecked!(self).extract;


Possibly use pin project to get a pinned field to poll?

zimond · 2019-09-26T02:36:14Z

Cargo.toml

 headers = "0.2"
 http = "0.1"
-hyper = "0.12.18"
+hyper = "=0.13.0-alpha.1"


hyper alpha 2 is released. I think here we can upgrade this dependency and just add some modifications in server code to adapt to the new version zimond@139a5ab

thanks! had to also implement Accept due to AddrIncoming no longer implementing Stream

udoprog · 2019-09-28T16:33:37Z

src/server.rs

+            if let Err(err) = result {
+                log::error!("server error: {}", err)
+            }
+        });


This swallows any errors caused by binding while previously we used to return a Result with Err = (). That's because old futures are equivalent to Future<Output = Result<T, E>>. With this, the server future is replaced with one that immediately yields when failing to bind which is probably not what we want.

To mimic old behavior, we can go back to using map_err. But it's probably better to rewrite this whole shebang to be .await:ed directly since we're making a breaking change anyways.

I made a mistake. Binding is still synchronous through hyper and isn't affected by this change!

udoprog · 2019-09-28T16:33:59Z

src/server.rs

+                if let Err(err) = result {
+                    log::error!("server error: {}", err)
+                }
+            });


udoprog · 2019-10-04T12:53:52Z

Cargo.toml

-rustls = { version = "0.15", optional = true }
-tokio-threadpool = "0.1.7"
+tokio = "0.2.0-alpha.5"
+tokio-executor = "=0.2.0-alpha.5"


time to bump tokio: 0.2.0-alpha.6 :)

udoprog · 2019-10-06T06:04:15Z

I've rebased and bumped dependencies here because I need it:
https://github.com/udoprog/warp

I accidentally ran cargo fmt while working so I guess we have that now as well 🤷‍♂ . Would be nice if we could make that consistent in the codebase (@seanmonstar ?).

lpil · 2019-10-17T21:53:09Z

Great stuff! Is there anything we can do to help get this over the line?

NeoLegends · 2019-10-21T09:03:10Z

src/filters/sse.rs


 /// Server-sent event message
-pub trait ServerSentEvent: SseFormat + Sized + Send + 'static {
+pub trait ServerSentEvent: SseFormat + Sized + Send + Sync + 'static {


Is there a reason for the Sync bound? Pre std::Future SSE replys did not have to be Sync.

I now see why. It's a requirement from hyper.

seanmonstar · 2019-10-23T18:29:49Z

This is super exciting, as I've said before. I've given @jxs merge rights, so when it's ready and green, we can merge :D

NeoLegends · 2019-10-24T12:17:30Z

So the only requirement for now is waiting until async await hits stable? Tests are green in beta, where a/a is already available without feature gates.

udoprog · 2019-10-24T12:52:06Z

We're two weeks out from a stable async/await. Building on beta is a very strong indicator that it will work by then, so I personally wouldn't mind merging to master right now. Note that I've also run this branch in staging for a while without incident.

benceszigeti · 2019-10-27T20:59:54Z

examples/sse_chat.rs

-    warp::spawn(poll_fn(move || dtx.poll_cancel()).map(move |_| {
+    warp::spawn(async move {
+        dtx.closed().await;
+        drx.close();


That usage hold the oneshot::channel open forever, so the fn user_disconnected(...) not reachable.

bstrie · 2020-01-08T00:27:51Z

The tokio-tungstenite branch I put above seems to be working. Would be great to pull it into this branch and do some more testing on it. I do need to add more tests to it.

@dbcfd Took a minute, but I see that snapview/tokio-tungstenite#68 has finally landed. :) You were suggesting that we replace Warp's usage of tungstenite with tokio-tungstenite in order to fully complete the async transition, yes?

jxs · 2020-01-08T00:35:20Z

I am going to open a separate issue, so it's easier to track: #366

dbcfd · 2020-01-08T00:50:42Z

@bstrie Yeah, I would recommend using snapview/tokio-tungstenite#68. We encountered a few issues during the upgrade around context and waking, but they have been worked through, and it should be failure solid now. Hopefully easy to integrate as well, since the previous warp implementation was close to the tokio-tungstenite implementation.

jxs force-pushed the master branch 2 times, most recently from 3e73867 to 23623d3 Compare September 16, 2019 13:15

jxs force-pushed the master branch 5 times, most recently from a22ccc9 to bd33766 Compare September 17, 2019 14:28

zimond reviewed Sep 17, 2019

View reviewed changes

jxs force-pushed the master branch 6 times, most recently from ac9bc57 to 2b18b7f Compare September 18, 2019 12:59

cynecx reviewed Sep 20, 2019

View reviewed changes

Cargo.toml Outdated Show resolved Hide resolved

dbcfd reviewed Sep 20, 2019

View reviewed changes

jxs force-pushed the master branch 3 times, most recently from 6885968 to f11f53e Compare September 24, 2019 17:36

seanmonstar mentioned this pull request Sep 24, 2019

warp::server] server error: executor failed to spawn task: tokio::spawn failed (is a tokio runtime running this future?) #275

Closed

jxs force-pushed the master branch 4 times, most recently from f59d5c9 to 1fee6d5 Compare September 25, 2019 14:47

jxs changed the title ~~WIP: update to std::future::Future~~ update to std::future::Future Sep 25, 2019

zimond reviewed Sep 26, 2019

View reviewed changes

jxs force-pushed the master branch 2 times, most recently from 1a47d0f to 3e07dfd Compare September 27, 2019 18:19

udoprog reviewed Sep 28, 2019

View reviewed changes

udoprog reviewed Oct 4, 2019

View reviewed changes

jxs force-pushed the master branch from 3e07dfd to e3462d2 Compare October 7, 2019 22:53

thomaseizinger mentioned this pull request Oct 8, 2019

Updating to std::future::Future #279

Closed

NeoLegends reviewed Oct 21, 2019

View reviewed changes

NeoLegends mentioned this pull request Oct 21, 2019

Consider making Streaming<T> Sync hyperium/tonic#81

Closed

jxs force-pushed the master branch 2 times, most recently from 0518b0c to f5e468c Compare October 21, 2019 21:25

update to rust 2018 edition

59e9b30

jxs force-pushed the master branch from f5e468c to a43e685 Compare October 21, 2019 21:25

update to std::future::Future

6485839

jxs force-pushed the master branch from a43e685 to 6485839 Compare October 24, 2019 17:38

jxs merged commit 5c26956 into seanmonstar:master Oct 24, 2019

jxs mentioned this pull request Oct 24, 2019

Update to Rust 2018 edition #220

Closed

benceszigeti reviewed Oct 27, 2019

View reviewed changes

thomaseizinger mentioned this pull request Nov 11, 2019

Migrate to async/await comit-network/comit-rs#1638

Closed

3 tasks

abreis mentioned this pull request Jun 9, 2020

try_bind should return a Future (or its docs are inconsistent) #599

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

update to std::future::Future #265

update to std::future::Future #265

jxs commented Aug 26, 2019

dbcfd commented Sep 16, 2019

zimond Sep 17, 2019

jxs Sep 17, 2019

zimond commented Sep 20, 2019

bstrie commented Sep 20, 2019

dbcfd commented Sep 20, 2019

dbcfd Sep 20, 2019

dbcfd Sep 20, 2019

jxs Sep 26, 2019

dbcfd Sep 20, 2019

zimond Sep 26, 2019

jxs Sep 26, 2019 •

edited

udoprog Sep 28, 2019 •

edited

udoprog Sep 28, 2019 •

edited

udoprog Sep 28, 2019

udoprog Oct 4, 2019

udoprog commented Oct 6, 2019

lpil commented Oct 17, 2019

NeoLegends Oct 21, 2019

NeoLegends Oct 21, 2019

seanmonstar commented Oct 23, 2019

NeoLegends commented Oct 24, 2019 •

edited

udoprog commented Oct 24, 2019 •

edited

benceszigeti Oct 27, 2019 •

edited

bstrie commented Jan 8, 2020

jxs commented Jan 8, 2020 •

edited

dbcfd commented Jan 8, 2020

update to std::future::Future #265

update to std::future::Future #265

Conversation

jxs commented Aug 26, 2019

dbcfd commented Sep 16, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zimond commented Sep 20, 2019

bstrie commented Sep 20, 2019

dbcfd commented Sep 20, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jxs Sep 26, 2019 • edited

Choose a reason for hiding this comment

udoprog Sep 28, 2019 • edited

Choose a reason for hiding this comment

udoprog Sep 28, 2019 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

udoprog commented Oct 6, 2019

lpil commented Oct 17, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

seanmonstar commented Oct 23, 2019

NeoLegends commented Oct 24, 2019 • edited

udoprog commented Oct 24, 2019 • edited

benceszigeti Oct 27, 2019 • edited

Choose a reason for hiding this comment

bstrie commented Jan 8, 2020

jxs commented Jan 8, 2020 • edited

dbcfd commented Jan 8, 2020

jxs Sep 26, 2019 •

edited

udoprog Sep 28, 2019 •

edited

udoprog Sep 28, 2019 •

edited

NeoLegends commented Oct 24, 2019 •

edited

udoprog commented Oct 24, 2019 •

edited

benceszigeti Oct 27, 2019 •

edited

jxs commented Jan 8, 2020 •

edited