diff --git a/Cargo.toml b/Cargo.toml index cf66062..2366cf7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,7 +31,7 @@ members = [ "template_askama", "template_handlebars", "template_tera", - "template_yarte", +# "template_yarte", "todo", # "udp-echo", "unix-socket", diff --git a/async_db/Cargo.toml b/async_db/Cargo.toml index d87168e..631031e 100644 --- a/async_db/Cargo.toml +++ b/async_db/Cargo.toml @@ -7,7 +7,7 @@ workspace = ".." [dependencies] actix-rt = "1.0.0" -actix-web = "2.0.0-alpha.6" +actix-web = "2.0.0-rc" dotenv = "0.10" env_logger = "0.6" diff --git a/async_ex1/Cargo.toml b/async_ex1/Cargo.toml index e5f6bcc..effa2a8 100644 --- a/async_ex1/Cargo.toml +++ b/async_ex1/Cargo.toml @@ -7,7 +7,7 @@ workspace = ".." [dependencies] actix-rt = "1.0.0" -actix-web = { version="2.0.0-alpha.6", features=["openssl"] } +actix-web = { version="2.0.0-rc", features=["openssl"] } futures = "0.3.1" serde = "1.0.43" diff --git a/async_ex2/Cargo.toml b/async_ex2/Cargo.toml index edaa5b6..580a4b1 100644 --- a/async_ex2/Cargo.toml +++ b/async_ex2/Cargo.toml @@ -7,10 +7,10 @@ workspace = ".." [dependencies] actix-rt = "1.0.0" -actix-web = { version="2.0.0-alpha.6", features=["openssl"] } -actix-multipart = "0.2.0-alpha.2" +actix-web = { version="2.0.0-rc", features=["openssl"] } +actix-multipart = "0.2.0" actix-service = "1.0.0" -bytes = "0.5.2" +bytes = "0.5.3" env_logger = "0.6.1" futures = "0.3.1" serde = { version = "^1.0", features = ["derive"] } diff --git a/basics/Cargo.toml b/basics/Cargo.toml index 67230d5..9b72dd7 100644 --- a/basics/Cargo.toml +++ b/basics/Cargo.toml @@ -7,9 +7,9 @@ edition = "2018" [dependencies] actix-rt = "1.0.0" -actix-web = "2.0.0-alpha.6" -actix-files = "0.2.0-alpha.3" -actix-session = "0.3.0-alpha.3" +actix-web = "2.0.0-rc" +actix-files = "0.2.0" +actix-session = "0.3.0" actix-utils = "1.0.3" futures = "0.3.1" diff --git a/cookie-auth/Cargo.toml b/cookie-auth/Cargo.toml index 4b9b929..574c69e 100644 --- a/cookie-auth/Cargo.toml +++ b/cookie-auth/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" workspace = ".." [dependencies] -actix-web = "2.0.0-alpha.6" -actix-identity = "0.2.0-alpha.1" +actix-web = "2.0.0-rc" +actix-identity = "0.2.0" actix-rt = "1.0.0" env_logger = "0.6" diff --git a/cookie-session/Cargo.toml b/cookie-session/Cargo.toml index dcdf77d..1058817 100644 --- a/cookie-session/Cargo.toml +++ b/cookie-session/Cargo.toml @@ -6,8 +6,8 @@ workspace = ".." edition = "2018" [dependencies] -actix-web = "2.0.0-alpha.6" -actix-session = "0.3.0-alpha.3" +actix-web = "2.0.0-rc" +actix-session = "0.3.0" actix-rt = "1.0.0" futures = "0.3.1" diff --git a/diesel/Cargo.toml b/diesel/Cargo.toml index 9fce4ec..6ef8868 100644 --- a/diesel/Cargo.toml +++ b/diesel/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] actix-rt = "1.0.0" -actix-web = "2.0.0-alpha.6" +actix-web = "2.0.0-rc" bytes = "0.4" env_logger = "0.6" diff --git a/error_handling/Cargo.toml b/error_handling/Cargo.toml index bb9f51f..2561516 100644 --- a/error_handling/Cargo.toml +++ b/error_handling/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" workspace = ".." [dependencies] -actix-web = "2.0.0-alpha.6" +actix-web = "2.0.0-rc" actix-rt = "1.0.0" derive_more = "0.99.2" futures = "0.3.1" diff --git a/form/Cargo.toml b/form/Cargo.toml index 245ff32..e1dd1fe 100644 --- a/form/Cargo.toml +++ b/form/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" workspace = ".." [dependencies] -actix-web = "2.0.0-alpha.6" +actix-web = "2.0.0-rc" actix-rt = "1.0.0" serde = "1.0" serde_derive = "1.0" diff --git a/graphql-demo/Cargo.toml b/graphql-demo/Cargo.toml index b80245b..78f7b08 100644 --- a/graphql-demo/Cargo.toml +++ b/graphql-demo/Cargo.toml @@ -3,12 +3,11 @@ name = "actix-graphql-demo" version = "2.0.0" authors = ["Dwi Sulfahnur "] edition = "2018" -workspace = ".." # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -actix-web = "2.0.0-alpha.6" +actix-web = "2.0.0-rc" actix-rt = "1.0.0" futures = "0.3.1" diff --git a/hello-world/Cargo.toml b/hello-world/Cargo.toml index 1d0e603..6f4f5bb 100644 --- a/hello-world/Cargo.toml +++ b/hello-world/Cargo.toml @@ -2,10 +2,9 @@ name = "hello-world" version = "2.0.0" authors = ["Nikolay Kim "] -workspace = ".." edition = "2018" [dependencies] -actix-web = "2.0.0-alpha.6" +actix-web = "2.0.0-rc" actix-rt = "1.0.0" env_logger = "0.6" diff --git a/http-proxy/Cargo.toml b/http-proxy/Cargo.toml index cc10bcf..e8e64c6 100644 --- a/http-proxy/Cargo.toml +++ b/http-proxy/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] actix-rt = "1.0.0" -actix-web = { version = "2.0.0-alpha.6", features=["openssl"] } +actix-web = { version = "2.0.0-rc", features=["openssl"] } clap = "2.32.0" futures = "0.3.1" failure = "0.1.3" diff --git a/json/Cargo.toml b/json/Cargo.toml index 808ce12..cde8767 100644 --- a/json/Cargo.toml +++ b/json/Cargo.toml @@ -6,7 +6,7 @@ workspace = ".." edition = "2018" [dependencies] -actix-web = "2.0.0-alpha.6" +actix-web = "2.0.0-rc" actix-rt = "1.0.0" actix-service = "1.0.0" diff --git a/json_error/Cargo.toml b/json_error/Cargo.toml index 5fdec13..909f315 100644 --- a/json_error/Cargo.toml +++ b/json_error/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Kai Yao "] edition = "2018" [dependencies] -actix-web = "2.0.0-alpha.6" +actix-web = "2.0.0-rc" actix-rt = "1.0.0" failure = "0.1" futures = "0.3" diff --git a/jsonrpc/Cargo.toml b/jsonrpc/Cargo.toml index 546a05b..d96a936 100644 --- a/jsonrpc/Cargo.toml +++ b/jsonrpc/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" workspace = ".." [dependencies] -actix-web = "2.0.0-alpha.6" +actix-web = "2.0.0-rc" actix-rt = "1.0.0" bytes = "0.5" env_logger = "0.6" diff --git a/juniper/Cargo.toml b/juniper/Cargo.toml index 0e57c50..1e0739b 100644 --- a/juniper/Cargo.toml +++ b/juniper/Cargo.toml @@ -2,11 +2,10 @@ name = "juniper-example" version = "0.2.0" authors = ["pyros2097 "] -workspace = ".." edition = "2018" [dependencies] -actix-web = "2.0.0-alpha.6" +actix-web = "2.0.0-rc" actix-rt = "1.0.0" env_logger = "0.7.1" serde = "1.0.103" diff --git a/middleware/Cargo.toml b/middleware/Cargo.toml index 54715c7..c2a201b 100644 --- a/middleware/Cargo.toml +++ b/middleware/Cargo.toml @@ -3,12 +3,11 @@ name = "middleware-example" version = "1.0.0" authors = ["Gorm Casper ", "Sven-Hendrik Haase "] edition = "2018" -workspace = ".." [dependencies] actix-service = "1.0.0" actix-rt = "1.0.0" -actix-web = "2.0.0-alpha.6" +actix-web = "2.0.0-rc" futures = "0.3.1" env_logger = "0.6" bytes = "0.5" diff --git a/multipart/Cargo.toml b/multipart/Cargo.toml index f5ad551..1ee6fac 100644 --- a/multipart/Cargo.toml +++ b/multipart/Cargo.toml @@ -11,6 +11,6 @@ readme = "README.md" [dependencies] futures = "0.3.1" -actix-multipart = "0.2.0-alpha.3" -actix-web = "2.0.0-alpha.6" +actix-multipart = "0.2.0" +actix-web = "2.0.0-rc" actix-rt = "1.0.0" diff --git a/openssl/Cargo.toml b/openssl/Cargo.toml index dacef56..6445979 100644 --- a/openssl/Cargo.toml +++ b/openssl/Cargo.toml @@ -7,6 +7,6 @@ workspace = ".." [dependencies] actix-rt = "1.0.0" -actix-web = { version="2.0.0-alpha.6", features=["openssl"] } +actix-web = { version="2.0.0-rc", features=["openssl"] } env_logger = "0.6" openssl = "0.10" diff --git a/r2d2/Cargo.toml b/r2d2/Cargo.toml index 14797cf..bfef6c0 100644 --- a/r2d2/Cargo.toml +++ b/r2d2/Cargo.toml @@ -3,15 +3,14 @@ name = "r2d2-example" version = "1.0.0" authors = ["Nikolay Kim "] edition = "2018" -workspace = ".." [dependencies] actix-rt = "1.0.0" -actix-web = "2.0.0-alpha.6" +actix-web = "2.0.0-rc" futures = "0.3.1" env_logger = "0.6" -uuid = { version = "0.7", features = ["v4"] } +uuid = { version = "0.8", features = ["v4"] } r2d2 = "0.8" r2d2_sqlite = "0.8" diff --git a/redis-session/Cargo.toml b/redis-session/Cargo.toml index 33df152..233484c 100644 --- a/redis-session/Cargo.toml +++ b/redis-session/Cargo.toml @@ -6,9 +6,9 @@ edition = "2018" [dependencies] actix-rt = "1.0.0" -actix-web = "2.0.0-alpha.6" -actix-session = "0.3.0-alpha.3" -actix-redis = { version = "0.8.0-alpha.1", features = ["web"] } +actix-web = "2.0.0-rc" +actix-session = "0.3.0" +actix-redis = { version = "0.8.0", features = ["web"] } env_logger = "0.6" serde = { version = "^1.0", features = ["derive"] } actix-service = "1.0.0" diff --git a/redis/Cargo.toml b/redis/Cargo.toml index fbbadf8..09de77b 100644 --- a/redis/Cargo.toml +++ b/redis/Cargo.toml @@ -5,10 +5,10 @@ authors = ["dowwie "] edition = "2018" [dependencies] -actix = "0.9.0-alpha.2" +actix = "0.9.0" actix-rt = "1.0.0" -actix-web = "2.0.0-alpha.6" -actix-redis = "0.8.0-alpha.1" +actix-web = "2.0.0-rc" +actix-redis = "0.8.0" futures = "0.3.1" redis-async = "0.6.1" serde = "1.0.71" diff --git a/rustls/Cargo.toml b/rustls/Cargo.toml index 1b66159..ab2a1cd 100644 --- a/rustls/Cargo.toml +++ b/rustls/Cargo.toml @@ -12,6 +12,6 @@ path = "src/main.rs" [dependencies] env_logger = "0.5" rustls = "0.16" -actix-web = { version = "2.0.0-alpha.6", features=["rustls"] } -actix-files = "0.2.0-alpha.3" +actix-web = { version = "2.0.0-rc", features=["rustls"] } +actix-files = "0.2.0" actix-rt = "1.0.0" diff --git a/server-sent-events/Cargo.toml b/server-sent-events/Cargo.toml index 91d1565..ba82cbf 100644 --- a/server-sent-events/Cargo.toml +++ b/server-sent-events/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] actix-rt = "1.0.0" -actix-web = "2.0.0-alpha.6" +actix-web = "2.0.0-rc" env_logger = "0.6" futures = "0.3.1" tokio = "0.2" \ No newline at end of file diff --git a/server-sent-events/src/main.rs b/server-sent-events/src/main.rs index 15d75ab..5642100 100644 --- a/server-sent-events/src/main.rs +++ b/server-sent-events/src/main.rs @@ -17,7 +17,7 @@ async fn main() -> std::io::Result<()> { HttpServer::new(move || { App::new() - .register_data(data.clone()) + .app_data(data.clone()) .route("/", web::get().to(index)) .route("/events", web::get().to(new_client)) .route("/broadcast/{msg}", web::get().to(broadcast)) diff --git a/simple-auth-server/Cargo.toml b/simple-auth-server/Cargo.toml index d85f45a..90ac31f 100644 --- a/simple-auth-server/Cargo.toml +++ b/simple-auth-server/Cargo.toml @@ -6,8 +6,8 @@ edition = "2018" workspace = ".." [dependencies] -actix-identity = "0.2.0-alpha.1" -actix-web = "2.0.0-alpha.6" +actix-identity = "0.2.0" +actix-web = "2.0.0-rc" actix-rt = "1.0.0" argonautica = "0.2.0" chrono = { version = "0.4.6", features = ["serde"] } diff --git a/state/Cargo.toml b/state/Cargo.toml index 009dd79..2c56b1d 100644 --- a/state/Cargo.toml +++ b/state/Cargo.toml @@ -2,11 +2,10 @@ name = "state" version = "2.0.0" authors = ["Nikolay Kim "] -workspace = ".." edition = "2018" [dependencies] -actix-web = "2.0.0-alpha.6" +actix-web = "2.0.0-rc" actix-rt = "1.0.0" futures = "0.3.1" env_logger = "0.6" diff --git a/state/src/main.rs b/state/src/main.rs index 81e863c..7e1e564 100644 --- a/state/src/main.rs +++ b/state/src/main.rs @@ -1,4 +1,3 @@ -#![allow(clippy::needless_pass_by_value)] //! Application may have multiple data objects that are shared across //! all handlers within same Application. Data could be added //! with `App::data()` method, multiple different data objects could be added. @@ -34,7 +33,7 @@ async fn main() -> io::Result<()> { //move is necessary to give closure below ownership of counter HttpServer::new(move || { App::new() - .register_data(counter.clone()) // <- create app with shared state + .app_data(counter.clone()) // <- create app with shared state // enable logger .wrap(middleware::Logger::default()) // register simple handler, handle all methods diff --git a/static_index/Cargo.toml b/static_index/Cargo.toml index 2d35821..bf93927 100644 --- a/static_index/Cargo.toml +++ b/static_index/Cargo.toml @@ -9,6 +9,6 @@ edition = "2018" futures = "0.3.1" env_logger = "0.6" -actix-web = "2.0.0-alpha.6" -actix-files = "0.2.0-alpha.3" +actix-web = "2.0.0-rc" +actix-files = "0.2.0" actix-rt = "1.0.0" diff --git a/template_askama/Cargo.toml b/template_askama/Cargo.toml index 1dd72d9..6ff166d 100644 --- a/template_askama/Cargo.toml +++ b/template_askama/Cargo.toml @@ -2,11 +2,10 @@ name = "template-askama" version = "2.0.0" authors = ["Nikolay Kim "] -workspace = ".." edition = "2018" [dependencies] -actix-web = "2.0.0-alpha.6" +actix-web = "2.0.0-rc" actix-rt = "1.0.0" env_logger = "0.6" askama = "0.8" diff --git a/template_handlebars/Cargo.toml b/template_handlebars/Cargo.toml index 7e94f50..036fa67 100644 --- a/template_handlebars/Cargo.toml +++ b/template_handlebars/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Alexandru Tiniuc "] edition = "2018" [dependencies] -actix-web = "2.0.0-alpha.6" +actix-web = "2.0.0-rc" actix-rt = "1.0.0" -handlebars = "2.0.0-beta.2" +handlebars = "2.0.0" serde_json = "1.0" \ No newline at end of file diff --git a/template_handlebars/src/main.rs b/template_handlebars/src/main.rs index 905d1d5..8d2a826 100644 --- a/template_handlebars/src/main.rs +++ b/template_handlebars/src/main.rs @@ -49,7 +49,7 @@ async fn main() -> io::Result<()> { HttpServer::new(move || { App::new() - .register_data(handlebars_ref.clone()) + .app_data(handlebars_ref.clone()) .service(index) .service(user) }) diff --git a/template_tera/Cargo.toml b/template_tera/Cargo.toml index 607801c..a1824d5 100644 --- a/template_tera/Cargo.toml +++ b/template_tera/Cargo.toml @@ -8,5 +8,5 @@ edition = "2018" [dependencies] env_logger = "0.6" tera = "1.0" -actix-web = "2.0.0-alpha.6" +actix-web = "2.0.0-rc" actix-rt = "1.0.0" diff --git a/template_yarte/Cargo.toml b/template_yarte/Cargo.toml index 651017f..b536a48 100644 --- a/template_yarte/Cargo.toml +++ b/template_yarte/Cargo.toml @@ -13,7 +13,7 @@ env_logger = "0.7" yarte = { git = "https://github.com/botika/yarte", features = ["with-actix-web"] } actix-rt = "1.0" -actix-web = "2.0.0-alpha" +actix-web = "2.0.0-rc" [build-dependencies] yarte = { git = "https://github.com/botika/yarte", features = ["with-actix-web"] } diff --git a/todo/Cargo.toml b/todo/Cargo.toml index 43ac6b4..70f0eed 100644 --- a/todo/Cargo.toml +++ b/todo/Cargo.toml @@ -2,13 +2,12 @@ authors = ["Dan Munckton "] name = "actix-todo" version = "2.0.0" -workspace = ".." edition = "2018" [dependencies] -actix-web = "2.0.0-alpha.6" -actix-files = "0.2.0-alpha.3" -actix-session = "0.3.0-alpha.3" +actix-web = "2.0.0-rc" +actix-files = "0.2.0" +actix-session = "0.3.0" actix-rt = "1.0.0" dotenv = "0.13.0" env_logger = "0.5.10" diff --git a/unix-socket/Cargo.toml b/unix-socket/Cargo.toml index f3d3ec1..6b9e9b8 100644 --- a/unix-socket/Cargo.toml +++ b/unix-socket/Cargo.toml @@ -7,5 +7,5 @@ edition = "2018" [dependencies] env_logger = "0.6" -actix-web = "2.0.0-alpha.6" +actix-web = "2.0.0-rc" actix-rt = "1.0.0" diff --git a/web-cors/backend/Cargo.toml b/web-cors/backend/Cargo.toml index d9bfb5d..6114406 100644 --- a/web-cors/backend/Cargo.toml +++ b/web-cors/backend/Cargo.toml @@ -6,8 +6,8 @@ edition = "2018" [dependencies] actix-rt = "1.0.0" -actix-web = "2.0.0-alpha.6" -actix-cors = "0.2.0-alpha.3" +actix-web = "2.0.0-rc" +actix-cors = "0.2.0" serde = "1.0" serde_derive = "1.0" serde_json = "1.0" diff --git a/websocket-chat-broker/Cargo.toml b/websocket-chat-broker/Cargo.toml index 7f1ecab..ccac402 100644 --- a/websocket-chat-broker/Cargo.toml +++ b/websocket-chat-broker/Cargo.toml @@ -3,7 +3,6 @@ name = "websocket-broker-example" version = "0.1.0" authors = ["Chris Ricketts "] edition = "2018" -workspace = ".." [[bin]] name = "server" diff --git a/websocket-chat/Cargo.toml b/websocket-chat/Cargo.toml index bf542f7..353904d 100644 --- a/websocket-chat/Cargo.toml +++ b/websocket-chat/Cargo.toml @@ -10,10 +10,10 @@ path = "src/main.rs" [dependencies] actix-rt = "1.0.0" -actix = "0.9.0-alpha.1" -actix-web = "2.0.0-alpha.5" -actix-web-actors = "2.0.0-alpha.1" -actix-files = "0.2.0-alpha.3" +actix = "0.9.0" +actix-web = "2.0.0-rc" +actix-web-actors = "2.0.0" +actix-files = "0.2.0" rand = "0.6" bytes = "0.5.3" diff --git a/websocket-tcp-chat/Cargo.toml b/websocket-tcp-chat/Cargo.toml index bdde114..38263f3 100644 --- a/websocket-tcp-chat/Cargo.toml +++ b/websocket-tcp-chat/Cargo.toml @@ -13,10 +13,10 @@ name = "websocket-tcp-client" path = "src/client.rs" [dependencies] -actix = "0.9.0-alpha.2" -actix-web = "2.0.0-alpha.6" -actix-web-actors = "2.0.0-alpha.1" -actix-files = "0.2.0-alpha.3" +actix = "0.9.0" +actix-web = "2.0.0-rc" +actix-web-actors = "2.0.0" +actix-files = "0.2.0" actix-rt = "1.0.0" actix-codec = "0.2.0" diff --git a/websocket/Cargo.toml b/websocket/Cargo.toml index 24aac80..5eb52b4 100644 --- a/websocket/Cargo.toml +++ b/websocket/Cargo.toml @@ -13,13 +13,13 @@ name = "websocket-client" path = "src/client.rs" [dependencies] -actix = "0.9.0-alpha.2" +actix = "0.9.0" actix-codec = "0.2.0" -actix-web = "2.0.0-alpha.6" -actix-web-actors = "2.0.0-alpha.1" -actix-files = "0.2.0-alpha.3" +actix-web = "2.0.0-rc" +actix-web-actors = "2.0.0" +actix-files = "0.2.0" actix-rt = "1.0.0" -awc = "1.0.0" +awc = "1.0.1" env_logger = "0.6" futures = "0.3.1" bytes = "0.5.3"