1
0
mirror of https://github.com/actix/examples synced 2024-11-30 17:14:35 +01:00

upgrade actix-web

This commit is contained in:
Nikolay Kim 2019-05-12 11:58:26 -07:00
parent 68509a7eaf
commit cee9142257
34 changed files with 54 additions and 53 deletions

View File

@ -7,7 +7,7 @@ workspace = ".."
[dependencies] [dependencies]
actix = "0.8.1" actix = "0.8.1"
actix-web = "1.0.0-beta.3" actix-web = "1.0.0-beta.4"
actix-redis = { git="https://github.com/actix/actix-redis.git" } actix-redis = { git="https://github.com/actix/actix-redis.git" }
futures = "0.1.23" futures = "0.1.23"
redis-async = "0.4.0" redis-async = "0.4.0"

View File

@ -6,9 +6,9 @@ workspace = ".."
edition = "2018" edition = "2018"
[dependencies] [dependencies]
actix-web = "1.0.0-beta.3" actix-web = "1.0.0-beta.5"
actix-files = "0.1.0-beta.1" actix-files = "0.1.0-beta.4"
actix-session = "0.1.0-beta.2" actix-session = "0.1.0-beta.4"
dotenv = "0.13.0" dotenv = "0.13.0"
env_logger = "0.5.10" env_logger = "0.5.10"
futures = "0.1.22" futures = "0.1.22"

View File

@ -7,7 +7,7 @@ workspace = ".."
[dependencies] [dependencies]
actix-rt = "0.2" actix-rt = "0.2"
actix-web = "1.0.0-beta.3" actix-web = "1.0.0-beta.4"
dotenv = "0.10" dotenv = "0.10"
env_logger = "0.5" env_logger = "0.5"

View File

@ -7,9 +7,9 @@ workspace = ".."
[dependencies] [dependencies]
actix-rt = "0.2.2" actix-rt = "0.2.2"
actix-web = { version="1.0.0-beta.1", features=["ssl"] } actix-web = { version="1.0.0-beta.4", features=["ssl"] }
actix-multipart = "0.1.0-beta.1" actix-multipart = "0.1.0-beta.1"
actix-service = "0.3.6" actix-service = "0.4.0"
bytes = "0.4.12" bytes = "0.4.12"
env_logger = "0.6.1" env_logger = "0.6.1"
futures = "0.1" futures = "0.1"

View File

@ -7,9 +7,9 @@ edition = "2018"
[dependencies] [dependencies]
actix-rt = "0.2" actix-rt = "0.2"
actix-web = "1.0.0-beta.3" actix-web = "1.0.0-beta.4"
actix-files = "0.1.0-beta.1" actix-files = "0.1.0-beta.4"
actix-session = "0.1.0-beta.2" actix-session = "0.1.0-beta.4"
futures = "0.1.25" futures = "0.1.25"
env_logger = "0.5" env_logger = "0.5"

View File

@ -6,5 +6,5 @@ edition = "2018"
workspace = ".." workspace = ".."
[dependencies] [dependencies]
actix-web = "1.0.0-beta.3" actix-web = "1.0.0-beta.4"
env_logger = "0.6" env_logger = "0.6"

View File

@ -6,8 +6,8 @@ workspace = ".."
edition = "2018" edition = "2018"
[dependencies] [dependencies]
actix-web = "1.0.0-beta.3" actix-web = "1.0.0-beta.4"
actix-session = "0.1.0-beta.2" actix-session = "0.1.0-beta.4"
futures = "0.1" futures = "0.1"
time = "0.1" time = "0.1"

View File

@ -6,7 +6,7 @@ workspace = ".."
edition = "2018" edition = "2018"
[dependencies] [dependencies]
actix-web = "1.0.0-beta.3" actix-web = "1.0.0-beta.4"
bytes = "0.4" bytes = "0.4"
env_logger = "0.6" env_logger = "0.6"

View File

@ -6,7 +6,7 @@ edition = "2018"
workspace = ".." workspace = ".."
[dependencies] [dependencies]
actix-web = "1.0.0-beta.3" actix-web = "1.0.0-beta.4"
derive_more = "0.14.0" derive_more = "0.14.0"
futures = "0.1.23" futures = "0.1.23"

View File

@ -6,7 +6,7 @@ edition = "2018"
workspace = ".." workspace = ".."
[dependencies] [dependencies]
actix-web = "1.0.0-beta.3" actix-web = "1.0.0-beta.4"
serde = "1.0" serde = "1.0"
serde_derive = "1.0" serde_derive = "1.0"

View File

@ -6,5 +6,5 @@ workspace = ".."
edition = "2018" edition = "2018"
[dependencies] [dependencies]
actix-web = "1.0.0-beta.3" actix-web = "1.0.0-beta.4"
env_logger = "0.6" env_logger = "0.6"

View File

