remove duplicate and unused deps

yoshuawuyts · yoshuawuyts · commit 03783acecf19 · 2020-05-17T02:54:31.000+02:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -30,6 +30,7 @@ unstable = []
 
 [dependencies]
 async-sse = "2.1.0"
+cookie = { version = "0.12.0", features = ["percent-encode"]}
 http-types = "1.0.1"
 async-h1 = { version = "1.1.2", optional = true }
 route-recognizer = "0.1.13"
@@ -38,29 +39,14 @@ serde_json = "1.0.41"
 serde_qs = "0.5.0"
 async-std = { version = "1.4.0", features = ["unstable"] }
 mime = "0.3.14"
-cookie = { version = "0.12.0", features = ["percent-encode"]}
-futures-core = "0.3.1"
-futures = { version = "0.3.1", optional = true }
-http = { version = "0.2.0", optional = true }
-tokio = { version = "0.2.13", optional = true }
-url = "2.1.1"
 kv-log-macro = "1.0.4"
 mime_guess = "2.0.3"
 
 [dev-dependencies]
 async-std = { version = "1.4.0", features = ["unstable", "attributes"] }
-basic-cookies = "0.1.3"
-bytes = "0.4.12"
-futures-fs = "0.0.5"
-futures-util = { version = "0.3.0", features = ["compat"] }
 juniper = "0.14.1"
-mime = "0.3.14"
-mime_guess = "2.0.1"
-percent-encoding = "2.1.0"
 serde = { version = "1.0.102", features = ["derive"] }
-structopt = "0.3.3"
 surf = "2.0.0-alpha.1"
-futures = "0.3.1"
 femme = "1.3.0"
 portpicker = "0.1.0"
 
diff --git a/src/cookies/middleware.rs b/src/cookies/middleware.rs
@@ -2,8 +2,8 @@ use crate::response::CookieEvent;
 use crate::utils::BoxFuture;
 use crate::{Middleware, Next, Request};
 
-use cookie::{Cookie, CookieJar};
-use http_types::headers;
+use crate::http::cookies::{Cookie, CookieJar};
+use crate::http::headers;
 
 use std::sync::{Arc, RwLock};
 
diff --git a/src/lib.rs b/src/lib.rs
@@ -25,7 +25,7 @@
 //!
 //! __hello world__
 //! ```no_run
-//! # use futures::executor::block_on;
+//! # use async_std::task::block_on;
 //! # fn main() -> Result<(), std::io::Error> { block_on(async {
 //! #
 //! let mut app = tide::new();
@@ -37,7 +37,7 @@
 //!
 //! __echo server__
 //! ```no_run
-//! # use futures::executor::block_on;
+//! # use async_std::task::block_on;
 //! # fn main() -> Result<(), std::io::Error> { block_on(async {
 //! #
 //! let mut app = tide::new();
@@ -49,7 +49,7 @@
 //!
 //! __send and receive json__
 //! ```no_run
-//! # use futures::executor::block_on;
+//! # use async_std::task::block_on;
 //! # fn main() -> Result<(), std::io::Error> { block_on(async {
 //! # use tide::{Request, Response};
 //! #
@@ -217,7 +217,7 @@ pub use http_types::{self as http, Body, Error, Status, StatusCode};
 /// # Examples
 ///
 /// ```no_run
-/// # use futures::executor::block_on;
+/// # use async_std::task::block_on;
 /// # fn main() -> Result<(), std::io::Error> { block_on(async {
 /// #
 /// let mut app = tide::new();
