diff --git a/actix-cors/CHANGES.md b/actix-cors/CHANGES.md index 8030f2169..f54b0b5df 100644 --- a/actix-cors/CHANGES.md +++ b/actix-cors/CHANGES.md @@ -1,7 +1,8 @@ # Changes ## Unreleased - 2021-xx-xx -- Ensure that preflight responses contain a Vary header. [#224] +- Update `actix-web` dependency to 4.0. +- Ensure that preflight responses contain a `Vary` header. [#224] [#224]: https://github.com/actix/actix-extras/pull/224 diff --git a/actix-cors/Cargo.toml b/actix-cors/Cargo.toml index d73b88950..88cc377a8 100644 --- a/actix-cors/Cargo.toml +++ b/actix-cors/Cargo.toml @@ -19,7 +19,7 @@ path = "src/lib.rs" [dependencies] actix-service = "2" actix-utils = "3" -actix-web = { version = "4.0.0-rc.1", default-features = false } +actix-web = { version = "4", default-features = false } derive_more = "0.99.5" futures-util = { version = "0.3.7", default-features = false } @@ -28,6 +28,6 @@ once_cell = "1" smallvec = "1.6.1" [dev-dependencies] -actix-web = { version = "4.0.0-rc.2", default_features = false, features = ["macros"] } +actix-web = { version = "4", default_features = false, features = ["macros"] } env_logger = "0.9" regex = "1.4" diff --git a/actix-cors/src/builder.rs b/actix-cors/src/builder.rs index 6d55671c9..e1dec6960 100644 --- a/actix-cors/src/builder.rs +++ b/actix-cors/src/builder.rs @@ -578,7 +578,7 @@ mod test { dev::{fn_service, Transform}, http::{header::HeaderName, StatusCode}, test::{self, TestRequest}, - web::HttpResponse, + HttpResponse, }; use super::*; diff --git a/actix-cors/src/inner.rs b/actix-cors/src/inner.rs index fb5756750..92fca0e80 100644 --- a/actix-cors/src/inner.rs +++ b/actix-cors/src/inner.rs @@ -360,7 +360,7 @@ mod test { }) .allow_any_method() .allow_any_header() - .new_transform(test::simple_service(StatusCode::NO_CONTENT)) + .new_transform(test::status_service(StatusCode::NO_CONTENT)) .await .unwrap(); diff --git a/actix-identity/Cargo.toml b/actix-identity/Cargo.toml index 976507354..c37ff9f6c 100644 --- a/actix-identity/Cargo.toml +++ b/actix-identity/Cargo.toml @@ -16,7 +16,7 @@ path = "src/lib.rs" [dependencies] actix-service = "2" actix-utils = "3" -actix-web = { version = "4.0.0-rc.1", default-features = false, features = ["cookies", "secure-cookies"] } +actix-web = { version = "4", default-features = false, features = ["cookies", "secure-cookies"] } futures-util = { version = "0.3.7", default-features = false } serde = { version = "1", features = ["derive"] } @@ -25,4 +25,4 @@ time = "0.3" [dev-dependencies] actix-http = "3.0.0-rc.1" -actix-web = { version = "4.0.0-rc.2", default_features = false, features = ["macros", "cookies", "secure-cookies"] } +actix-web = { version = "4", default_features = false, features = ["macros", "cookies", "secure-cookies"] } diff --git a/actix-protobuf/Cargo.toml b/actix-protobuf/Cargo.toml index b0da04fce..4d3f7e598 100644 --- a/actix-protobuf/Cargo.toml +++ b/actix-protobuf/Cargo.toml @@ -18,11 +18,11 @@ name = "actix_protobuf" path = "src/lib.rs" [dependencies] -actix-web = { version = "4.0.0-rc.1", default_features = false } +actix-web = { version = "4", default_features = false } derive_more = "0.99.5" futures-util = { version = "0.3.7", default-features = false } prost = { version = "0.9", default_features = false } [dev-dependencies] -actix-web = { version = "4.0.0-rc.2", default_features = false, features = ["macros"] } +actix-web = { version = "4", default_features = false, features = ["macros"] } prost = { version = "0.9", default_features = false, features = ["prost-derive"] } diff --git a/actix-protobuf/examples/prost-example/Cargo.toml b/actix-protobuf/examples/prost-example/Cargo.toml index cd4676ed2..f5baf4bae 100644 --- a/actix-protobuf/examples/prost-example/Cargo.toml +++ b/actix-protobuf/examples/prost-example/Cargo.toml @@ -8,7 +8,7 @@ authors = [ ] [dependencies] -actix-web = "4.0.0-rc.2" +actix-web = "4" actix-protobuf = { path = "../../" } env_logger = "0.8" diff --git a/actix-redis/Cargo.toml b/actix-redis/Cargo.toml index 9e72fa77a..a7aadba8a 100644 --- a/actix-redis/Cargo.toml +++ b/actix-redis/Cargo.toml @@ -45,7 +45,7 @@ tokio = { version = "1.13.1", features = ["sync"] } tokio-util = "0.6.1" # actix-session -actix-web = { version = "4.0.0-rc.1", default_features = false, optional = true } +actix-web = { version = "4", default_features = false, optional = true } actix-session = { version = "0.5.0-beta.8", optional = true } rand = { version = "0.8.0", optional = true } serde = { version = "1.0.101", optional = true } @@ -53,7 +53,7 @@ serde_json = { version = "1.0.40", optional = true } [dev-dependencies] actix-test = "0.1.0-beta.12" -actix-web = { version = "4.0.0-rc.2", default_features = false, features = ["macros"] } +actix-web = { version = "4", default_features = false, features = ["macros"] } env_logger = "0.9" serde = { version = "1.0.101", features = ["derive"] } diff --git a/actix-session/Cargo.toml b/actix-session/Cargo.toml index 98e2ce6c9..180e6929d 100644 --- a/actix-session/Cargo.toml +++ b/actix-session/Cargo.toml @@ -20,7 +20,7 @@ cookie-session = ["actix-web/secure-cookies"] [dependencies] actix-service = "2" actix-utils = "3" -actix-web = { version = "4.0.0-rc.1", default_features = false, features = ["cookies"] } +actix-web = { version = "4", default_features = false, features = ["cookies"] } derive_more = "0.99.5" futures-util = { version = "0.3.7", default-features = false } @@ -30,4 +30,4 @@ serde_json = "1.0" time = "0.3" [dev-dependencies] -actix-web = { version = "4.0.0-rc.2", default_features = false, features = ["macros", "cookies"] } +actix-web = { version = "4", default_features = false, features = ["macros", "cookies"] } diff --git a/actix-web-httpauth/Cargo.toml b/actix-web-httpauth/Cargo.toml index 7e50ccda5..323346c5a 100644 --- a/actix-web-httpauth/Cargo.toml +++ b/actix-web-httpauth/Cargo.toml @@ -20,7 +20,7 @@ path = "src/lib.rs" [dependencies] actix-service = "2" actix-utils = "3" -actix-web = { version = "4.0.0-rc.1", default_features = false } +actix-web = { version = "4", default_features = false } base64 = "0.13" futures-util = { version = "0.3.7", default-features = false } @@ -29,4 +29,4 @@ pin-project-lite = "0.2.7" [dev-dependencies] actix-cors = "0.6.0-beta.10" -actix-web = { version = "4.0.0-rc.2", default_features = false, features = ["macros"] } +actix-web = { version = "4", default_features = false, features = ["macros"] }