Merge branch 'master' into run-examples

Author: fairingrey

.travis.yml

@@ -2,29 +2,56 @@ language: rust
 rust: nightly-2019-05-09
 cache: cargo
 
+before_script:
+- >
+  [[ "$(cargo-sweep --version)" == "cargo-sweep 0.4.1" ]]
+  || cargo install cargo-sweep
+- cargo sweep --stamp
+
+before_cache:
+- cargo sweep --file
+
 matrix:
   include:
   - name: cargo doc
     env: [CACHE_NAME=docs]
     script:
-    - RUSTDOCFLAGS=-Dwarnings
-      cargo doc --all --all-features --no-deps --exclude tide
+    - RUSTDOCFLAGS=-Dwarnings cargo doc
+        -Zmtime-on-use
+        --all --all-features
+        --exclude tide
+        --no-deps
 
   - name: cargo fmt
     cache: false
-    before_script: rustup component add rustfmt
-    script: cargo fmt --all -- --check
+    before_script: []
+    install:
+    - rustup component add rustfmt
+    script:
+    - cargo fmt --all -- --check
 
   - name: cargo clippy
     env: [CACHE_NAME=clippy]
-    before_script: rustup component add clippy
-    script: cargo clippy --all --all-targets --exclude examples -- -Dwarnings
+    install:
+    - rustup component add clippy
+    script:
+    - cargo clippy
+        -Zmtime-on-use
+        --all --all-targets
+        --exclude examples
+        -- -Dwarnings
 
   - name: cargo build --no-default-features
     env: [CACHE_NAME=no-default-features]
     script:
-    - cargo build --no-default-features
-    - cargo build --manifest-path tide-core/Cargo.toml --no-default-features
+    - cargo build
+        -Zmtime-on-use
+        --manifest-path tide-core/Cargo.toml
+        --no-default-features
+    - cargo build
+        -Zmtime-on-use
+        --no-default-features
 
   - name: cargo test
-    script: cargo test --all --verbose
+    script:
+    - cargo test -Zmtime-on-use --all --verbose

README.md

