Update for futures alpha.17 (#286)

Author: Nemo157

Cargo.toml

@@ -25,7 +25,7 @@ cors = ["tide-cors"]
 hyper = ["http-service-hyper"]
 
 [dependencies]
-futures-preview = "0.3.0-alpha.16"
+futures-preview = "0.3.0-alpha.17"
 http = "0.1"
 http-service = "0.2.0"
 http-service-hyper = { version = "0.2.0", optional = true }
@@ -46,7 +46,7 @@ bytes = "0.4.12"
 cookie = { version = "0.12", features = ["percent-encode"] }
 env_logger = "0.6.1"
 futures-fs = "0.0.5"
-futures-util-preview = { version = "0.3.0-alpha.16", features = ["compat"] }
+futures-util-preview = { version = "0.3.0-alpha.17", features = ["compat"] }
 http-service-mock = "0.2.0"
 juniper = "0.12.0"
 log = "0.4.6"

src/app.rs

@@ -1,5 +1,4 @@
 use futures::future::{self, BoxFuture};
-use futures::prelude::*;
 use http_service::HttpService;
 use std::sync::Arc;
 
@@ -297,7 +296,7 @@ impl<State: Sync + Send + 'static> HttpService for Server<State> {
         let middleware = self.middleware.clone();
         let state = self.state.clone();
 
-        FutureExt::boxed(async move {
+        Box::pin(async move {
             let fut = {
                 let (endpoint, params) = router.route(&path, method).into_components();
                 let cx = Context::new(state, req, params);

src/router/core.rs

@@ -69,7 +69,7 @@ impl<'a, State> Selection<'a, State> {
 }
 
 fn not_found_endpoint<State>(_cx: Context<State>) -> BoxFuture<'static, Response> {
-    FutureExt::boxed(async move {
+    Box::pin(async move {
         http::Response::builder()
             .status(http::StatusCode::NOT_FOUND)
             .body(Body::empty())

tide-compression/Cargo.toml

@@ -17,7 +17,7 @@ version = "0.1.0"
 tide = { path = "../", default-features = false }
 accept-encoding = "0.2.0-alpha.2"
 bytes = "0.4.12"
-futures-preview = "0.3.0-alpha.16"
+futures-preview = "0.3.0-alpha.17"
 http = "0.1"
 http-service = "0.2.0"
 

tide-compression/src/lib.rs

@@ -15,7 +15,6 @@
 pub use accept_encoding::Encoding;
 use async_compression::stream;
 use futures::future::BoxFuture;
-use futures::prelude::*;
 use http::{header::CONTENT_ENCODING, status::StatusCode, HeaderMap};
 use http_service::{Body, Request};
 use tide::{
@@ -134,7 +133,7 @@ impl Compression {
 
 impl<State: Send + Sync + 'static> Middleware<State> for Compression {
     fn handle<'a>(&'a self, cx: Context<State>, next: Next<'a, State>) -> BoxFuture<'a, Response> {
-        FutureExt::boxed(async move {
+        Box::pin(async move {
             let encoding = match self.preferred_encoding(cx.headers()) {
                 Ok(encoding) => encoding,
                 Err(e) => return e.into_response(),
@@ -222,7 +221,7 @@ impl<State: Send + Sync + 'static> Middleware<State> for Decompression {
         mut cx: Context<State>,
         next: Next<'a, State>,
     ) -> BoxFuture<'a, Response> {
-        FutureExt::boxed(async move {
+        Box::pin(async move {
             match self.decode(cx.request_mut()) {
                 Ok(_) => (),
                 Err(e) => return e.into_response(),

tide-cookies/Cargo.toml

@@ -12,7 +12,7 @@ repository = "https://github.com/rustasync/tide"
 
 [dependencies]
 cookie = { version = "0.12", features = ["percent-encode"] }
-futures-preview = "0.3.0-alpha.16"
+futures-preview = "0.3.0-alpha.17"
 http = "0.1"
 http-service = "0.2.0"
 tide-core = { path = "../tide-core", default-features = false  }

tide-cookies/src/middleware.rs

@@ -1,6 +1,5 @@
 use crate::data::CookieData;
 use futures::future::BoxFuture;
-use futures::prelude::*;
 use http::header::HeaderValue;
 
 use tide_core::{
@@ -36,7 +35,7 @@ impl<State: Send + Sync + 'static> Middleware<State> for CookiesMiddleware {
         mut cx: Context<State>,
         next: Next<'a, State>,
     ) -> BoxFuture<'a, Response> {
-        FutureExt::boxed(async move {
+        Box::pin(async move {
             let cookie_data = cx
                 .extensions_mut()
                 .remove()

tide-core/Cargo.toml

@@ -11,7 +11,7 @@ license = "MIT OR Apache-2.0"
 repository = "https://github.com/rustasync/tide"
 
 [dependencies]
-futures-preview = "0.3.0-alpha.16"
+futures-preview = "0.3.0-alpha.17"
 http = "0.1"
 http-service = "0.2.0"
 serde = "1.0.91"

tide-core/src/endpoint.rs

@@ -1,5 +1,4 @@
 use futures::future::{BoxFuture, Future};
-use futures::prelude::*;
 
 use crate::{error::Error, response::IntoResponse, Context, Response};
 
@@ -66,7 +65,7 @@ where
     type Fut = BoxFuture<'static, Response>;
     fn call(&self, cx: Context<State>) -> Self::Fut {
         let fut = (self)(cx);
-        FutureExt::boxed(async move { fut.await.into_response() })
+        Box::pin(async move { fut.await.into_response() })
     }
 }
 

tide-cors/Cargo.toml

@@ -14,7 +14,7 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-futures-preview = "0.3.0-alpha.16"
+futures-preview = "0.3.0-alpha.17"
 http = "0.1"
 http-service = "0.2.0"
 tide-core = { path = "../tide-core" }