@ -7,7 +7,7 @@ edition = "2018"
[dependencies] [dependencies]
actix-rt = "0.2" actix-rt = "0.2"
actix-web = "1.0.0-beta.3" actix-web = "1.0.0-beta.4"
clap = "2.32.0" clap = "2.32.0"
futures = "0.1.25" futures = "0.1.25"

View File

@ -87,6 +87,7 @@ fn main() -> std::io::Result<()> {
HttpServer::new(move || { HttpServer::new(move || {
App::new() App::new()
.data(Client::new())
.data(forward_url.clone()) .data(forward_url.clone())
.wrap(middleware::Logger::default()) .wrap(middleware::Logger::default())
.default_service(web::route().to_async(forward)) .default_service(web::route().to_async(forward))

View File

@ -15,7 +15,7 @@ path = "src/server.rs"
[dependencies] [dependencies]
actix-rt = "0.2" actix-rt = "0.2"
actix-web = "1.0.0-beta.3" actix-web = "1.0.0-beta.4"
env_logger = "0.5" env_logger = "0.5"
futures = "0.1" futures = "0.1"

View File

@ -6,7 +6,7 @@ workspace = ".."
edition = "2018" edition = "2018"
[dependencies] [dependencies]
actix-web = "1.0.0-beta.3" actix-web = "1.0.0-beta.4"
bytes = "0.4" bytes = "0.4"
futures = "0.1" futures = "0.1"

View File

@ -7,7 +7,7 @@ workspace = ".."
[dependencies] [dependencies]
actix = "0.8.1" actix = "0.8.1"
actix-web = "1.0.0-beta.3" actix-web = "1.0.0-beta.4"
env_logger = "0.6" env_logger = "0.6"
futures = "0.1.23" futures = "0.1.23"
futures-timer = "0.1" futures-timer = "0.1"

View File

@ -6,7 +6,7 @@ workspace = ".."
edition = "2018" edition = "2018"
[dependencies] [dependencies]
actix-web = "1.0.0-beta.3" actix-web = "1.0.0-beta.4"
env_logger = "0.6" env_logger = "0.6"
futures = "0.1" futures = "0.1"
serde = "1.0" serde = "1.0"

View File

@ -6,7 +6,7 @@ edition = "2018"
workspace = ".." workspace = ".."
[dependencies] [dependencies]
actix-service = "0.3.6" actix-service = "0.4.0"
actix-web = "1.0.0-beta.3" actix-web = "1.0.0-beta.4"
futures = "0.1.25" futures = "0.1.25"
env_logger = "0.6" env_logger = "0.6"

View File

@ -10,8 +10,8 @@ name = "multipart"
path = "src/main.rs" path = "src/main.rs"
[dependencies] [dependencies]
actix-web = "1.0.0-beta.3" actix-web = "1.0.0-beta.4"
actix-multipart = "0.1.0-beta.1" actix-multipart = "0.1.0-beta.4"
env_logger = "0.6" env_logger = "0.6"
futures = "0.1.25" futures = "0.1.25"

View File

@ -13,4 +13,4 @@ derive_more = "0.14"
prost = "0.2.0" prost = "0.2.0"
prost-derive = "0.2.0" prost-derive = "0.2.0"
actix-web = "1.0.0-beta.3" actix-web = "1.0.0-beta.4"

View File

@ -7,7 +7,7 @@ workspace = ".."
[dependencies] [dependencies]
actix-rt = "0.2" actix-rt = "0.2"
actix-web = "1.0.0-beta.3" actix-web = "1.0.0-beta.4"
futures = "0.1" futures = "0.1"
env_logger = "0.6" env_logger = "0.6"

View File

@ -7,7 +7,7 @@ edition = "2018"
[dependencies] [dependencies]
actix = "0.8.1" actix = "0.8.1"
actix-web = "1.0.0-beta.3" actix-web = "1.0.0-beta.4"
actix-session = "0.1.0-beta.2" actix-session = "0.1.0-beta.4"
actix-redis = { git = "https://github.com/actix/actix-redis.git", features = ["web"] } actix-redis = { git = "https://github.com/actix/actix-redis.git", features = ["web"] }
env_logger = "0.6" env_logger = "0.6"

View File

@ -12,5 +12,5 @@ path = "src/main.rs"
[dependencies] [dependencies]
env_logger = "0.5" env_logger = "0.5"
rustls = "0.15" rustls = "0.15"
actix-web = { version = "1.0.0-alpha.4", features=["rust-tls"] } actix-web = { version = "1.0.0-beta.4", features=["rust-tls"] }
actix-files = "0.1.0-alpha.4" actix-files = "0.1.0-beta.4"

View File

@ -8,8 +8,8 @@ workspace = ".."
[dependencies] [dependencies]
actix = { version = "0.8.1", features = ["http"] } actix = { version = "0.8.1", features = ["http"] }
actix-rt = "0.2.2" actix-rt = "0.2.2"
actix-web = "1.0.0-beta.3" actix-web = "1.0.0-beta.4"
actix-files = "0.1.0-beta.1" actix-files = "0.1.0-beta.4"
bcrypt = "0.2.1" bcrypt = "0.2.1"
chrono = { version = "0.4.6", features = ["serde"] } chrono = { version = "0.4.6", features = ["serde"] }

View File

@ -6,6 +6,6 @@ workspace = ".."
edition = "2018" edition = "2018"
[dependencies] [dependencies]
actix-web = "1.0.0-beta.3" actix-web = "1.0.0-beta.4"
futures = "0.1.25" futures = "0.1.25"
env_logger = "0.6" env_logger = "0.6"

View File

@ -9,5 +9,5 @@ edition = "2018"
futures = "0.1" futures = "0.1"
env_logger = "0.5" env_logger = "0.5"
actix-web = "1.0.0-beta.3" actix-web = "1.0.0-beta.4"
actix-files = "0.1.0-beta.1" actix-files = "0.1.0-beta.4"

View File

@ -6,7 +6,7 @@ workspace = ".."
edition = "2018" edition = "2018"
[dependencies] [dependencies]
actix-web = "1.0.0-beta.3" actix-web = "1.0.0-beta.4"
env_logger = "0.6" env_logger = "0.6"
askama = "0.8" askama = "0.8"

View File

@ -8,4 +8,4 @@ edition = "2018"
[dependencies] [dependencies]
env_logger = "0.6" env_logger = "0.6"
tera = "0.11" tera = "0.11"
actix-web = "1.0.0-beta.3" actix-web = "1.0.0-beta.4"

View File

@ -12,12 +12,12 @@ env_logger = "0.6"
yarte = { version = "0.2", features=["with-actix-web"] } yarte = { version = "0.2", features=["with-actix-web"] }
actix-web = "1.0.0-beta.3" actix-web = "1.0.0-beta.4"
[build-dependencies] [build-dependencies]
yarte = { version = "0.2", features=["with-actix-web"] } yarte = { version = "0.2", features=["with-actix-web"] }
[dev-dependencies] [dev-dependencies]
bytes = "0.4" bytes = "0.4"
actix-http-test = "0.1.0" actix-http-test = "0.2.0"
actix-http = "0.1.0" actix-http = "0.2.0"

View File

@ -11,6 +11,6 @@ path = "src/main.rs"
[dependencies] [dependencies]
actix-rt = "0.2" actix-rt = "0.2"
actix-web = { version="1.0.0-alpha.4", features=["ssl"] } actix-web = { version="1.0.0-beta.4", features=["ssl"] }
env_logger = "0.6" env_logger = "0.6"
openssl = { version="0.10" } openssl = { version="0.10" }

View File

@ -6,7 +6,7 @@ workspace = "../../"
edition = "2018" edition = "2018"
[dependencies] [dependencies]
actix-web = "1.0.0-beta.3" actix-web = "1.0.0-beta.4"
serde = "1.0" serde = "1.0"
serde_derive = "1.0" serde_derive = "1.0"
serde_json = "1.0" serde_json = "1.0"

View File

@ -11,9 +11,9 @@ path = "src/main.rs"
[dependencies] [dependencies]
actix = "0.8.1" actix = "0.8.1"
actix-web = "1.0.0-beta.3" actix-web = "1.0.0-beta.4"
actix-web-actors = "1.0.0-alpha.3" actix-web-actors = "1.0.0-beta.4"
actix-files = "0.1.0-beta.1" actix-files = "0.1.0-beta.4"
rand = "0.6" rand = "0.6"
bytes = "0.4" bytes = "0.4"

View File

@ -15,9 +15,9 @@ path = "src/client.rs"
[dependencies] [dependencies]
actix = "0.8.1" actix = "0.8.1"
actix-web = "1.0.0-beta.3" actix-web = "1.0.0-beta.4"
actix-web-actors = "1.0.0-alpha.3" actix-web-actors = "1.0.0-beta.4"
actix-files = "0.1.0-beta.1" actix-files = "0.1.0-beta.4"
rand = "0.6" rand = "0.6"
bytes = "0.4" bytes = "0.4"

View File

@ -15,9 +15,9 @@ path = "src/main.rs"
[dependencies] [dependencies]
actix = "0.8.1" actix = "0.8.1"
actix-web = "1.0.0-beta.3" actix-web = "1.0.0-beta.4"
actix-web-actors = "1.0.0-alpha.3" actix-web-actors = "1.0.0-beta.4"
actix-files = "0.1.0-beta.1" actix-files = "0.1.0-beta.4"
env_logger = "0.6" env_logger = "0.6"
futures = "0.1" futures = "0.1"
bytes = "0.4" bytes = "0.4"