Merge pull request #77 from actix/master

-

CHANGES.md

@@ -8,6 +8,7 @@
   destructuring. [#1594]
 * `ServiceRequest::app_data` allows retrieval of non-Data data without splitting into parts to
   access `HttpRequest` which already allows this. [#1618]
+* Re-export all error types from `awc`. [#1621]
 * MSRV is now 1.42.0.
 
 ### Fixed
@@ -16,7 +17,8 @@
 [#1594]: https://github.com/actix/actix-web/pull/1594
 [#1609]: https://github.com/actix/actix-web/pull/1609
 [#1610]: https://github.com/actix/actix-web/pull/1610
-[#1618]: https://github.com/actix/actix-web/pull/1610
+[#1618]: https://github.com/actix/actix-web/pull/1618
+[#1621]: https://github.com/actix/actix-web/pull/1621
 
 
 ## 3.0.0-beta.1 - 2020-07-13

Cargo.toml

@@ -77,7 +77,7 @@ actix-threadpool = "0.3.1"
 actix-tls = "2.0.0-alpha.1"
 
 actix-web-codegen = "0.3.0-beta.1"
-actix-http = "2.0.0-alpha.4"
+actix-http = "2.0.0-beta.3"
 awc = { version = "2.0.0-beta.1", default-features = false }
 
 bytes = "0.5.3"

actix-files/Cargo.toml

@@ -18,7 +18,7 @@ path = "src/lib.rs"
 
 [dependencies]
 actix-web = { version = "3.0.0-beta.1", default-features = false }
-actix-http = "2.0.0-beta.1"
+actix-http = "2.0.0-beta.3"
 actix-service = "1.0.1"
 bitflags = "1"
 bytes = "0.5.3"

actix-http/CHANGES.md

@@ -1,6 +1,7 @@
 # Changes
 
-## Unreleased - 2020-xx-xx
+## [2.0.0-beta.3] - 2020-08-14
+
 ### Fixed
 * Memory leak of `client::pool::ConnectorPoolSupport`. [#1626]
 

actix-http/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "actix-http"
-version = "2.0.0-beta.2"
+version = "2.0.0-beta.3"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix HTTP primitives"
 readme = "README.md"

actix-multipart/Cargo.toml

@@ -29,4 +29,4 @@ twoway = "0.2"
 
 [dev-dependencies]
 actix-rt = "1.0.0"
-actix-http = "2.0.0-beta.1"
+actix-http = "2.0.0-beta.3"

actix-web-actors/Cargo.toml

@@ -18,7 +18,7 @@ path = "src/lib.rs"
 [dependencies]
 actix = "0.10.0-alpha.2"
 actix-web = { version = "3.0.0-beta.1", default-features = false }
-actix-http = "2.0.0-beta.1"
+actix-http = "2.0.0-beta.3"
 actix-codec = "0.2.0"
 bytes = "0.5.2"
 futures-channel = { version = "0.3.5", default-features = false }

awc/Cargo.toml

@@ -39,7 +39,7 @@ compress = ["actix-http/compress"]
 [dependencies]
 actix-codec = "0.2.0"
 actix-service = "1.0.1"
-actix-http = "2.0.0-beta.2"
+actix-http = "2.0.0-beta.3"
 actix-rt = "1.0.0"
 
 base64 = "0.12"
@@ -59,7 +59,7 @@ rust-tls = { version = "0.17.0", package = "rustls", optional = true, features =
 [dev-dependencies]
 actix-connect = { version = "2.0.0-alpha.2", features = ["openssl"] }
 actix-web = { version = "3.0.0-alpha.3", features = ["openssl"] }
-actix-http = { version = "2.0.0-beta.2", features = ["openssl"] }
+actix-http = { version = "2.0.0-beta.3", features = ["openssl"] }
 actix-http-test = { version = "2.0.0-alpha.1", features = ["openssl"] }
 actix-utils = "1.0.3"
 actix-server = "1.0.0"

src/lib.rs

@@ -213,9 +213,7 @@ pub mod client {
     //! }
     //! ```
 
-    pub use awc::error::{
-        ConnectError, InvalidUrl, PayloadError, SendRequestError, WsClientError,
-    };
+    pub use awc::error::*;
     pub use awc::{
         test, Client, ClientBuilder, ClientRequest, ClientResponse, Connector,
     };

test-server/Cargo.toml

@@ -53,4 +53,4 @@ open-ssl = { version = "0.10", package = "openssl", optional = true }
 
 [dev-dependencies]
 actix-web = "3.0.0-alpha.3"
-actix-http = "2.0.0-beta.1"
+actix-http = "2.0.0-beta.3"