update some easy deps

Cargo.lock

@@ -2064,18 +2064,6 @@ dependencies = [
  "instant",
 ]
 
-[[package]]
-name = "filetime"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94a7bbaa59354bc20dd75b67f23e2797b4490e9d6928203fb105c79e448c86c"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "redox_syscall",
- "windows-sys",
-]
-
 [[package]]
 name = "firestorm"
 version = "0.5.1"
@@ -2526,15 +2514,6 @@ dependencies = [
  "digest 0.10.3",
 ]
 
-[[package]]
-name = "home"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2456aef2e6b6a9784192ae780c0f15bc57df0e918585282325e8c8ac27737654"
-dependencies = [
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "hostname"
 version = "0.3.1"
@@ -2821,12 +2800,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d"
 
-[[package]]
-name = "itoap"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9028f49264629065d057f340a86acb84867925865f73bbf8d47b4d149a7e88b8"
-
 [[package]]
 name = "jobserver"
 version = "0.1.24"
@@ -2876,7 +2849,6 @@ dependencies = [
  "serde",
  "serde_json",
  "validator",
- "validator_derive",
 ]
 
 [[package]]
@@ -3046,9 +3018,9 @@ checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
 
 [[package]]
 name = "libsqlite3-sys"
-version = "0.23.2"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2cafc7c74096c336d9d27145f7ebd4f4b6f95ba16aa5a282387267e6925cb58"
+checksum = "898745e570c7d0453cc1fbc4a701eb6c662ed54e8fec8b7d14be137ebeeb9d14"
 dependencies = [
  "cc",
  "pkg-config",
@@ -3225,7 +3197,7 @@ dependencies = [
  "futures-util",
  "log",
  "rustls 0.20.6",
- "rustls-pemfile 0.2.1",
+ "rustls-pemfile 1.0.0",
 ]
 
 [[package]]
@@ -4071,11 +4043,11 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.36"
+version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
+checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7"
 dependencies = [
- "unicode-xid",
+ "unicode-ident",
 ]
 
 [[package]]
@@ -4170,9 +4142,9 @@ dependencies = [
 
 [[package]]
 name = "r2d2_sqlite"
-version = "0.19.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54ca3c9468a76fc2ad724c486a59682fc362efeac7b18d1c012958bc19f34800"
+checksum = "6fdc8e4da70586127893be32b7adf21326a4c6b1aba907611edf467d13ffe895"
 dependencies = [
  "r2d2",
  "rusqlite",
@@ -4537,9 +4509,9 @@ dependencies = [
 
 [[package]]
 name = "rusoto_core"
-version = "0.47.0"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b4f000e8934c1b4f70adde180056812e7ea6b1a247952db8ee98c94cd3116cc"
+checksum = "1db30db44ea73551326269adcf7a2169428a054f14faf9e1768f2163494f2fa2"
 dependencies = [
  "async-trait",
  "base64 0.13.0",
@@ -4562,9 +4534,9 @@ dependencies = [
 
 [[package]]
 name = "rusoto_credential"
-version = "0.47.0"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a46b67db7bb66f5541e44db22b0a02fed59c9603e146db3a9e633272d3bac2f"
+checksum = "ee0a6c13db5aad6047b6a44ef023dbbc21a056b6dab5be3b79ce4283d5c02d05"
 dependencies = [
  "async-trait",
  "chrono",
@@ -4580,9 +4552,9 @@ dependencies = [
 
 [[package]]
 name = "rusoto_s3"
-version = "0.47.0"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "048c2fe811a823ad5a9acc976e8bf4f1d910df719dcf44b15c3e96c5b7a51027"
+checksum = "7aae4677183411f6b0b412d66194ef5403293917d66e70ab118f07cc24c5b14d"
 dependencies = [
  "async-trait",
  "bytes 1.1.0",
@@ -4593,9 +4565,9 @@ dependencies = [
 
 [[package]]
 name = "rusoto_signature"
-version = "0.47.0"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6264e93384b90a747758bcc82079711eacf2e755c3a8b5091687b5349d870bcc"
+checksum = "a5ae95491c8b4847931e291b151127eccd6ff8ca13f33603eb3d0035ecb05272"
 dependencies = [
  "base64 0.13.0",
  "bytes 1.1.0",
@@ -4619,9 +4591,9 @@ dependencies = [
 
 [[package]]
 name = "rusqlite"
-version = "0.26.3"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ba4d3462c8b2e4d7f4fcfcf2b296dc6b65404fbbc7b63daa37fd485c149daf7"
+checksum = "85127183a999f7db96d1a976a309eebbfb6ea3b0b400ddd8340190129de6eb7a"
 dependencies = [
  "bitflags",
  "fallible-iterator",
@@ -4733,7 +4705,7 @@ dependencies = [
  "env_logger",
  "log",
  "rustls 0.20.6",
- "rustls-pemfile 0.2.1",
+ "rustls-pemfile 1.0.0",
 ]
 
 [[package]]
@@ -4746,16 +4718,7 @@ dependencies = [
  "env_logger",
  "log",
  "rustls 0.20.6",
- "rustls-pemfile 0.3.0",
+ "rustls-pemfile 1.0.0",
-]
-
-[[package]]
-name = "rustls-pemfile"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9"
-dependencies = [
- "base64 0.13.0",
 ]
 
 [[package]]
@@ -4767,49 +4730,21 @@ dependencies = [
  "base64 0.13.0",
 ]
 
+[[package]]
+name = "rustls-pemfile"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7522c9de787ff061458fe9a829dc790a3f5b22dc571694fc5883f448b94d9a9"
+dependencies = [
+ "base64 0.13.0",
+]
+
 [[package]]
 name = "ryu"
 version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695"
 
-[[package]]
-name = "sailfish"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31f030905cfc5f869b6784dc4e5c83a20d1f77c92bae1a0d158baf9404100c3e"
-dependencies = [
- "itoap",
- "ryu",
- "sailfish-macros",
- "version_check",
-]
-
-[[package]]
-name = "sailfish-compiler"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7a8620f80b37af2e55153ee142bfdb8085f30c454be453e922466d483b0d184"
-dependencies = [
- "filetime",
- "home",
- "memchr",
- "proc-macro2",
- "quote",
- "syn",
- "yaml-rust",
-]
-
-[[package]]
-name = "sailfish-macros"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b31ded532bded4637d49297e3247476ebc266efab4b054dc48037fa88846fdeb"
-dependencies = [
- "proc-macro2",
- "sailfish-compiler",
-]
-
 [[package]]
 name = "same-file"
 version = "1.0.6"
@@ -4821,9 +4756,9 @@ dependencies = [
 
 [[package]]
 name = "sanitize-filename"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf18934a12018228c5b55a6dae9df5d0641e3566b3630cb46cc55564068e7c2f"
+checksum = "08c502bdb638f1396509467cb0580ef3b29aa2a45c5d43e5d84928241280296c"
 dependencies = [
  "lazy_static",
  "regex",
@@ -5270,9 +5205,9 @@ dependencies = [
 
 [[package]]
 name = "sqlx-core"
-version = "0.5.11"
+version = "0.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "195183bf6ff8328bb82c0511a83faf60aacf75840103388851db61d7a9854ae3"
+checksum = "e48c61941ccf5ddcada342cd59e3e5173b007c509e1e8e990dafc830294d9dc5"
 dependencies = [
  "ahash",
  "atoi",
@@ -5282,6 +5217,7 @@ dependencies = [
  "crc",
  "crossbeam-queue",
  "either",
+ "event-listener",
  "flume",
  "futures-channel",
  "futures-core",
@@ -5301,7 +5237,7 @@ dependencies = [
  "percent-encoding",
  "rustls 0.19.1",
  "serde",
- "sha2 0.9.9",
+ "sha2 0.10.2",
  "smallvec",
  "sqlformat",
  "sqlx-rt",
@@ -5568,17 +5504,6 @@ dependencies = [
  "serde_json",
 ]
 
-[[package]]
-name = "template_sailfish"
-version = "0.1.0"
-dependencies = [
- "actix-web",
- "actix-web-lab",
- "env_logger",
- "log",
- "sailfish",
-]
-
 [[package]]
 name = "template_yarte"
 version = "1.0.0"
@@ -6208,6 +6133,12 @@ version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
 
+[[package]]
+name = "unicode-ident"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c"
+
 [[package]]
 name = "unicode-normalization"
 version = "0.1.21"
@@ -6362,9 +6293,9 @@ dependencies = [
 
 [[package]]
 name = "validator"
-version = "0.14.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d0f08911ab0fee2c5009580f04615fa868898ee57de10692a45da0c3bcc3e5e"
+checksum = "f07b0a1390e01c0fc35ebb26b28ced33c9a3808f7f9fbe94d3cc01e233bfeed5"
 dependencies = [
  "idna",
  "lazy_static",
@@ -6373,14 +6304,14 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "url",
- "validator_types",
+ "validator_derive",
 ]
 
 [[package]]
 name = "validator_derive"
-version = "0.14.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d85135714dba11a1bd0b3eb1744169266f1a38977bf4e3ff5e2e1acb8c2b7eee"
+checksum = "ea7ed5e8cf2b6bdd64a6c4ce851da25388a89327b17b88424ceced6bd5017923"
 dependencies = [
  "if_chain",
  "lazy_static",
@@ -6394,9 +6325,9 @@ dependencies = [
 
 [[package]]
 name = "validator_types"
-version = "0.14.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ded9d97e1d42327632f5f3bae6403c04886e2de3036261ef42deebd931a6a291"
+checksum = "d2ddf34293296847abfc1493b15c6e2f5d3cd19f57ad7d22673bf4c6278da329"
 dependencies = [
  "proc-macro2",
  "syn",

auth/simple-auth-server/Cargo.toml

@@ -9,7 +9,7 @@ actix-identity = "0.4"
 
 chrono = { version = "0.4", features = ["serde"] }
 derive_more = "0.99.5"
-diesel = { version = "1.4.5", features = ["postgres", "uuidv07", "r2d2", "chrono"] }
+diesel = { version = "1.4", features = ["postgres", "uuidv07", "r2d2", "chrono"] }
 dotenv = "0.15"
 env_logger = "0.9"
 r2d2 = "0.8"
@@ -18,5 +18,5 @@ lazy_static = "1.4"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 sparkpost = "0.5"
-uuid = { version = "0.8", features = ["serde", "v4"] }
+uuid = { version = "0.8", features = ["v4", "serde"] }
 time = "0.3"

databases/sqlite/Cargo.toml

@@ -10,7 +10,7 @@ env_logger = "0.9"
 futures-util = { version = "0.3", default-features = false, features = ["std"] }
 log = "0.4"
 r2d2 = "0.8"
-r2d2_sqlite = "0.19"
+r2d2_sqlite = "0.20"
-rusqlite = "0.26"
+rusqlite = "0.27"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"

forms/multipart-s3/Cargo.toml

@@ -11,8 +11,8 @@ dotenv = "0.15.0"
 env_logger = "0.9"
 futures-util = { version = "0.3.7", default-features = false, features = ["std"] }
 log = "0.4"
-rusoto_core = "0.47.0"
+rusoto_core = "0.48"
-rusoto_s3 = "0.47.0"
+rusoto_s3 = "0.48"
-sanitize-filename = "0.3"
+sanitize-filename = "0.4"
 serde = { version = "1.0.104", features = ["derive"] }
 serde_json = "1.0"

forms/multipart/Cargo.toml

@@ -13,5 +13,5 @@ actix-multipart = "0.4"
 actix-web = "4"
 
 futures-util = { version = "0.3.7", default-features = false, features = ["std"] }
-sanitize-filename = "0.3"
+sanitize-filename = "0.4"
 uuid = { version = "0.8", features = ["v4"] }

http-proxy/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 actix-web = { version = "4", features = ["openssl"] }
-awc = "3.0.0-beta.21"
+awc = "3"
 
 clap = { version = "3", features = ["derive"] }
 env_logger = "0.9"

https-tls/awc-https/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 actix-web = "4"
-awc = { version = "3.0.0-beta.21", features = ["rustls"] }
+awc = { version = "3", features = ["rustls"] }
 
 env_logger = "0.9"
 log = "0.4"

https-tls/rustls-client-cert/Cargo.toml

@@ -8,5 +8,5 @@ actix-tls = "3.0"
 actix-web = { version = "4", features = ["rustls"] }
 env_logger = "0.9"
 log = "0.4"
-rustls = "0.20.2"
+rustls = "0.20"
-rustls-pemfile = "0.2.1"
+rustls-pemfile = "1"

https-tls/rustls/Cargo.toml

@@ -15,4 +15,4 @@ actix-files = "0.6"
 env_logger = "0.9"
 log = "0.4"
 rustls = "0.20.2"
-rustls-pemfile = "0.3"
+rustls-pemfile = "1"

json/json-validation/Cargo.toml

@@ -5,12 +5,11 @@ edition = "2021"
 
 [dependencies]
 actix-web = "4"
-awc = { version = "3.0.0-beta.21", features = ["openssl"] }
+awc = { version = "3", features = ["openssl"] }
 
 env_logger = "0.9"
 futures-util = { version = "0.3.7", default-features = false, features = ["std"] }
 log = "0.4"
-serde = { version = "1.0.43", features = ["derive"] }
+serde = { version = "1", features = ["derive"] }
-serde_json = "1.0.16"
+serde_json = "1"
-validator = "0.14"
+validator = { version = "0.15", features = ["derive"] }
-validator_derive = "0.14"

json/json-validation/src/main.rs

@@ -24,7 +24,6 @@ use awc::Client;
 use futures_util::StreamExt as _;
 use serde::{Deserialize, Serialize};
 use validator::Validate;
-use validator_derive::Validate;
 
 #[derive(Debug, Validate, Deserialize, Serialize)]
 struct SomeData {

middleware/middleware-http-to-https/Cargo.toml

@@ -10,5 +10,5 @@ actix-web-lab = "0.16"
 env_logger = "0.9"
 futures-util = { version = "0.3.7", default-features = false, features = ["std"] }
 log = "0.4"
-rustls = "0.20.2"
+rustls = "0.20"
-rustls-pemfile = "0.2.1"
+rustls-pemfile = "1"

websockets/echo/Cargo.toml

@@ -18,7 +18,7 @@ actix-files = "0.6"
 actix-rt = "2"
 actix-web = "4"
 actix-web-actors = "4.1"
-awc = "3.0.0-beta.21"
+awc = "3"
 
 env_logger = "0.9"
 futures-util = { version = "0.3.7", default-features = false, features = ["std", "sink"] }