@@ -237,7 +237,7 @@ pub fn new() -> server::Server<()> {
 /// # Examples
 ///
 /// ```no_run
-/// # use futures::executor::block_on;
+/// # use async_std::task::block_on;
 /// # fn main() -> Result<(), std::io::Error> { block_on(async {
 /// #
 /// use tide::Request;
diff --git a/src/redirect/mod.rs b/src/redirect/mod.rs
@@ -3,7 +3,7 @@
 //! # Examples
 //!
 //! ```no_run
-//! # use futures::executor::block_on;
+//! # use async_std::task::block_on;
 //! # fn main() -> Result<(), std::io::Error> { block_on(async {
 //! #
 //! use tide::redirect;
diff --git a/src/redirect/permanent.rs b/src/redirect/permanent.rs
@@ -8,7 +8,7 @@ use crate::{Endpoint, Request, Response};
 ///
 /// # Examples
 /// ```no_run
-/// # use futures::executor::block_on;
+/// # use async_std::task::block_on;
 /// # fn main() -> Result<(), std::io::Error> { block_on(async {
 /// #
 /// use tide::redirect;
diff --git a/src/redirect/temporary.rs b/src/redirect/temporary.rs
@@ -8,7 +8,7 @@ use crate::{Endpoint, Request, Response};
 ///
 /// # Examples
 /// ```no_run
-/// # use futures::executor::block_on;
+/// # use async_std::task::block_on;
 /// # fn main() -> Result<(), std::io::Error> { block_on(async {
 /// #
 /// use tide::redirect;
diff --git a/src/request.rs b/src/request.rs
@@ -1,4 +1,3 @@
-use cookie::Cookie;
 use route_recognizer::Params;
 use serde::Deserialize;
 
@@ -8,7 +7,7 @@ use async_std::task::{Context, Poll};
 use std::pin::Pin;
 use std::{str::FromStr, sync::Arc};
 
-use crate::cookies::CookieData;
+use crate::cookies::{Cookie, CookieData};
 use crate::http::headers::{HeaderName, HeaderValue};
 use crate::http::{self, Method, StatusCode, Url, Version};
 use crate::Response;
@@ -45,7 +44,7 @@ impl<State> Request<State> {
     /// # Examples
     ///
     /// ```no_run
-    /// # use futures::executor::block_on;
+    /// # use async_std::task::block_on;
     /// # fn main() -> Result<(), std::io::Error> { block_on(async {
     /// #
     /// use tide::Request;
@@ -68,7 +67,7 @@ impl<State> Request<State> {
     /// # Examples
     ///
     /// ```no_run
-    /// # use futures::executor::block_on;
+    /// # use async_std::task::block_on;
     /// # fn main() -> Result<(), std::io::Error> { block_on(async {
     /// #
     /// use tide::Request;
@@ -91,7 +90,7 @@ impl<State> Request<State> {
     /// # Examples
     ///
     /// ```no_run
-    /// # use futures::executor::block_on;
+    /// # use async_std::task::block_on;
     /// # fn main() -> Result<(), std::io::Error> { block_on(async {
     /// #
     /// use tide::Request;
@@ -114,7 +113,7 @@ impl<State> Request<State> {
     /// # Examples
     ///
     /// ```no_run
-    /// # use futures::executor::block_on;
+    /// # use async_std::task::block_on;
     /// # fn main() -> Result<(), std::io::Error> { block_on(async {
     /// #
     /// use tide::Request;
@@ -196,7 +195,7 @@ impl<State> Request<State> {
     /// # Examples
     ///
     /// ```no_run
-    /// # use futures::executor::block_on;
+    /// # use async_std::task::block_on;
     /// # fn main() -> Result<(), std::io::Error> { block_on(async {
     /// #
     /// use tide::Request;
@@ -231,7 +230,7 @@ impl<State> Request<State> {
     /// # Examples
     ///
     /// ```no_run
-    /// # use futures::executor::block_on;
+    /// # use async_std::task::block_on;
     /// # fn main() -> Result<(), std::io::Error> { block_on(async {
     /// #
     /// use tide::Request;
diff --git a/src/response.rs b/src/response.rs
@@ -1,10 +1,10 @@
 use async_std::io::prelude::*;
 use std::convert::TryFrom;
 
-use cookie::Cookie;
 use mime::Mime;
 use serde::Serialize;
 
+use crate::http::cookies::Cookie;
 use crate::http::headers::{HeaderName, HeaderValue};
 use crate::http::{self, Body, StatusCode};
 
diff --git a/src/server.rs b/src/server.rs
@@ -141,7 +141,7 @@ impl Server<()> {
     /// # Examples
     ///
     /// ```no_run
-    /// # use futures::executor::block_on;
+    /// # use async_std::task::block_on;
     /// # fn main() -> Result<(), std::io::Error> { block_on(async {
     /// #
     /// let mut app = tide::new();
@@ -169,7 +169,7 @@ impl<State: Send + Sync + 'static> Server<State> {
     /// # Examples
     ///
     /// ```no_run
-    /// # use futures::executor::block_on;
+    /// # use async_std::task::block_on;
     /// # fn main() -> Result<(), std::io::Error> { block_on(async {
     /// #
     /// use tide::Request;
diff --git a/tests/cookies.rs b/tests/cookies.rs
@@ -1,6 +1,6 @@
-use cookie::Cookie;
-use futures::executor::block_on;
-use futures::AsyncReadExt;
+use tide::http::cookies::Cookie;
+use async_std::task::block_on;
+use async_std::prelude::*;
 
 use tide::{Request, Response, Server, StatusCode};
 
diff --git a/tests/querystring.rs b/tests/querystring.rs
@@ -1,5 +1,5 @@
 use async_std::prelude::*;
-use futures::executor::block_on;
+use async_std::task::block_on;
 use serde::Deserialize;
 use tide::{http, Request, Response, Server, StatusCode};
 
diff --git a/tests/response.rs b/tests/response.rs
@@ -1,54 +1,54 @@
-// use futures::executor::block_on;
-// use tide::*;
-
-// #[test]
-// fn test_status() {
-//     let resp = "foo"
-//         .with_status(http::status::StatusCode::NOT_FOUND)
-//         .into_response();
-//     assert_eq!(resp.status(), http::status::StatusCode::NOT_FOUND);
-//     assert_eq!(block_on(resp.into_body().into_vec()).unwrap(), b"foo");
-// }
-
-// #[test]
-// fn byte_vec_content_type() {
-//     let resp = String::from("foo").into_bytes().into_response();
-//     assert_eq!(resp.headers()["Content-Type"], "application/octet-stream");
-//     assert_eq!(block_on(resp.into_body().into_vec()).unwrap(), b"foo");
-// }
-
-// #[test]
-// fn string_content_type() {
-//     let resp = String::from("foo").into_response();
-//     assert_eq!(resp.headers()["Content-Type"], "text/plain; charset=utf-8");
-//     assert_eq!(block_on(resp.into_body().into_vec()).unwrap(), b"foo");
-// }
-
-// #[test]
-// fn json_content_type() {
-//     use std::collections::BTreeMap;
-
-//     let mut map = BTreeMap::new();
-//     map.insert(Some("a"), 2);
-//     map.insert(Some("b"), 4);
-//     map.insert(None, 6);
-
-//     let resp = json(map);
-//     assert_eq!(
-//         resp.status(),
-//         http::status::StatusCode::INTERNAL_SERVER_ERROR
-//     );
-//     assert_eq!(block_on(resp.into_body().into_vec()).unwrap(), b"");
-
-//     let mut map = BTreeMap::new();
-//     map.insert("a", 2);
-//     map.insert("b", 4);
-//     map.insert("c", 6);
-
-//     let resp = json(map);
-//     assert_eq!(resp.status(), http::status::StatusCode::OK);
-//     assert_eq!(
-//         block_on(resp.into_body().into_vec()).unwrap(),
-//         br##"{"a":2,"b":4,"c":6}"##
-//     );
-// }
+// use async_std::task::block_on;
+// use tide::*;
+
+// #[test]
+// fn test_status() {
+//     let resp = "foo"
+//         .with_status(http::status::StatusCode::NOT_FOUND)
+//         .into_response();
+//     assert_eq!(resp.status(), http::status::StatusCode::NOT_FOUND);
+//     assert_eq!(block_on(resp.into_body().into_vec()).unwrap(), b"foo");
+// }
+
+// #[test]
+// fn byte_vec_content_type() {
+//     let resp = String::from("foo").into_bytes().into_response();
+//     assert_eq!(resp.headers()["Content-Type"], "application/octet-stream");
+//     assert_eq!(block_on(resp.into_body().into_vec()).unwrap(), b"foo");
+// }
+
+// #[test]
+// fn string_content_type() {
+//     let resp = String::from("foo").into_response();
+//     assert_eq!(resp.headers()["Content-Type"], "text/plain; charset=utf-8");
+//     assert_eq!(block_on(resp.into_body().into_vec()).unwrap(), b"foo");
+// }
+
+// #[test]
+// fn json_content_type() {
+//     use std::collections::BTreeMap;
+
+//     let mut map = BTreeMap::new();
+//     map.insert(Some("a"), 2);
+//     map.insert(Some("b"), 4);
+//     map.insert(None, 6);
+
+//     let resp = json(map);
+//     assert_eq!(
+//         resp.status(),
+//         http::status::StatusCode::INTERNAL_SERVER_ERROR
+//     );
+//     assert_eq!(block_on(resp.into_body().into_vec()).unwrap(), b"");
+
+//     let mut map = BTreeMap::new();
+//     map.insert("a", 2);
+//     map.insert("b", 4);
+//     map.insert("c", 6);
+
+//     let resp = json(map);
+//     assert_eq!(resp.status(), http::status::StatusCode::OK);
+//     assert_eq!(
+//         block_on(resp.into_body().into_vec()).unwrap(),
+//         br##"{"a":2,"b":4,"c":6}"##
+//     );
+// }
diff --git a/tests/route_middleware.rs b/tests/route_middleware.rs
@@ -1,8 +1,10 @@
-use futures::future::BoxFuture;
-use http_types::headers::HeaderName;
+use http_types::{headers::HeaderName, Method, Request};
 use std::convert::TryInto;
 use tide::http::{self, Method};
 use tide::Middleware;
+use test_utils::BoxFuture;
+
+mod test_utils;
 
 #[derive(Debug)]
 struct TestMiddleware(HeaderName, &'static str);
diff --git a/tests/test_utils.rs b/tests/test_utils.rs
@@ -1,5 +1,14 @@
 use portpicker::pick_unused_port;
 
+use std::future::Future;
+use std::pin::Pin;
+
+/// An owned dynamically typed [`Future`] for use in cases where you can't
+/// statically type your result or need to add some indirection.
+#[allow(dead_code)]
+pub type BoxFuture<'a, T> = Pin<Box<dyn Future<Output = T> + Send + 'a>>;
+
+/// Find an unused port.
 pub async fn find_port() -> u16 {
     pick_unused_port().expect("No ports free")
 }
diff --git a/tests/wildcard.rs b/tests/wildcard.rs
