Merge pull request headzoo#111 from http-rs/futures-0.3

Futures 0.3

Cargo.toml

@@ -14,14 +14,14 @@ edition = "2018"
 [features]
 default = ["native-client", "middleware-logger", "encoding"]
 native-client = ["curl-client", "wasm-client"]
-hyper-client = ["hyper", "runtime", "runtime-raw", "runtime-tokio" ]
+hyper-client = ["hyper", "hyper-tls", "native-tls", "runtime", "runtime-raw", "runtime-tokio" ]
 curl-client = ["isahc"]
 wasm-client = ["js-sys", "web-sys", "wasm-bindgen", "wasm-bindgen-futures"]
 middleware-logger = []
 encoding = ["encoding_rs"]
 
 [dependencies]
-futures-preview = { version = "0.3.0-alpha.19", features = ["compat", "io-compat"] }
+futures = { version = "0.3.1", features = ["compat", "io-compat"] }
 http = "0.1.17"
 log = { version = "0.4.7", features = ["kv_unstable"] }
 mime = "0.3.13"
@@ -36,7 +36,7 @@ url = "2.0.0"
 encoding_rs = { version = "0.8.20", optional = true }
 
 # isahc-client
-isahc = { version = "0.7", optional = true, default-features = false, features = ["http2"]  }
+isahc = { version = "0.8", optional = true, default-features = false, features = ["http2"]  }
 
 # hyper-client
 hyper = { version = "0.12.32", optional = true, default-features = false }
@@ -50,7 +50,7 @@ runtime-tokio = { version = "0.3.0-alpha.5", optional = true }
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 js-sys = { version = "0.3.25", optional = true }
 wasm-bindgen = { version = "0.2.48", optional = true }
-wasm-bindgen-futures = { version = "0.3.25", features = ["futures_0_3"], optional = true }
+wasm-bindgen-futures = { version = "0.4.5", optional = true }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies.web-sys]
 version = "0.3.25"
@@ -72,7 +72,6 @@ features = [
 ]
 
 [dev-dependencies]
-async-std = "0.99.10"
+async-std = { version = "1.0", features = ["attributes"] }
 femme = "1.1.0"
-runtime = "0.3.0-alpha.6"
 serde = { version = "1.0.97", features = ["derive"] }

src/client.rs

@@ -9,7 +9,7 @@ use super::http_client::native::NativeClient;
 /// # Examples
 ///
 /// ```no_run
-/// # #[runtime::main]
+/// # #[async_std::main]
 /// # async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
 /// let client = surf::Client::new();
 /// let req1 = client.get("https://httpbin.org/get").recv_string();
