Skip to content

Commit

Permalink
update actix-web dependency to 4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
robjtede committed Feb 25, 2022
1 parent d46ee46 commit 73a5ae9
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 16 deletions.
3 changes: 2 additions & 1 deletion actix-cors/CHANGES.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions actix-cors/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand All @@ -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"
2 changes: 1 addition & 1 deletion actix-cors/src/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ mod test {
dev::{fn_service, Transform},
http::{header::HeaderName, StatusCode},
test::{self, TestRequest},
web::HttpResponse,
HttpResponse,
};

use super::*;
Expand Down
2 changes: 1 addition & 1 deletion actix-cors/src/inner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
4 changes: 2 additions & 2 deletions actix-identity/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand All @@ -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"] }
4 changes: 2 additions & 2 deletions actix-protobuf/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
2 changes: 1 addition & 1 deletion actix-protobuf/examples/prost-example/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ authors = [
]

[dependencies]
actix-web = "4.0.0-rc.2"
actix-web = "4"
actix-protobuf = { path = "../../" }

env_logger = "0.8"
Expand Down
4 changes: 2 additions & 2 deletions actix-redis/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,15 @@ 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 }
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"] }

Expand Down
4 changes: 2 additions & 2 deletions actix-session/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand All @@ -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"] }
4 changes: 2 additions & 2 deletions actix-web-httpauth/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand All @@ -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"] }

0 comments on commit 73a5ae9

Please sign in to comment.