forked/hyper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(dependencies): update futures to 0.3.1

Browse Source
This commit is contained in:
Daniel Johnson
2019-11-14 10:04:16 -08:00
committed by Sean McArthur
parent 9d9233ce7c
commit 71d088d3d0
10 changed files with 29 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/server.rs
View File

@@ -15,10 +15,11 @@ use std::time::Duration;
use futures_channel::oneshot;
use futures_core::ready;
use futures_core::future::BoxFuture;
use futures_util::future::{self, Either, FutureExt};
use futures_util::stream::StreamExt;
use futures_util::try_future::{self, TryFutureExt};
//use futures_util::try_stream::TryStreamExt;
use futures_util::future::{self, Either, FutureExt, TryFutureExt};
#[cfg(feature = "unstable-stream")]
use futures_util::stream::StreamExt as _;
// TODO: remove once tokio is updated to futures 0.3
use futures_util_a19::stream::StreamExt as _;
use http::header::{HeaderName, HeaderValue};
use tokio_net::driver::Handle;
use tokio_net::tcp::{TcpListener, TcpStream as TkTcpStream};
@@ -879,7 +880,7 @@ fn disable_keep_alive_mid_request() {
.map_err(|_| unreachable!())
.and_then(|socket| {
let srv = Http::new().serve_connection(socket, HelloWorld);
try_future::try_select(srv, rx1)
future::try_select(srv, rx1)
.then(|r| {
match r {
Ok(Either::Left(_)) => panic!("expected rx first"),
@@ -938,7 +939,7 @@ fn disable_keep_alive_post_request() {
_debug: dropped2,
};
let server = Http::new().serve_connection(transport, HelloWorld);
try_future::try_select(server, rx1)
future::try_select(server, rx1)
.then(|r| {
match r {
Ok(Either::Left(_)) => panic!("expected rx first"),