bump actix-web to 4.0.0-rc.1

actix-redis/CHANGES.md

@@ -1,6 +1,7 @@
 # Changes
 
 ## Unreleased - 2021-xx-xx
+- Update `actix-web` dependency to `4.0.0-rc.1`.
 
 
 ## 0.10.0-beta.5 - 2021-12-29

actix-redis/Cargo.toml

@@ -30,7 +30,6 @@ web = [
 
 [dependencies]
 actix = { version = "0.12.0", default-features = false }
-actix-rt = { version = "2.1", default-features = false }
 actix-service = "2.0.0"
 actix-tls = { version = "3.0.0-rc.2", default-features = false, features = ["connect"] }
 
@@ -45,15 +44,15 @@ tokio = { version = "1.13.1", features = ["sync"] }
 tokio-util = "0.6.1"
 
 # actix-session
-actix-web = { version = "4.0.0-beta.18", default_features = false, optional = true }
+actix-web = { version = "4.0.0-rc.1", default_features = false, optional = true }
 actix-session = { version = "0.5.0-beta.7", 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.10"
-actix-rt = "2.1"
+actix-test = "0.1.0-beta.12"
+actix-web = { version = "4.0.0-rc.2", default_features = false, features = ["macros"] }
 env_logger = "0.9"
 serde = { version = "1.0.101", features = ["derive"] }
 

actix-redis/examples/authentication.rs

@@ -68,7 +68,7 @@ async fn secret(session: Session) -> Result<impl Responder, Error> {
     Ok("secret revealed")
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> std::io::Result<()> {
     std::env::set_var("RUST_LOG", "actix_web=info,actix_redis=info");
     env_logger::init();

actix-redis/examples/basic.rs

@@ -17,7 +17,7 @@ async fn index(req: HttpRequest, session: Session) -> Result<impl Responder, Err
     Ok("Welcome!")
 }
 
-#[actix_rt::main]
+#[actix_web::main]
 async fn main() -> std::io::Result<()> {
     std::env::set_var("RUST_LOG", "actix_web=info,actix_redis=info");
     env_logger::init();

actix-redis/src/redis.rs

@@ -2,9 +2,9 @@ use std::collections::VecDeque;
 use std::io;
 
 use actix::prelude::*;
-use actix_rt::net::TcpStream;
 use actix_service::boxed::{self, BoxService};
 use actix_tls::connect::{ConnectError, ConnectInfo, Connection, ConnectorService};
+use actix_web::rt::net::TcpStream;
 use backoff::backoff::Backoff;
 use backoff::ExponentialBackoff;
 use log::{error, info, warn};

actix-redis/src/session.rs

@@ -447,7 +447,7 @@ mod test {
         Ok(HttpResponse::Ok().body(body))
     }
 
-    #[actix_rt::test]
+    #[actix_web::test]
     async fn test_session_workflow() {
         // Step 1:  GET index
         //   - set-cookie actix-session should NOT be in response (session data is empty)
@@ -653,7 +653,7 @@ mod test {
         );
     }
 
-    #[actix_rt::test]
+    #[actix_web::test]
     async fn test_max_age_session_only() {
         //
         // Test that removing max_age results in a session-only cookie

actix-redis/tests/test_redis.rs

@@ -3,7 +3,7 @@ extern crate redis_async;
 
 use actix_redis::{Command, Error, RedisActor, RespValue};
 
-#[actix_rt::test]
+#[actix_web::test]
 async fn test_error_connect() {
     let addr = RedisActor::start("localhost:54000");
     let _addr2 = addr.clone();
@@ -15,7 +15,7 @@ async fn test_error_connect() {
     }
 }
 
-#[actix_rt::test]
+#[actix_web::test]
 async fn test_redis() {
     env_logger::init();