diff --git a/CHANGES.md b/CHANGES.md index 9a3b7fe3e..88d781d10 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,26 +1,29 @@ # Changes +## Unreleased - 2021-xx-xx + + ## Unreleased - 2021-xx-xx ### Added * The method `Either, web::Form>::into_inner()` which returns the inner type for whichever variant was created. Also works for `Either, web::Json>`. [#1894] * Add `services!` macro for helping register multiple services to `App`. [#1933] -* Enable registering vector of same type of `HttpServiceFactory` to `App` [#1933] +* Enable registering a vec of services of the same type to `App` [#1933] ### Changed * Rework `Responder` trait to be sync and returns `Response`/`HttpResponse` directly. - Making it more simple and performant. [#1891] -* `ServiceRequest::into_parts` and `ServiceRequest::from_parts` would not fail. - `ServiceRequest::from_request` would not fail and no payload would be generated [#1893] + Making it simpler and more performant. [#1891] +* `ServiceRequest::into_parts` and `ServiceRequest::from_parts` can no longer fail. [#1893] +* `ServiceRequest::from_request` can no longer fail. [#1893] * Our `Either` type now uses `Left`/`Right` variants (instead of `A`/`B`) [#1894] -* `test::{call_service, read_response, read_response_json, send_request}` take `&Service` +* `test::{call_service, read_response, read_response_json, send_request}` take `&Service` in argument [#1905] -* `App::wrap_fn`, `Resource::wrap_fn` and `Scope::wrap_fn` would give `&Service` in closure - argument [#1905] -* `web::block` accept any closure that has an output bound to `Send` and `'static`. [#1957] - +* `App::wrap_fn`, `Resource::wrap_fn` and `Scope::wrap_fn` provide `&Service` in closure + argument. [#1905] +* `web::block` no longer requires the output is a Result. [#1957] + ### Fixed -* Multiple calls `App::data` with the same type now keeps the latest call's data. [#1906] +* Multiple calls to `App::data` with the same type now keeps the latest call's data. [#1906] ### Removed * Public field of `web::Path` has been made private. [#1894] diff --git a/Cargo.toml b/Cargo.toml index eaaeba47e..217594a48 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "actix-web" -version = "4.0.0-beta.1" +version = "4.0.0-beta.2" authors = ["Nikolay Kim "] description = "Actix Web is a powerful, pragmatic, and extremely fast web framework for Rust" readme = "README.md" diff --git a/actix-files/Cargo.toml b/actix-files/Cargo.toml index b4317596c..506669656 100644 --- a/actix-files/Cargo.toml +++ b/actix-files/Cargo.toml @@ -17,7 +17,7 @@ name = "actix_files" path = "src/lib.rs" [dependencies] -actix-web = { version = "4.0.0-beta.1", default-features = false } +actix-web = { version = "4.0.0-beta.2", default-features = false } actix-service = "2.0.0-beta.4" askama_escape = "0.10" @@ -33,4 +33,4 @@ percent-encoding = "2.1" [dev-dependencies] actix-rt = "2" -actix-web = "4.0.0-beta.1" +actix-web = "4.0.0-beta.2" diff --git a/actix-http-test/Cargo.toml b/actix-http-test/Cargo.toml index b3a35b313..5024aa153 100644 --- a/actix-http-test/Cargo.toml +++ b/actix-http-test/Cargo.toml @@ -51,5 +51,5 @@ time = { version = "0.2.23", default-features = false, features = ["std"] } tls-openssl = { version = "0.10.9", package = "openssl", optional = true } [dev-dependencies] -actix-web = "4.0.0-beta.1" +actix-web = "4.0.0-beta.2" actix-http = "3.0.0-beta.2" diff --git a/actix-http/CHANGES.md b/actix-http/CHANGES.md index 5b7c69a6f..07a64701e 100644 --- a/actix-http/CHANGES.md +++ b/actix-http/CHANGES.md @@ -21,11 +21,12 @@ * Renamed `IntoHeaderValue::{try_into => try_into_value}` to avoid ambiguity with std `TryInto` trait. [#1894] * `Extensions::insert` returns Option of replaced item. [#1904] -* Remove `HttpResponseBuilder::json2()` and make `HttpResponseBuilder::json()` take a value by - reference. [#1903] -* `client::error::ConnectError` Resolver variant contains `Box` type [#1905] +* Remove `HttpResponseBuilder::json2()`. [#1903] +* Enable `HttpResponseBuilder::json()` to receive data by value and reference. [#1903] +* `client::error::ConnectError` Resolver variant contains `Box` type. [#1905] * `client::ConnectorConfig` default timeout changed to 5 seconds. [#1905] -* Simplify `BlockingError` type to a struct. It's only triggered with blocking thread pool is dead. [#1957] +* Simplify `BlockingError` type to a unit struct. It's now only triggered when blocking thread pool + is dead. [#1957] * `HeaderMap::len` now returns number of values instead of number of keys. [#1964] * `HeaderMap::insert` now returns iterator of removed values. [#1964] * `HeaderMap::remove` now returns iterator of removed values. [#1964] diff --git a/actix-multipart/Cargo.toml b/actix-multipart/Cargo.toml index 99a92925c..e13c45714 100644 --- a/actix-multipart/Cargo.toml +++ b/actix-multipart/Cargo.toml @@ -16,7 +16,7 @@ name = "actix_multipart" path = "src/lib.rs" [dependencies] -actix-web = { version = "4.0.0-beta.1", default-features = false } +actix-web = { version = "4.0.0-beta.2", default-features = false } actix-utils = "3.0.0-beta.2" bytes = "1" diff --git a/actix-web-actors/Cargo.toml b/actix-web-actors/Cargo.toml index 926368e86..9320d7a93 100644 --- a/actix-web-actors/Cargo.toml +++ b/actix-web-actors/Cargo.toml @@ -19,7 +19,7 @@ path = "src/lib.rs" actix = { version = "0.11.0-beta.2", default-features = false } actix-codec = "0.4.0-beta.1" actix-http = "3.0.0-beta.2" -actix-web = { version = "4.0.0-beta.1", default-features = false } +actix-web = { version = "4.0.0-beta.2", default-features = false } bytes = "1" bytestring = "1" diff --git a/actix-web-codegen/Cargo.toml b/actix-web-codegen/Cargo.toml index 04bd10421..377427fd1 100644 --- a/actix-web-codegen/Cargo.toml +++ b/actix-web-codegen/Cargo.toml @@ -20,7 +20,7 @@ proc-macro2 = "1" [dev-dependencies] actix-rt = "2" -actix-web = "4.0.0-beta.1" +actix-web = "4.0.0-beta.2" futures-util = { version = "0.3.7", default-features = false } trybuild = "1" rustversion = "1" diff --git a/awc/Cargo.toml b/awc/Cargo.toml index 4f492b0bc..49f8d9fe1 100644 --- a/awc/Cargo.toml +++ b/awc/Cargo.toml @@ -61,7 +61,7 @@ tls-openssl = { version = "0.10.9", package = "openssl", optional = true } tls-rustls = { version = "0.19.0", package = "rustls", optional = true, features = ["dangerous_configuration"] } [dev-dependencies] -actix-web = { version = "4.0.0-beta.1", features = ["openssl"] } +actix-web = { version = "4.0.0-beta.2", features = ["openssl"] } actix-http = { version = "3.0.0-beta.2", features = ["openssl"] } actix-http-test = { version = "3.0.0-beta.1", features = ["openssl"] } actix-utils = "3.0.0-beta.1"