@@ -74,7 +74,7 @@ fn main() -> Result<(), std::io::Error> {
 - [Hello World](https://github.com/rustasync/tide/blob/master/examples/src/hello.rs)
 - [Messages](https://github.com/rustasync/tide/blob/master/examples/src/messages.rs)
 - [Body Types](https://github.com/rustasync/tide/blob/master/examples/src/body_types.rs)
-- [Multipart Form](https://github.com/rustasync/tide/blob/master/examples/src/multipart-form/main.rs)
+- [Multipart Form](https://github.com/rustasync/tide/blob/master/examples/src/multipart_form/mod.rs)
 - [Catch All](https://github.com/rustasync/tide/blob/master/examples/src/catch_all.rs)
 - [Cookies](https://github.com/rustasync/tide/blob/master/examples/src/cookies.rs)
 - [Default Headers](https://github.com/rustasync/tide/blob/master/examples/src/default_headers.rs)

src/forms.rs

@@ -1,3 +1,4 @@
+use futures::prelude::*;
 use http_service::Body;
 use multipart::server::Multipart;
 use std::io::Cursor;
@@ -19,10 +20,12 @@ pub trait ContextExt {
 impl<State: Send + Sync + 'static> ContextExt for Context<State> {
     fn body_form<T: serde::de::DeserializeOwned>(&mut self) -> BoxTryFuture<T> {
         let body = self.take_body();
-        box_async! {
+        FutureExt::boxed(async move {
             let body = body.into_vec().await.client_err()?;
-            Ok(serde_urlencoded::from_bytes(&body).map_err(|e| err_fmt!("could not decode form: {}", e)).client_err()?)
-        }
+            Ok(serde_urlencoded::from_bytes(&body)
+                .map_err(|e| err_fmt!("could not decode form: {}", e))
+                .client_err()?)
+        })
     }
 
     fn body_multipart(&mut self) -> BoxTryFuture<Multipart<Cursor<Vec<u8>>>> {
@@ -35,11 +38,13 @@ impl<State: Send + Sync + 'static> ContextExt for Context<State> {
 
         let body = self.take_body();
 
-        box_async! {
+        FutureExt::boxed(async move {
             let body = body.into_vec().await.client_err()?;
-            let boundary = boundary.ok_or_else(|| err_fmt!("no boundary found")).client_err()?;
+            let boundary = boundary
+                .ok_or_else(|| err_fmt!("no boundary found"))
+                .client_err()?;
             Ok(Multipart::with_body(Cursor::new(body), boundary))
-        }
+        })
     }
 }
 

src/lib.rs

@@ -22,12 +22,6 @@
 #[doc(include = "../README.md")]
 const _README: () = ();
 
-macro_rules! box_async {
-    {$($t:tt)*} => {
-        ::futures::future::FutureExt::boxed(async move { $($t)* })
-    };
-}
-
 #[macro_use]
 extern crate tide_core;
 

src/middleware/default_headers.rs

@@ -1,4 +1,5 @@
 use futures::future::BoxFuture;
+use futures::prelude::*;
 
 use http::{
     header::{HeaderValue, IntoHeaderName},
@@ -41,14 +42,14 @@ impl DefaultHeaders {
 
 impl<Data: Send + Sync + 'static> Middleware<Data> for DefaultHeaders {
     fn handle<'a>(&'a self, cx: Context<Data>, next: Next<'a, Data>) -> BoxFuture<'a, Response> {
-        box_async! {
+        FutureExt::boxed(async move {
             let mut res = next.run(cx).await;
 
             let headers = res.headers_mut();
             for (key, value) in self.headers.iter() {
                 headers.entry(key).unwrap().or_insert_with(|| value.clone());
             }
             res
-        }
+        })
     }
 }

src/middleware/logger.rs

@@ -3,6 +3,7 @@ use slog_async;
 use slog_term;
 
 use futures::future::BoxFuture;
+use futures::prelude::*;
 
 use crate::{
     middleware::{Middleware, Next},
@@ -37,14 +38,14 @@ impl Default for RootLogger {
 /// is generated.
 impl<Data: Send + Sync + 'static> Middleware<Data> for RootLogger {
     fn handle<'a>(&'a self, cx: Context<Data>, next: Next<'a, Data>) -> BoxFuture<'a, Response> {
-        box_async! {
+        FutureExt::boxed(async move {
             let path = cx.uri().path().to_owned();
             let method = cx.method().as_str().to_owned();
 
             let res = next.run(cx).await;
             let status = res.status();
             info!(self.inner_logger, "{} {} {}", method, path, status.as_str());
             res
-        }
+        })
     }
 }

tide-compression/src/lib.rs

@@ -13,6 +13,7 @@
 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::{
@@ -21,12 +22,6 @@ use tide::{
     Context, Error, Response,
 };
 
-macro_rules! box_async {
-    {$($t:tt)*} => {
-        ::futures::future::FutureExt::boxed(async move { $($t)* })
-    };
-}
-
 /// Encode settings for the compression middleware.
 ///
 /// This can be modified in the case that you want more control over the speed or quality of compression.
@@ -137,14 +132,14 @@ impl Compression {
 
 impl<Data: Send + Sync + 'static> Middleware<Data> for Compression {
     fn handle<'a>(&'a self, cx: Context<Data>, next: Next<'a, Data>) -> BoxFuture<'a, Response> {
-        box_async! {
+        FutureExt::boxed(async move {
             let encoding = match self.preferred_encoding(cx.headers()) {
                 Ok(encoding) => encoding,
                 Err(e) => return e.into_response(),
             };
             let res = next.run(cx).await;
             self.encode(res, encoding)
-        }
+        })
     }
 }
 
@@ -225,13 +220,13 @@ impl<Data: Send + Sync + 'static> Middleware<Data> for Decompression {
         mut cx: Context<Data>,
         next: Next<'a, Data>,
     ) -> BoxFuture<'a, Response> {
-        box_async! {
+        FutureExt::boxed(async move {
             match self.decode(cx.request_mut()) {
                 Ok(_) => (),
                 Err(e) => return e.into_response(),
             };
             next.run(cx).await
-        }
+        })
     }
 }
 

tide-cookies/src/lib.rs

@@ -8,9 +8,6 @@
     missing_debug_implementations
 )]
 
-#[macro_use]
-extern crate tide_core;
-
 mod data;
 mod middleware;
 

tide-cookies/src/middleware.rs

@@ -1,5 +1,6 @@
 use crate::data::CookieData;
 use futures::future::BoxFuture;
+use futures::prelude::*;
 use http::header::HeaderValue;
 
 use tide_core::{
@@ -31,7 +32,7 @@ impl<Data: Send + Sync + 'static> Middleware<Data> for CookiesMiddleware {
         mut cx: Context<Data>,
         next: Next<'a, Data>,
     ) -> BoxFuture<'a, Response> {
-        box_async! {
+        FutureExt::boxed(async move {
             let cookie_data = cx
                 .extensions_mut()
                 .remove()
@@ -56,7 +57,7 @@ impl<Data: Send + Sync + 'static> Middleware<Data> for CookiesMiddleware {
                 }
             }
             res
-        }
+        })
     }
 }
 

tide-core/src/app.rs

@@ -1,4 +1,5 @@
 use futures::future::{self, BoxFuture};
+use futures::prelude::*;
 use http_service::HttpService;
 use std::sync::Arc;
 
@@ -292,7 +293,7 @@ impl<State: Sync + Send + 'static> HttpService for Server<State> {
         let middleware = self.middleware.clone();
         let data = self.data.clone();
 
-        box_async! {
+        FutureExt::boxed(async move {
             let fut = {
                 let Selection { endpoint, params } = router.route(&path, method);
                 let cx = Context::new(data, req, params);
@@ -306,7 +307,7 @@ impl<State: Sync + Send + 'static> HttpService for Server<State> {
             };
 
             Ok(fut.await)
-        }
+        })
     }
 }
 

tide-core/src/endpoint.rs

@@ -1,4 +1,5 @@
 use futures::future::{BoxFuture, Future};
+use futures::prelude::*;
 
 use crate::{response::IntoResponse, Context, Response};
 
@@ -68,8 +69,6 @@ where
     type Fut = BoxFuture<'static, Response>;
     fn call(&self, cx: Context<State>) -> Self::Fut {
         let fut = (self)(cx);
-        box_async! {
-            fut.await.into_response()
-        }
+        FutureExt::boxed(async move { fut.await.into_response() })
     }
 }