@@ -29,7 +29,7 @@ impl Client<NativeClient> {
     /// # Examples
     ///
     /// ```no_run
-    /// # #[runtime::main]
+    /// # #[async_std::main]
     /// # async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
     /// let client = surf::Client::new();
     /// # Ok(()) }
@@ -62,7 +62,7 @@ impl<C: HttpClient> Client<C> {
     /// # Examples
     ///
     /// ```no_run
-    /// # #[runtime::main]
+    /// # #[async_std::main]
     /// # async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
     /// let client = surf::Client::new();
     /// let string = client.get("https://httpbin.org/get").recv_string().await?;
@@ -86,7 +86,7 @@ impl<C: HttpClient> Client<C> {
     /// # Examples
     ///
     /// ```no_run
-    /// # #[runtime::main]
+    /// # #[async_std::main]
     /// # async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
     /// let client = surf::Client::new();
     /// let string = client.head("https://httpbin.org/head").recv_string().await?;
@@ -110,7 +110,7 @@ impl<C: HttpClient> Client<C> {
     /// # Examples
     ///
     /// ```no_run
-    /// # #[runtime::main]
+    /// # #[async_std::main]
     /// # async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
     /// let client = surf::Client::new();
     /// let string = client.post("https://httpbin.org/post").recv_string().await?;
@@ -134,7 +134,7 @@ impl<C: HttpClient> Client<C> {
     /// # Examples
     ///
     /// ```no_run
-    /// # #[runtime::main]
+    /// # #[async_std::main]
     /// # async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
     /// let client = surf::Client::new();
     /// let string = client.put("https://httpbin.org/put").recv_string().await?;
@@ -158,7 +158,7 @@ impl<C: HttpClient> Client<C> {
     /// # Examples
     ///
     /// ```no_run
-    /// # #[runtime::main]
+    /// # #[async_std::main]
     /// # async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
     /// let client = surf::Client::new();
     /// let string = client.delete("https://httpbin.org/delete").recv_string().await?;
@@ -182,7 +182,7 @@ impl<C: HttpClient> Client<C> {
     /// # Examples
     ///
     /// ```no_run
-    /// # #[runtime::main]
+    /// # #[async_std::main]
     /// # async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
     /// let client = surf::Client::new();
     /// let string = client.connect("https://httpbin.org/connect").recv_string().await?;
@@ -206,7 +206,7 @@ impl<C: HttpClient> Client<C> {
     /// # Examples
     ///
     /// ```no_run
-    /// # #[runtime::main]
+    /// # #[async_std::main]
     /// # async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
     /// let client = surf::Client::new();
     /// let string = client.options("https://httpbin.org/options").recv_string().await?;
@@ -230,7 +230,7 @@ impl<C: HttpClient> Client<C> {
     /// # Examples
     ///
     /// ```no_run
-    /// # #[runtime::main]
+    /// # #[async_std::main]
     /// # async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
     /// let client = surf::Client::new();
     /// let string = client.trace("https://httpbin.org/trace").recv_string().await?;
@@ -254,7 +254,7 @@ impl<C: HttpClient> Client<C> {
     /// # Examples
     ///
     /// ```no_run
-    /// # #[runtime::main]
+    /// # #[async_std::main]
     /// # async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
     /// let client = surf::Client::new();
     /// let string = client.patch("https://httpbin.org/patch").recv_string().await?;

src/http_client/mod.rs

@@ -1,6 +1,6 @@
 //! HTTP Client Interface
 use futures::future::BoxFuture;
-use futures::io::AsyncRead;
+use futures::io::{AsyncRead, Cursor};
 
 use std::error::Error;
 use std::fmt::{self, Debug};
@@ -96,7 +96,7 @@ impl From<Vec<u8>> for Body {
     #[inline]
     fn from(vec: Vec<u8>) -> Body {
         Self {
-            reader: Box::new(io::Cursor::new(vec)),
+            reader: Box::new(Cursor::new(vec)),
         }
     }
 }

src/lib.rs

@@ -14,7 +14,7 @@
 //!
 //! # Examples
 //! ```no_run
-//! # #[runtime::main]
+//! # #[async_std::main]
 //! # async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
 //! let mut res = surf::get("https://httpbin.org/get").await?;
 //! dbg!(res.body_string().await?);
@@ -23,7 +23,7 @@
 //!
 //! It's also possible to skip the intermediate `Response`, and access the response type directly.
 //! ```no_run
-//! # #[runtime::main]
+//! # #[async_std::main]
 //! # async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
 //! dbg!(surf::get("https://httpbin.org/get").recv_string().await?);
 //! # Ok(()) }
@@ -32,7 +32,7 @@
 //! Both sending and receiving JSON is real easy too.
 //! ```no_run
 //! # use serde::{Deserialize, Serialize};
-//! # #[runtime::main]
+//! # #[async_std::main]
 //! # async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
 //! #[derive(Deserialize, Serialize)]
 //! struct Ip {
@@ -53,7 +53,7 @@
 //! And even creating streaming proxies is no trouble at all.
 //!
 //! ```no_run
-//! # #[runtime::main]
+//! # #[async_std::main]
 //! # async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
 //! let reader = surf::get("https://img.fyi/q6YvNqP").await?;
 //! let res = surf::post("https://box.rs/upload").body(reader).await?;

src/middleware/logger/mod.rs

@@ -3,7 +3,7 @@
 //! # Examples
 //!
 //! ```
-//! # #[runtime::main]
+//! # #[async_std::main]
 //! # async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
 //! let mut res = surf::get("https://httpbin.org/get")
 //!     .middleware(surf::middleware::logger::new())
@@ -29,7 +29,7 @@ use native::Logger;
 /// # Examples
 ///
 /// ```
-/// # #[runtime::main]
+/// # #[async_std::main]
 /// # async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
 /// let mut res = surf::get("https://httpbin.org/get")
 ///     .middleware(surf::middleware::logger::new())

src/one_off.rs

@@ -25,7 +25,7 @@ use super::Request;
 /// # Examples
 ///
 /// ```no_run
-/// # #[runtime::main]
+/// # #[async_std::main]
 /// # async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
 /// let string = surf::get("https://httpbin.org/get").recv_string().await?;
 /// # Ok(()) }
@@ -66,7 +66,7 @@ pub fn get(uri: impl AsRef<str>) -> Request<NativeClient> {
 /// # Examples
 ///
 /// ```no_run
-/// # #[runtime::main]
+/// # #[async_std::main]
 /// # async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
 /// let string = surf::head("https://httpbin.org/head").recv_string().await?;
 /// # Ok(()) }
@@ -124,7 +124,7 @@ pub fn head(uri: impl AsRef<str>) -> Request<NativeClient> {
 /// # Examples
 ///
 /// ```no_run
-/// # #[runtime::main]
+/// # #[async_std::main]
 /// # async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
 /// let string = surf::post("https://httpbin.org/post").recv_string().await?;
 /// # Ok(()) }
@@ -160,7 +160,7 @@ pub fn post(uri: impl AsRef<str>) -> Request<NativeClient> {
 /// # Examples
 ///
 /// ```no_run
-/// # #[runtime::main]
+/// # #[async_std::main]
 /// # async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
 /// let string = surf::put("https://httpbin.org/put").recv_string().await?;
 /// # Ok(()) }
@@ -191,7 +191,7 @@ pub fn put(uri: impl AsRef<str>) -> Request<NativeClient> {
 /// # Examples
 ///
 /// ```no_run
-/// # #[runtime::main]
+/// # #[async_std::main]
 /// # async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
 /// let string = surf::delete("https://httpbin.org/delete").recv_string().await?;
 /// # Ok(()) }
@@ -231,7 +231,7 @@ pub fn delete(uri: impl AsRef<str>) -> Request<NativeClient> {
 /// # Examples
 ///
 /// ```no_run
-/// # #[runtime::main]
+/// # #[async_std::main]
 /// # async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
 /// let string = surf::connect("https://httpbin.org/connect").recv_string().await?;
 /// # Ok(()) }
@@ -264,7 +264,7 @@ pub fn connect(uri: impl AsRef<str>) -> Request<NativeClient> {
 /// # Examples
 ///
 /// ```no_run
-/// # #[runtime::main]
+/// # #[async_std::main]
 /// # async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
 /// let string = surf::options("https://httpbin.org/options").recv_string().await?;
 /// # Ok(()) }
@@ -301,7 +301,7 @@ pub fn options(uri: impl AsRef<str>) -> Request<NativeClient> {
 /// # Examples
 ///
 /// ```no_run
-/// # #[runtime::main]
+/// # #[async_std::main]
 /// # async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
 /// let string = surf::trace("https://httpbin.org/trace").recv_string().await?;
 /// # Ok(()) }
@@ -344,7 +344,7 @@ pub fn trace(uri: impl AsRef<str>) -> Request<NativeClient> {
 /// # Examples
 ///
 /// ```no_run
-/// # #[runtime::main]
+/// # #[async_std::main]
 /// # async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
 /// let string = surf::patch("https://httpbin.org/patch").recv_string().await?;
 /// # Ok(()) }