diff --git a/Cargo.lock b/Cargo.lock index 11f5ae6d..13bf38e1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -126,9 +126,9 @@ dependencies = [ [[package]] name = "actix-files" -version = "0.6.0-beta.16" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b49f1b48724a52605ba40b67ede24f5a6cbc246817f9278d280d393a28e8b0e" +checksum = "d81bde9a79336aa51ebed236e91fc1a0528ff67cfdf4f68ca4c61ede9fd26fb5" dependencies = [ "actix-http", "actix-service", @@ -149,9 +149,9 @@ dependencies = [ [[package]] name = "actix-http" -version = "3.0.0-rc.3" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8b5ba038f3bb4aa29ad9bdd7eba09955ff04503263c497fc61a389d6412f4e8" +checksum = "0f3fdd63b9cfeaf92eeeece719dabbddddb420a57d3fd171ce1490ecfb7086b1" dependencies = [ "actix-codec 0.5.0", "actix-rt", @@ -213,9 +213,9 @@ dependencies = [ [[package]] name = "actix-identity" -version = "0.4.0-beta.8" +version = "0.4.0-beta.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f084963856cf7990b1f21d6298626de4ae6178385cadece312e12c9f7a9f432" +checksum = "68895242adbce3e672e60c8fdcd1895491afcbbc8f5b7a7fca14932307ccdde4" dependencies = [ "actix-service", "actix-utils", @@ -238,9 +238,9 @@ dependencies = [ [[package]] name = "actix-multipart" -version = "0.4.0-beta.13" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59b1f14a8b2bc14df9be544d173f5390da5b62d531e406fd0f0ce9b825fea5a" +checksum = "c9edfb0e7663d7fe18c8d5b668c9c1bcf79176b1dcc9d4da9592503209a6bfb0" dependencies = [ "actix-utils", "actix-web", @@ -294,9 +294,9 @@ dependencies = [ [[package]] name = "actix-router" -version = "0.5.0-rc.3" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6506dbef336634ff35d994d58daa0a412ea23751f15f9b4dcac4d594b1ed1f" +checksum = "eb60846b52c118f2f04a56cc90880a274271c489b2498623d58176f8ca21fa80" dependencies = [ "bytestring", "firestorm", @@ -419,11 +419,11 @@ dependencies = [ [[package]] name = "actix-web" -version = "4.0.0-rc.3" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83e3c85bc4116b69913b03f16cff8cade1212508fcd321847d9cfe3d3e41f991" +checksum = "f4e5ebffd51d50df56a3ae0de0e59487340ca456f05dd0b90c0a7a6dd6a74d31" dependencies = [ - "actix-codec 0.4.2", + "actix-codec 0.5.0", "actix-http", "actix-macros", "actix-router", @@ -435,6 +435,7 @@ dependencies = [ "actix-web-codegen", "ahash", "bytes 1.1.0", + "bytestring", "cfg-if 1.0.0", "cookie 0.16.0", "derive_more", @@ -459,9 +460,9 @@ dependencies = [ [[package]] name = "actix-web-actors" -version = "4.0.0-beta.12" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95319210d3670dcdc918e670c076bd77f0b8ee557d84c157d8c408796bcd5eb9" +checksum = "f1afe39026e519503c1a3a4a9ebd22c9b4b6930e85842c6d1c8958aea7a87ed1" dependencies = [ "actix", "actix-codec 0.5.0", @@ -476,9 +477,9 @@ dependencies = [ [[package]] name = "actix-web-codegen" -version = "0.5.0-rc.2" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d0976042e6ddc82c7d0dedd64d39959bc26d9bba098b2f6c32a73fbef784eaf" +checksum = "7525bedf54704abb1d469e88d7e7e9226df73778798a69cea5022d53b2ae91bc" dependencies = [ "actix-router", "proc-macro2", @@ -608,7 +609,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.4", + "getrandom 0.2.5", "once_cell", "version_check", ] @@ -649,9 +650,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.53" +version = "1.0.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0" +checksum = "159bb86af3a200e19a068f4224eae4c8bb2d0fa054c7e5d1cacd5cef95e684cd" [[package]] name = "arrayref" @@ -978,10 +979,11 @@ dependencies = [ "itoa 1.0.1", "log", "mime", + "openssl", "percent-encoding", "pin-project-lite 0.2.8", "rand 0.8.5", - "rustls 0.20.3", + "rustls 0.20.4", "serde 1.0.136", "serde_json", "serde_urlencoded", @@ -997,7 +999,7 @@ dependencies = [ "env_logger", "log", "mime", - "rustls 0.20.3", + "rustls 0.20.4", "webpki-roots 0.22.2", ] @@ -1357,9 +1359,9 @@ dependencies = [ [[package]] name = "clap" -version = "3.1.0" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5f1fea81f183005ced9e59cdb01737ef2423956dac5a6d731b06b2ecfaa3467" +checksum = "5177fac1ab67102d8989464efd043c6ff44191b1557ec1ddd489b4f7e1447e77" dependencies = [ "atty", "bitflags", @@ -1374,9 +1376,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "3.1.0" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd1122e63869df2cb309f449da1ad54a7c6dfeb7c7e6ccd8e0825d9eb93bb72" +checksum = "01d42c94ce7c2252681b5fed4d3627cc807b13dfc033246bd05d5b252399000e" dependencies = [ "heck 0.4.0", "proc-macro-error", @@ -2249,9 +2251,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c" +checksum = "d39cd93900197114fa1fcb7ae84ca742095eed9442088988ae74fa744e930e77" dependencies = [ "cfg-if 1.0.0", "libc", @@ -2958,9 +2960,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.118" +version = "0.2.119" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e509672465a0504304aa87f9f176f2b2b716ed8fb105ebe5c02dc6dce96a94" +checksum = "1bf2e165bb3457c8e098ea76f3e3bc9db55f87aa90d52d0e6be741470916aaa4" [[package]] name = "libsqlite3-sys" @@ -3140,7 +3142,7 @@ dependencies = [ "env_logger", "futures-util", "log", - "rustls 0.20.3", + "rustls 0.20.4", "rustls-pemfile", ] @@ -3967,9 +3969,9 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dada8c9981fcf32929c3c0f0cd796a9284aca335565227ed88c83babb1d43dc" +checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a" dependencies = [ "thiserror", "toml", @@ -4181,7 +4183,7 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" dependencies = [ - "getrandom 0.2.4", + "getrandom 0.2.5", ] [[package]] @@ -4279,7 +4281,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" dependencies = [ - "getrandom 0.2.4", + "getrandom 0.2.5", "redox_syscall", ] @@ -4574,9 +4576,9 @@ checksum = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2" [[package]] name = "rust_decimal" -version = "1.21.0" +version = "1.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4214023b1223d02a4aad9f0bb9828317634a56530870a2eaf7200a99c0c10f68" +checksum = "d37baa70cf8662d2ba1c1868c5983dda16ef32b105cce41fb5c47e72936a90b3" dependencies = [ "arrayvec 0.7.2", "num-traits 0.2.14", @@ -4604,7 +4606,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.5", + "semver 1.0.6", ] [[package]] @@ -4622,9 +4624,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.3" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b323592e3164322f5b193dc4302e4e36cd8d37158a712d664efae1a5c2791700" +checksum = "4fbfeb8d0ddb84706bc597a5574ab8912817c52a397f819e5b614e2265206921" dependencies = [ "log", "ring", @@ -4640,7 +4642,7 @@ dependencies = [ "actix-web", "env_logger", "log", - "rustls 0.20.3", + "rustls 0.20.4", "rustls-pemfile", ] @@ -4651,7 +4653,7 @@ dependencies = [ "actix-files", "actix-web", "env_logger", - "rustls 0.20.3", + "rustls 0.20.4", "rustls-pemfile", ] @@ -4811,9 +4813,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0486718e92ec9a68fbed73bb5ef687d71103b142595b406835649bebd33f72c7" +checksum = "a4a3381e03edd24287172047536f20cabde766e2cd3e65e6b00fb3af51c4f38d" [[package]] name = "semver-parser" @@ -5091,9 +5093,9 @@ checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" [[package]] name = "smartstring" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31aa6a31c0c2b21327ce875f7e8952322acfcfd0c27569a6e18a647281352c9b" +checksum = "e714dff2b33f2321fdcd475b71cec79781a692d846f37f415fb395a1d2bcd48e" dependencies = [ "static_assertions 1.1.0", ] @@ -5160,9 +5162,9 @@ dependencies = [ [[package]] name = "sqlx" -version = "0.5.10" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692749de69603d81e016212199d73a2e14ee20e2def7d7914919e8db5d4d48b9" +checksum = "fc15591eb44ffb5816a4a70a7efd5dd87bfd3aa84c4c200401c4396140525826" dependencies = [ "sqlx-core", "sqlx-macros", @@ -5170,9 +5172,9 @@ dependencies = [ [[package]] name = "sqlx-core" -version = "0.5.10" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "518be6f6fff5ca76f985d434f9c37f3662af279642acf730388f271dff7b9016" +checksum = "195183bf6ff8328bb82c0511a83faf60aacf75840103388851db61d7a9854ae3" dependencies = [ "ahash", "atoi", @@ -5180,9 +5182,7 @@ dependencies = [ "byteorder", "bytes 1.1.0", "crc", - "crossbeam-channel", "crossbeam-queue", - "crossbeam-utils", "either", "flume", "futures-channel", @@ -5199,7 +5199,7 @@ dependencies = [ "log", "memchr", "once_cell", - "parking_lot 0.11.2", + "paste", "percent-encoding", "rustls 0.19.1", "serde 1.0.136", @@ -5217,9 +5217,9 @@ dependencies = [ [[package]] name = "sqlx-macros" -version = "0.5.10" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38e45140529cf1f90a5e1c2e561500ca345821a1c513652c8f486bbf07407cc8" +checksum = "eee35713129561f5e55c554bba1c378e2a7e67f81257b7311183de98c50e6f94" dependencies = [ "dotenv", "either", @@ -5239,9 +5239,9 @@ dependencies = [ [[package]] name = "sqlx-rt" -version = "0.5.10" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8061cbaa91ee75041514f67a09398c65a64efed72c90151ecd47593bad53da99" +checksum = "b555e70fbbf84e269ec3858b7a6515bcfe7a166a7cc9c636dd6efd20431678b6" dependencies = [ "once_cell", "tokio 1.17.0", @@ -5808,7 +5808,7 @@ version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a27d5f2b839802bd8267fa19b0530f5a08b9c08cd417976be2a65d130fe1c11b" dependencies = [ - "rustls 0.20.3", + "rustls 0.20.4", "tokio 1.17.0", "webpki 0.22.0", ] @@ -6206,7 +6206,7 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ - "getrandom 0.2.4", + "getrandom 0.2.5", "serde 1.0.136", ] @@ -6803,9 +6803,9 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.5.2" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c88870063c39ee00ec285a2f8d6a966e5b6fb2becc4e8dac77ed0d370ed6006" +checksum = "50344758e2f40e3a1fcfc8f6f91aa57b5f8ebd8d27919fe6451f15aaaf9ee608" [[package]] name = "zstd" diff --git a/auth/casbin/Cargo.toml b/auth/casbin/Cargo.toml index dd70d749..8afe33c4 100644 --- a/auth/casbin/Cargo.toml +++ b/auth/casbin/Cargo.toml @@ -4,7 +4,7 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = "4.0.0-beta.21" +actix-web = "4" casbin = "2.0.9" loge = {version = "0.4", default-features = false, features = ["colored", "chrono"]} tokio = { version = "1.16.1", features = ["sync"] } diff --git a/auth/cookie-auth/Cargo.toml b/auth/cookie-auth/Cargo.toml index 90265dfe..89e7482a 100644 --- a/auth/cookie-auth/Cargo.toml +++ b/auth/cookie-auth/Cargo.toml @@ -4,7 +4,7 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = "4.0.0-beta.21" +actix-web = "4" actix-identity = "0.4.0-beta.8" env_logger = "0.9.0" rand = "0.8.4" diff --git a/auth/cookie-session/Cargo.toml b/auth/cookie-session/Cargo.toml index 3f09ee0a..be5fe48a 100644 --- a/auth/cookie-session/Cargo.toml +++ b/auth/cookie-session/Cargo.toml @@ -4,7 +4,7 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = "4.0.0-beta.21" +actix-web = "4" actix-session = "0.5.0-beta.7" log = "0.4" env_logger = "0.9.0" diff --git a/auth/redis-session/Cargo.toml b/auth/redis-session/Cargo.toml index 962cb11e..c3d7d83e 100644 --- a/auth/redis-session/Cargo.toml +++ b/auth/redis-session/Cargo.toml @@ -4,7 +4,7 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = "4.0.0-beta.21" +actix-web = "4" actix-session = "0.5.0-beta.7" actix-redis = "0.10.0-beta.5" env_logger = "0.9.0" diff --git a/auth/simple-auth-server/Cargo.toml b/auth/simple-auth-server/Cargo.toml index 4d8ed249..09fe89b8 100644 --- a/auth/simple-auth-server/Cargo.toml +++ b/auth/simple-auth-server/Cargo.toml @@ -4,7 +4,7 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = "4.0.0-beta.21" +actix-web = "4" actix-identity = "0.4.0-beta.8" chrono = { version = "0.4.6", features = ["serde"] } diff --git a/basics/basics/Cargo.toml b/basics/basics/Cargo.toml index 47a9940a..88fbf72a 100644 --- a/basics/basics/Cargo.toml +++ b/basics/basics/Cargo.toml @@ -4,8 +4,8 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = "4.0.0-beta.21" -actix-files = "0.6.0-beta.15" +actix-web = "4" +actix-files = "0.6" actix-session = "0.5.0-beta.7" async-stream = "0.3" diff --git a/basics/error-handling/Cargo.toml b/basics/error-handling/Cargo.toml index 2acf6f37..5c50c9f7 100644 --- a/basics/error-handling/Cargo.toml +++ b/basics/error-handling/Cargo.toml @@ -4,7 +4,7 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = "4.0.0-beta.21" +actix-web = "4" derive_more = "0.99.2" rand = "0.8" env_logger = "0.9" diff --git a/basics/hello-world/Cargo.toml b/basics/hello-world/Cargo.toml index 2ad126c1..a782b5af 100644 --- a/basics/hello-world/Cargo.toml +++ b/basics/hello-world/Cargo.toml @@ -4,5 +4,5 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = "4.0.0-beta.21" +actix-web = "4" env_logger = "0.9.0" diff --git a/basics/nested-routing/Cargo.toml b/basics/nested-routing/Cargo.toml index ccdd2bce..9838bff3 100644 --- a/basics/nested-routing/Cargo.toml +++ b/basics/nested-routing/Cargo.toml @@ -4,7 +4,7 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = { version = "4.0.0-beta.21", features = ["openssl"] } +actix-web = { version = "4", features = ["openssl"] } env_logger = "0.9" serde = { version = "^1.0", features = ["derive"] } serde_json = "1.0.39" diff --git a/basics/state/Cargo.toml b/basics/state/Cargo.toml index 59d3e72e..11d6acad 100644 --- a/basics/state/Cargo.toml +++ b/basics/state/Cargo.toml @@ -4,5 +4,5 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = "4.0.0-rc.3" +actix-web = "4" env_logger = "0.9.0" diff --git a/basics/static-files/Cargo.toml b/basics/static-files/Cargo.toml index 4c4350f8..fb4207f0 100644 --- a/basics/static-files/Cargo.toml +++ b/basics/static-files/Cargo.toml @@ -4,7 +4,7 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = "4.0.0-rc.3" -actix-files = "0.6.0-beta.15" +actix-web = "4" +actix-files = "0.6" env_logger = "0.9.0" log = "0.4" diff --git a/basics/todo/Cargo.toml b/basics/todo/Cargo.toml index 53f1aa17..fdd66e57 100644 --- a/basics/todo/Cargo.toml +++ b/basics/todo/Cargo.toml @@ -4,8 +4,8 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = "4.0.0-rc.3" -actix-files = "0.6.0-beta.16" +actix-web = "4" +actix-files = "0.6" actix-session = "0.5.0-beta.7" dotenv = "0.15" diff --git a/cors/backend/Cargo.toml b/cors/backend/Cargo.toml index 79ad0508..1a8985fe 100644 --- a/cors/backend/Cargo.toml +++ b/cors/backend/Cargo.toml @@ -4,7 +4,7 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = { version = "4.0.0-beta.21", features = ["rustls"] } +actix-web = { version = "4", features = ["rustls"] } actix-cors = "0.6.0-beta.8" serde = { version = "1.0", features = ["derive"] } diff --git a/data-factory/Cargo.toml b/data-factory/Cargo.toml index 8de28c97..0b301e47 100644 --- a/data-factory/Cargo.toml +++ b/data-factory/Cargo.toml @@ -4,7 +4,7 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = "4.0.0-beta.21" +actix-web = "4" num_cpus = "1.13" redis = { version = "0.19.0", default-features = false, features = ["tokio-comp"] } # redis_tang is an redis pool for test purpose diff --git a/databases/diesel/Cargo.toml b/databases/diesel/Cargo.toml index c583d9d5..31da9216 100644 --- a/databases/diesel/Cargo.toml +++ b/databases/diesel/Cargo.toml @@ -4,7 +4,7 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = "4.0.0-beta.21" +actix-web = "4" diesel = { version = "1.4.8", features = ["sqlite", "r2d2"] } dotenv = "0.15" env_logger = "0.9.0" diff --git a/databases/mongodb/Cargo.toml b/databases/mongodb/Cargo.toml index d02d160c..085b8344 100644 --- a/databases/mongodb/Cargo.toml +++ b/databases/mongodb/Cargo.toml @@ -4,7 +4,7 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = "4.0.0-beta.21" +actix-web = "4" futures-util = "0.3.17" mongodb = "2.0.0" serde = { version = "1.0", features = ["derive"] } diff --git a/databases/postgres/Cargo.toml b/databases/postgres/Cargo.toml index c4a9f4ac..0569fdf3 100644 --- a/databases/postgres/Cargo.toml +++ b/databases/postgres/Cargo.toml @@ -4,7 +4,7 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = "4.0.0-beta.21" +actix-web = "4" config = "0.11.0" deadpool-postgres = { version = "0.10.1", features = ["serde"] } derive_more = "0.99.2" diff --git a/databases/redis/Cargo.toml b/databases/redis/Cargo.toml index 2c2f84a1..91c35c73 100644 --- a/databases/redis/Cargo.toml +++ b/databases/redis/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] actix = "0.12" -actix-web = "4.0.0-rc.3" +actix-web = "4" actix-redis = "0.10.0-beta.6" futures-util = { version = "0.3.7", default-features = false, features = ["std"] } log = "0.4" diff --git a/databases/sqlite/Cargo.toml b/databases/sqlite/Cargo.toml index bcd78c73..c1ea4838 100644 --- a/databases/sqlite/Cargo.toml +++ b/databases/sqlite/Cargo.toml @@ -4,7 +4,7 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = "4.0.0-rc.3" +actix-web = "4" env_logger = "0.9" futures-util = { version = "0.3", default-features = false, features = ["std"] } diff --git a/docker/Cargo.toml b/docker/Cargo.toml index 2f3535c3..5aa3fbd5 100644 --- a/docker/Cargo.toml +++ b/docker/Cargo.toml @@ -4,6 +4,6 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = "4.0.0-beta.21" +actix-web = "4" env_logger = "0.9" log = "0.4" diff --git a/forms/form/Cargo.toml b/forms/form/Cargo.toml index f7de8c98..ae341ea3 100644 --- a/forms/form/Cargo.toml +++ b/forms/form/Cargo.toml @@ -4,5 +4,5 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = "4.0.0-rc.3" +actix-web = "4" serde = { version = "1", features = ["derive"] } diff --git a/forms/multipart-s3/Cargo.toml b/forms/multipart-s3/Cargo.toml index 9d3ac8bb..046cad8a 100644 --- a/forms/multipart-s3/Cargo.toml +++ b/forms/multipart-s3/Cargo.toml @@ -4,7 +4,7 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = "4.0.0-rc.3" +actix-web = "4" actix-multipart = "0.4.0-beta.12" dotenv = "0.15.0" diff --git a/forms/multipart/Cargo.toml b/forms/multipart/Cargo.toml index 18ec7b2b..826629b2 100644 --- a/forms/multipart/Cargo.toml +++ b/forms/multipart/Cargo.toml @@ -10,7 +10,7 @@ readme = "README.md" [dependencies] actix-multipart = "0.4.0-beta.12" -actix-web = "4.0.0-rc.3" +actix-web = "4" futures-util = "0.3" sanitize-filename = "0.3" diff --git a/graphql/async-graphql/Cargo.toml b/graphql/async-graphql/Cargo.toml index 4a9f0bdb..fec0aa21 100644 --- a/graphql/async-graphql/Cargo.toml +++ b/graphql/async-graphql/Cargo.toml @@ -4,7 +4,7 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = "4.0.0-rc.3" +actix-web = "4" actix-web-lab = "0.10" actix-cors = "0.6.0-beta.10" diff --git a/graphql/async-graphql/src/star_wars/model.rs b/graphql/async-graphql/src/star_wars/model.rs index 919de995..d8a871ef 100644 --- a/graphql/async-graphql/src/star_wars/model.rs +++ b/graphql/async-graphql/src/star_wars/model.rs @@ -121,12 +121,8 @@ impl QueryRoot { first: Option, last: Option, ) -> FieldResult> { - let humans = ctx - .data_unchecked::() - .humans() - .iter() - .copied() - .collect::>(); + let humans = ctx.data_unchecked::().humans().to_vec(); + query_characters(after, before, first, last, &humans) .await .map(|conn| conn.map_node(Human)) @@ -148,12 +144,8 @@ impl QueryRoot { first: Option, last: Option, ) -> FieldResult> { - let droids = ctx - .data_unchecked::() - .droids() - .iter() - .copied() - .collect::>(); + let droids = ctx.data_unchecked::().droids().to_vec(); + query_characters(after, before, first, last, &droids) .await .map(|conn| conn.map_node(Droid)) diff --git a/graphql/juniper-advanced/Cargo.toml b/graphql/juniper-advanced/Cargo.toml index d8a5ef1c..b8310435 100644 --- a/graphql/juniper-advanced/Cargo.toml +++ b/graphql/juniper-advanced/Cargo.toml @@ -4,7 +4,7 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = "4.0.0-rc.3" +actix-web = "4" actix-web-lab = "0.10" actix-cors = "0.6.0-beta.10" diff --git a/graphql/juniper/Cargo.toml b/graphql/juniper/Cargo.toml index 40244d2a..153a3f05 100644 --- a/graphql/juniper/Cargo.toml +++ b/graphql/juniper/Cargo.toml @@ -4,7 +4,7 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = "4.0.0-rc.3" +actix-web = "4" actix-web-lab = "0.10" actix-cors = "0.6.0-beta.10" diff --git a/http-proxy/Cargo.toml b/http-proxy/Cargo.toml index 2adb3671..1b84a0d0 100644 --- a/http-proxy/Cargo.toml +++ b/http-proxy/Cargo.toml @@ -4,7 +4,7 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = { version = "4.0.0-rc.3", features = ["openssl"] } +actix-web = { version = "4", features = ["openssl"] } awc = "3.0.0-beta.19" clap = { version = "3", features = ["derive"] } diff --git a/https-tls/awc-https/Cargo.toml b/https-tls/awc-https/Cargo.toml index 28b4a45b..aa02e56a 100644 --- a/https-tls/awc-https/Cargo.toml +++ b/https-tls/awc-https/Cargo.toml @@ -4,7 +4,7 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = "4.0.0-rc.3" +actix-web = "4" awc = { version = "3.0.0-beta.19", features = ["rustls"] } env_logger = "0.9" diff --git a/https-tls/openssl-auto-le/Cargo.toml b/https-tls/openssl-auto-le/Cargo.toml index 13898f5b..d17a2862 100644 --- a/https-tls/openssl-auto-le/Cargo.toml +++ b/https-tls/openssl-auto-le/Cargo.toml @@ -4,8 +4,8 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = { version = "4.0.0-rc.3", features = ["openssl"] } -actix-files = "0.6.0-beta.16" +actix-web = { version = "4", features = ["openssl"] } +actix-files = "0.6" acme-micro = "0.12" anyhow = "1" diff --git a/https-tls/openssl/Cargo.toml b/https-tls/openssl/Cargo.toml index 96f65787..f8ca61a9 100644 --- a/https-tls/openssl/Cargo.toml +++ b/https-tls/openssl/Cargo.toml @@ -4,6 +4,6 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = { version = "4.0.0-beta.21", features = ["openssl"] } +actix-web = { version = "4", features = ["openssl"] } env_logger = "0.9" openssl = "0.10" diff --git a/https-tls/rustls-client-cert/Cargo.toml b/https-tls/rustls-client-cert/Cargo.toml index 75658aa1..ad87b53a 100644 --- a/https-tls/rustls-client-cert/Cargo.toml +++ b/https-tls/rustls-client-cert/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] actix-tls = "3.0" -actix-web = { version = "4.0.0-rc.3", features = ["rustls"] } +actix-web = { version = "4", features = ["rustls"] } env_logger = "0.9" log = "0.4" rustls = "0.20.2" diff --git a/https-tls/rustls/Cargo.toml b/https-tls/rustls/Cargo.toml index 831a2028..6d128b63 100644 --- a/https-tls/rustls/Cargo.toml +++ b/https-tls/rustls/Cargo.toml @@ -11,5 +11,5 @@ path = "src/main.rs" env_logger = "0.9" rustls = "0.20.2" rustls-pemfile = "0.2.1" -actix-web = { version = "4.0.0-beta.21", features = ["rustls"] } -actix-files = "0.6.0-beta.15" +actix-web = { version = "4", features = ["rustls"] } +actix-files = "0.6" diff --git a/json/json-decode-error/Cargo.toml b/json/json-decode-error/Cargo.toml index d13d88d9..e1524dd3 100644 --- a/json/json-decode-error/Cargo.toml +++ b/json/json-decode-error/Cargo.toml @@ -4,5 +4,5 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = "4.0.0-rc.3" +actix-web = "4" serde = "1" diff --git a/json/json-error/Cargo.toml b/json/json-error/Cargo.toml index bc78abc8..0d278725 100644 --- a/json/json-error/Cargo.toml +++ b/json/json-error/Cargo.toml @@ -4,7 +4,7 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = "4.0.0-rc.3" +actix-web = "4" failure = "0.1" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/json/json-error/src/main.rs b/json/json-error/src/main.rs index c15318c5..af82eddb 100644 --- a/json/json-error/src/main.rs +++ b/json/json-error/src/main.rs @@ -1,9 +1,11 @@ -// This example is meant to show how to automatically generate a json error response when something goes wrong. -use std::fmt::{Display, Formatter, Result as FmtResult}; -use std::io; +//! This example is meant to show how to automatically generate a json error response when something goes wrong. -use actix_web::http::StatusCode; -use actix_web::{web, App, HttpServer, ResponseError}; +use std::{ + fmt::{Display, Formatter, Result as FmtResult}, + io, +}; + +use actix_web::{http::StatusCode, web, App, HttpResponse, HttpServer, ResponseError}; use serde::Serialize; use serde_json::{json, to_string_pretty}; @@ -21,13 +23,13 @@ impl Display for Error { impl ResponseError for Error { // builds the actual response to send back when an error occurs - fn error_response(&self) -> web::HttpResponse { + fn error_response(&self) -> HttpResponse { let err_json = json!({ "error": self.msg }); - web::HttpResponse::build(StatusCode::from_u16(self.status).unwrap()).json(err_json) + HttpResponse::build(StatusCode::from_u16(self.status).unwrap()).json(err_json) } } -async fn index() -> Result { +async fn index() -> Result { Err(Error { msg: "an example error message".to_string(), status: 400, diff --git a/json/json-validation/Cargo.toml b/json/json-validation/Cargo.toml index e15b9a72..1fd6535b 100644 --- a/json/json-validation/Cargo.toml +++ b/json/json-validation/Cargo.toml @@ -4,8 +4,8 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = { version = "4.0.0-beta.21", features = ["openssl"] } -awc = "3.0.0-beta.19" +actix-web = "4" +awc = { version = "3.0.0-beta.19", features = ["openssl"] } env_logger = "0.9" futures = "0.3.1" diff --git a/json/json/Cargo.toml b/json/json/Cargo.toml index 6133eab6..47931cbc 100644 --- a/json/json/Cargo.toml +++ b/json/json/Cargo.toml @@ -4,7 +4,7 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = "4.0.0-rc.3" +actix-web = "4" futures = "0.3" env_logger = "0.9.0" serde = { version = "1.0", features = ["derive"] } diff --git a/json/jsonrpc/Cargo.toml b/json/jsonrpc/Cargo.toml index 222a957c..e3f2f240 100644 --- a/json/jsonrpc/Cargo.toml +++ b/json/jsonrpc/Cargo.toml @@ -4,7 +4,7 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = "4.0.0-beta.21" +actix-web = "4" bytes = "1.1.0" env_logger = "0.9.0" diff --git a/middleware/middleware-ext-mut/Cargo.toml b/middleware/middleware-ext-mut/Cargo.toml index d5adc9e0..4645184c 100644 --- a/middleware/middleware-ext-mut/Cargo.toml +++ b/middleware/middleware-ext-mut/Cargo.toml @@ -4,6 +4,6 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = "4.0.0-rc.3" +actix-web = "4" log = "0.4" env_logger = "0.9" diff --git a/middleware/middleware-http-to-https/Cargo.toml b/middleware/middleware-http-to-https/Cargo.toml index eadfd068..b68e1517 100644 --- a/middleware/middleware-http-to-https/Cargo.toml +++ b/middleware/middleware-http-to-https/Cargo.toml @@ -4,7 +4,7 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = { version = "4.0.0-beta.21", features = ["rustls"] } +actix-web = { version = "4", features = ["rustls"] } env_logger = "0.9" futures-util = { version = "0.3.7", default-features = false, features = ["std"] } log = "0.4" diff --git a/middleware/middleware/Cargo.toml b/middleware/middleware/Cargo.toml index c3297adf..f2d9e478 100644 --- a/middleware/middleware/Cargo.toml +++ b/middleware/middleware/Cargo.toml @@ -4,7 +4,7 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = "4.0.0-rc.3" +actix-web = "4" env_logger = "0.9" futures-util = { version = "0.3.7", default-features = false, features = ["std"] } log = "0.4" diff --git a/protobuf/Cargo.toml b/protobuf/Cargo.toml index 1bc7daa7..736eacf7 100644 --- a/protobuf/Cargo.toml +++ b/protobuf/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] actix = "0.12" actix-protobuf = "0.7.0-beta.5" -actix-web = "4.0.0-rc.3" +actix-web = "4" env_logger = "0.9" log = "0.4" prost = "0.9" diff --git a/run-in-thread/Cargo.toml b/run-in-thread/Cargo.toml index b1b8a590..5e796482 100644 --- a/run-in-thread/Cargo.toml +++ b/run-in-thread/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" description = "Run Actix Web in separate thread" [dependencies] -actix-web = "4.0.0-rc.3" +actix-web = "4" env_logger = "0.9" log = "0.4" diff --git a/server-sent-events/Cargo.toml b/server-sent-events/Cargo.toml index a292df54..dc3df481 100644 --- a/server-sent-events/Cargo.toml +++ b/server-sent-events/Cargo.toml @@ -4,7 +4,7 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = "4.0.0-rc.3" +actix-web = "4" env_logger = "0.9" futures-util = { version = "0.3.7", default-features = false, features = ["std"] } log = "0.4" diff --git a/shutdown-server/Cargo.toml b/shutdown-server/Cargo.toml index 8b788e38..1196adf7 100644 --- a/shutdown-server/Cargo.toml +++ b/shutdown-server/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" description = "Send a request to the server to shut it down" [dependencies] -actix-web = "4.0.0-rc.3" +actix-web = "4" env_logger = "0.9" futures = "0.3" tokio = { version = "1.16", features = ["signal"] } diff --git a/templating/askama/Cargo.toml b/templating/askama/Cargo.toml index 8fa694d6..42fae4c9 100644 --- a/templating/askama/Cargo.toml +++ b/templating/askama/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] env_logger = "0.9.0" -actix-web = "4.0.0-beta.21" +actix-web = "4" askama = "0.11.0" [build-dependencies] diff --git a/templating/handlebars/Cargo.toml b/templating/handlebars/Cargo.toml index 1b2c77b7..b523cca4 100644 --- a/templating/handlebars/Cargo.toml +++ b/templating/handlebars/Cargo.toml @@ -4,6 +4,6 @@ version = "1.0.0" edition = "2021" [dependencies] -actix-web = "4.0.0-beta.21" +actix-web = "4" handlebars = { version = "4.2.1", features = ["dir_source"] } serde_json = "1.0" diff --git a/templating/sailfish/Cargo.toml b/templating/sailfish/Cargo.toml index 8b2e2e83..2b16b159 100644 --- a/templating/sailfish/Cargo.toml +++ b/templating/sailfish/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [dependencies] -actix-web = "4.0.0-rc.3" +actix-web = "4" actix-web-lab = "0.10" env_logger = "0.9" log = "0.4" diff --git a/templating/tera/Cargo.toml b/templating/tera/Cargo.toml index e79f2073..1ab994c7 100644 --- a/templating/tera/Cargo.toml +++ b/templating/tera/Cargo.toml @@ -6,4 +6,4 @@ edition = "2021" [dependencies] env_logger = "0.9.0" tera = "1.8.0" -actix-web = "4.0.0-beta.21" +actix-web = "4" diff --git a/templating/tera/src/main.rs b/templating/tera/src/main.rs index a96e678c..b59be2fe 100644 --- a/templating/tera/src/main.rs +++ b/templating/tera/src/main.rs @@ -15,8 +15,8 @@ async fn index( let s = if let Some(name) = query.get("name") { // submitted form let mut ctx = tera::Context::new(); - ctx.insert("name", &name.to_owned()); - ctx.insert("text", &"Welcome!".to_owned()); + ctx.insert("name", name); + ctx.insert("text", "Welcome!"); tmpl.render("user.html", &ctx) .map_err(|_| error::ErrorInternalServerError("Template error"))? } else { diff --git a/templating/tinytemplate/Cargo.toml b/templating/tinytemplate/Cargo.toml index d2f79730..7e1d40a3 100644 --- a/templating/tinytemplate/Cargo.toml +++ b/templating/tinytemplate/Cargo.toml @@ -6,5 +6,5 @@ edition = "2021" [dependencies] env_logger = "0.9.0" tinytemplate = "1.1" -actix-web = "4.0.0-beta.21" +actix-web = "4" serde_json = "1" diff --git a/templating/yarte/Cargo.toml b/templating/yarte/Cargo.toml index 2ecfd3cb..3389eac9 100644 --- a/templating/yarte/Cargo.toml +++ b/templating/yarte/Cargo.toml @@ -5,7 +5,7 @@ publish = false edition = "2021" [dependencies] -actix-web = "4.0.0-rc.3" +actix-web = "4" env_logger = "0.9.0" yarte = { version = "0.15", features = ["bytes-buf", "html-min"] } derive_more = "0.99" diff --git a/unix-socket/Cargo.toml b/unix-socket/Cargo.toml index 1942ffb2..204e2218 100644 --- a/unix-socket/Cargo.toml +++ b/unix-socket/Cargo.toml @@ -5,4 +5,4 @@ edition = "2021" [dependencies] env_logger = "0.9.0" -actix-web = "4.0.0-rc.3" +actix-web = "4" diff --git a/websockets/autobahn/Cargo.toml b/websockets/autobahn/Cargo.toml index 4ad5e7e9..ae8fd6dc 100644 --- a/websockets/autobahn/Cargo.toml +++ b/websockets/autobahn/Cargo.toml @@ -9,7 +9,7 @@ path = "src/main.rs" [dependencies] actix = "0.12" -actix-web = "4.0.0-rc.3" +actix-web = "4" actix-web-actors = "4.0.0-beta.12" env_logger = "0.9" diff --git a/websockets/chat-broker/Cargo.toml b/websockets/chat-broker/Cargo.toml index 6d2d7a5c..78679efb 100644 --- a/websockets/chat-broker/Cargo.toml +++ b/websockets/chat-broker/Cargo.toml @@ -10,8 +10,8 @@ path = "src/main.rs" [dependencies] actix = "0.12" actix-broker = "0.4" -actix-files = "0.6.0-beta.16" -actix-web = "4.0.0-rc.3" +actix-files = "0.6" +actix-web = "4" actix-web-actors = "4.0.0-beta.12" env_logger = "0.9" diff --git a/websockets/chat-tcp/Cargo.toml b/websockets/chat-tcp/Cargo.toml index be80c5c1..d2450ef9 100644 --- a/websockets/chat-tcp/Cargo.toml +++ b/websockets/chat-tcp/Cargo.toml @@ -14,8 +14,8 @@ path = "src/client.rs" [dependencies] actix = "0.12" actix-codec = "0.4.1" -actix-files = "0.6.0-beta.16" -actix-web = "4.0.0-rc.3" +actix-files = "0.6" +actix-web = "4" actix-web-actors = "4.0.0-beta.11" byteorder = "1.2" diff --git a/websockets/chat-tcp/src/server.rs b/websockets/chat-tcp/src/server.rs index e2f66358..a23b57b5 100644 --- a/websockets/chat-tcp/src/server.rs +++ b/websockets/chat-tcp/src/server.rs @@ -107,7 +107,7 @@ impl Handler for ChatServer { println!("Someone joined"); // notify all users in same room - self.send_message(&"Main".to_owned(), "Someone joined", 0); + self.send_message("Main", "Someone joined", 0); // register session with random id let id = self.rng.gen::(); diff --git a/websockets/chat/Cargo.toml b/websockets/chat/Cargo.toml index eea1a5c6..8018fb59 100644 --- a/websockets/chat/Cargo.toml +++ b/websockets/chat/Cargo.toml @@ -9,8 +9,8 @@ path = "src/main.rs" [dependencies] actix = "0.12" -actix-files = "0.6.0-beta.16" -actix-web = "4.0.0-rc.3" +actix-files = "0.6" +actix-web = "4" actix-web-actors = "4.0.0-beta.12" env_logger = "0.9" diff --git a/websockets/echo/Cargo.toml b/websockets/echo/Cargo.toml index d1a73ef0..468c5a3f 100644 --- a/websockets/echo/Cargo.toml +++ b/websockets/echo/Cargo.toml @@ -14,9 +14,9 @@ path = "src/client.rs" [dependencies] actix = "0.12" actix-codec = "0.5" -actix-files = "0.6.0-beta.16" +actix-files = "0.6" actix-rt = "2" -actix-web = "4.0.0-rc.3" +actix-web = "4" actix-web-actors = "4.0.0-beta.12" awc = "3.0.0-beta.21"