tide-core/src/lib.rs

@@ -11,13 +11,6 @@
 // ISSUE: https://github.com/rust-lang/rust-clippy/issues/3988
 #![allow(clippy::needless_lifetimes)]
 
-#[macro_export]
-macro_rules! box_async {
-    {$($t:tt)*} => {
-        ::futures::future::FutureExt::boxed(async move { $($t)* })
-    };
-}
-
 mod app;
 mod context;
 mod endpoint;

tide-core/src/router.rs

@@ -1,5 +1,6 @@
 use fnv::FnvHashMap;
-use futures::future::{BoxFuture, FutureExt};
+use futures::future::BoxFuture;
+use futures::prelude::*;
 use http_service::Body;
 use route_recognizer::{Match, Params, Router as MethodRouter};
 
@@ -62,7 +63,10 @@ impl<State: 'static> Router<State> {
 }
 
 fn not_found_endpoint<Data>(_cx: Context<Data>) -> BoxFuture<'static, Response> {
-    box_async! {
-        http::Response::builder().status(http::StatusCode::NOT_FOUND).body(Body::empty()).unwrap()
-    }
+    FutureExt::boxed(async move {
+        http::Response::builder()
+            .status(http::StatusCode::NOT_FOUND)
+            .body(Body::empty())
+            .unwrap()
+    })
 }