Port to Tokio 0.2

.github/CONTRIBUTING.md

@@ -11,7 +11,6 @@ Repository.
 
 - [Code of Conduct](#code-of-conduct)
 - [Bad Actors](#bad-actors)
-- [Developer Certificate of Origin](#developer-certificate-of-origin)
 
 ## Code of Conduct
 The project has a [Code of Conduct](./CODE_OF_CONDUCT.md) that *all*
@@ -54,10 +53,3 @@ contributors the benefit of the doubt and having a sincere willingness to admit
 that you *might* be wrong is critical for any successful open collaboration.
 
 Don't be a bad actor.
-
-## Developer Certificate of Origin
-All contributors must read and agree to the [Developer Certificate of
-Origin (DCO)](../CERTIFICATE).
-
-The DCO allows us to accept contributions from people to the project, similarly
-to how a license allows us to distribute our code.

.travis.yml

@@ -1,13 +1,56 @@
 language: rust
-rust:
-  - nightly-2019-05-09
-
-before_script: |
-  rustup component add rustfmt clippy
-script: |
-  cargo fmt --all -- --check &&
-  cargo clippy --all -- -D clippy::all &&
-  cargo build --no-default-features --verbose &&
-  cargo build --all --verbose &&
-  cargo test  --all --verbose
-cache: cargo
+rust: beta
+
+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
+        --exclude tide
+        --no-deps
+
+  - name: cargo fmt
+    cache: false
+    before_script: []
+    install:
+    - rustup component add rustfmt
+    script:
+    - cargo fmt --all -- --check
+
+  - name: cargo clippy
+    env: [CACHE_NAME=clippy]
+    install:
+    - rustup component add clippy
+    script:
+    - cargo clippy
+        --all --all-targets
+        -- -Dwarnings
+
+  - name: cargo build --no-default-features
+    env: [CACHE_NAME=no-default-features]
+    script:
+    - cargo build
+        --manifest-path tide-core/Cargo.toml
+        --no-default-features
+    - cargo build
+        --no-default-features
+
+  - name: cargo test
+    script:
+    - cargo test --all --verbose
+
+  - name: cargo test --all-features
+    script:
+    - cargo test --all-features
+    - cargo test --manifest-path tide-slog/Cargo.toml --all-features

Cargo.toml

@@ -18,50 +18,59 @@ readme = "README.md"
 repository = "https://github.com/rustasync/tide"
 version = "0.2.0"
 
-[dependencies]
-cookie = { version = "0.12", features = ["percent-encode"] }
-futures-preview = "0.3.0-alpha.16"
-fnv = "1.0.6"
-http = "0.1"
-http-service = "0.2.0"
-pin-utils = "0.1.0-alpha.4"
-route-recognizer = "0.1.12"
-serde = "1.0.91"
-serde_derive = "1.0.91"
-serde_json = "1.0.39"
-slog = "2.4.1"
-slog-async = "2.3.0"
-slog-term = "2.4.0"
-typemap = "0.3.3"
-serde_urlencoded = "0.5.5"
-
-[dependencies.http-service-hyper]
-optional = true
-version = "0.2.0"
-
-[dependencies.multipart]
-default-features = false
-features = ["server"]
-version = "0.16.1"
-
 [features]
-default = ["hyper"]
+default = ["hyper", "cookies", "cors"]
+cookies = ["tide-cookies"]
+cors = ["tide-cors"]
 hyper = ["http-service-hyper"]
 
+[dependencies]
+futures-preview = "0.3.0-alpha.18"
+http = "0.1"
+http-service = { git = "https://github.com/rustasync/http-service", branch = "tokio-0.2" }
+http-service-hyper = { git = "https://github.com/rustasync/http-service", branch = "tokio-0.2", optional = true }
+# Routing
+fnv = "1.0.6"
+route-recognizer = "0.1.13"
+# Tide components
+tide-cookies = { path = "./tide-cookies", optional = true, default-features = false }
+tide-cors = { path = "./tide-cors", optional = true, default-features = false }
+tide-core = { path = "./tide-core", default-features = false }
+tide-headers = { path = "./tide-headers", default-features = false }
+tide-log = { path = "./tide-log", default-features = false }
+tide-forms = { path = "./tide-forms", default-features = false }
+tide-querystring = { path = "./tide-querystring", default-features = false }
+
 [dev-dependencies]
-basic-cookies = "0.1.3"
 bytes = "0.4.12"
+cookie = { version = "0.12", features = ["percent-encode"] }
+env_logger = "0.7.0"
 futures-fs = "0.0.5"
-futures-util-preview = { version = "0.3.0-alpha.16", features = ["compat"] }
-http-service-mock = "0.2.0"
-juniper = "0.11.1"
+futures-util-preview = { version = "0.3.0-alpha.18", features = ["compat"] }
+http-service-mock = { git = "https://github.com/rustasync/http-service", branch = "tokio-0.2" }
+juniper = "0.14.0"
+log = "0.4.6"
+log4rs = "0.8.3"
 mime = "0.3.13"
-mime_guess = "2.0.0-alpha.6"
-percent-encoding = "1.0.1"
-serde = { version = "1.0.90", features = ["derive"] }
-structopt = "0.2.15"
+mime_guess = "2.0.1"
+percent-encoding = "2.0.0"
+serde = { version = "1.0.91", features = ["derive"] }
+tera = "0.11"
+runtime = "0.3.0-alpha.7"
+# Tide components
+tide-log = { path = "./tide-log", default-features = false }
+tokio = "0.2.0-alpha.4"
 
-[patch.crates-io]
-http-service = { git = "https://github.com/rustasync/http-service", branch = "master" }
-http-service-hyper = { git = "https://github.com/rustasync/http-service", branch = "master" }
-http-service-mock = { git = "https://github.com/rustasync/http-service", branch = "master" }
+[workspace]
+members = [
+    "tide-compression",
+    "tide-cookies",
+    "tide-core",
+    "tide-cors",
+    "tide-forms",
+    "tide-headers",
+    "tide-log",
+    "tide-panic",
+    "tide-querystring",
+    "tide-slog",
+]

README.md

@@ -59,26 +59,26 @@ Ecosystem WG, and **not ready for production use yet**.
 
 **Hello World**
 
-```rust
-#![feature(async_await)]
-
-fn main() -> Result<(), std::io::Error> {
+```rust,no_run
+#[tokio::main]
+async fn main() -> Result<(), std::io::Error> {
     let mut app = tide::App::new();
-    app.at("/").get(async move |_| "Hello, world!");
-    Ok(app.serve("127.0.0.1:8000")?)
+    app.at("/").get(|_| async move { "Hello, world!" });
+    app.serve("127.0.0.1:8000").await
 }
 ```
 
 **More Examples**
 
-- [Hello World](https://github.com/rustasync/tide/tree/master/examples/hello.rs)
+- [Hello World](https://github.com/rustasync/tide/blob/master/examples/hello.rs)
 - [Messages](https://github.com/rustasync/tide/blob/master/examples/messages.rs)
 - [Body Types](https://github.com/rustasync/tide/blob/master/examples/body_types.rs)
-- [Multipart Form](https://github.com/rustasync/tide/tree/master/examples/multipart-form/main.rs)
-- [Catch All](https://github.com/rustasync/tide/tree/master/examples/catch_all.rs)
-- [Cookies](https://github.com/rustasync/tide/tree/master/examples/cookies.rs)
-- [Default Headers](https://github.com/rustasync/tide/tree/master/examples/default_headers.rs)
-- [GraphQL](https://github.com/rustasync/tide/tree/master/examples/graphql.rs)
+- [Multipart Form](https://github.com/rustasync/tide/blob/master/examples/multipart_form/mod.rs)
+- [Catch All](https://github.com/rustasync/tide/blob/master/examples/catch_all.rs)
+- [Cookies](https://github.com/rustasync/tide/blob/master/examples/cookies.rs)
+- [Default Headers](https://github.com/rustasync/tide/blob/master/examples/default_headers.rs)
+- [GraphQL](https://github.com/rustasync/tide/blob/master/examples/graphql.rs)
+- [Staticfile](https://github.com/rustasync/tide/blob/master/examples/staticfile.rs)
 
 ## Resources
 

examples/body_types.rs

@@ -1,9 +1,7 @@
-#![feature(async_await)]
-
 use serde::{Deserialize, Serialize};
 use tide::{
     error::ResultExt,
-    forms::{self, ExtractForms},
+    forms::{self, ContextExt},
     response, App, Context, EndpointResult,
 };
 
@@ -13,41 +11,38 @@ struct Message {
     contents: String,
 }
 
-#[allow(unused_mut)] // Workaround clippy bug
 async fn echo_string(mut cx: Context<()>) -> String {
     let msg = cx.body_string().await.unwrap();
     println!("String: {}", msg);
     msg
 }
 
-#[allow(unused_mut)] // Workaround clippy bug
 async fn echo_bytes(mut cx: Context<()>) -> Vec<u8> {
     let msg = cx.body_bytes().await.unwrap();
     println!("Bytes: {:?}", msg);
     msg
 }
 
-#[allow(unused_mut)] // Workaround clippy bug
 async fn echo_json(mut cx: Context<()>) -> EndpointResult {
-    let msg = cx.body_json().await.client_err()?;
+    let msg: Message = cx.body_json().await.client_err()?;
     println!("JSON: {:?}", msg);
     Ok(response::json(msg))
 }
 
-#[allow(unused_mut)] // Workaround clippy bug
 async fn echo_form(mut cx: Context<()>) -> EndpointResult {
-    let msg = cx.body_form().await?;
+    let msg: Message = cx.body_form().await?;
     println!("Form: {:?}", msg);
     Ok(forms::form(msg))
 }
 
-fn main() {
+#[tokio::main]
+async fn main() {
     let mut app = App::new();
 
     app.at("/echo/string").post(echo_string);
     app.at("/echo/bytes").post(echo_bytes);
     app.at("/echo/json").post(echo_json);
     app.at("/echo/form").post(echo_form);
 
-    app.serve("127.0.0.1:8000").unwrap();
+    app.serve("127.0.0.1:8000").await.unwrap();
 }

examples/catch_all.rs

@@ -1,14 +1,13 @@
-#![feature(async_await)]
-
 use tide::Context;
 
 async fn echo_path(cx: Context<()>) -> String {
     let path: String = cx.param("path").unwrap();
     format!("Your path is: {}", path)
 }
 
-fn main() {
+#[tokio::main]
+async fn main() {
     let mut app = tide::App::new();
     app.at("/echo_path/*path").get(echo_path);
-    app.serve("127.0.0.1:8000").unwrap();
+    app.serve("127.0.0.1:8000").await.unwrap();
 }

examples/cookies.rs

@@ -1,30 +1,26 @@
-#![feature(async_await)]
-
 use cookie::Cookie;
 use tide::{cookies::ContextExt, middleware::CookiesMiddleware, Context};
 
 /// Tide will use the the `Cookies`'s `Extract` implementation to build this parameter.
-///
 async fn retrieve_cookie(mut cx: Context<()>) -> String {
     format!("hello cookies: {:?}", cx.get_cookie("hello").unwrap())
 }
 
-#[allow(unused_mut)] // Workaround clippy bug
 async fn set_cookie(mut cx: Context<()>) {
     cx.set_cookie(Cookie::new("hello", "world")).unwrap();
 }
 
-#[allow(unused_mut)] // Workaround clippy bug
 async fn remove_cookie(mut cx: Context<()>) {
     cx.remove_cookie(Cookie::named("hello")).unwrap();
 }
 
-fn main() {
+#[tokio::main]
+async fn main() {
     let mut app = tide::App::new();
     app.middleware(CookiesMiddleware::new());
 
     app.at("/").get(retrieve_cookie);
     app.at("/set").get(set_cookie);
     app.at("/remove").get(remove_cookie);
-    app.serve("127.0.0.1:8000").unwrap();
+    app.serve("127.0.0.1:8000").await.unwrap();
 }

examples/cors.rs

@@ -0,0 +1,25 @@
+use http::header::HeaderValue;
+use tide::middleware::{CorsMiddleware, CorsOrigin};
+
+#[tokio::main]
+async fn main() {
+    let mut app = tide::App::new();
+
+    app.middleware(
+        CorsMiddleware::new()
+            .allow_origin(CorsOrigin::from("*"))
+            .allow_methods(HeaderValue::from_static("GET, POST, OPTIONS")),
+    );
+
+    app.at("/").get(|_| async move { "Hello, world!" });
+
+    app.serve("127.0.0.1:8000").await.unwrap();
+}
+
+// You can test this by running the following in your browser:
+//
+// ```console
+// $ fetch("http://127.0.0.1:8000")
+// ```
+//
+// You will probably get a browser alert when running without cors middleware.