diff --git a/Cargo.lock b/Cargo.lock index d59759d..6e22a8a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -178,12 +178,6 @@ dependencies = [ "rustc-demangle", ] -[[package]] -name = "base64" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" - [[package]] name = "base64" version = "0.21.4" @@ -328,10 +322,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3cd91cf61412820176e137621345ee43b3f4423e589e7ae4e50d601d93e35ef8" dependencies = [ "aes-gcm", - "base64 0.21.4", + "base64", "hmac", "percent-encoding", - "rand 0.8.5", + "rand", "sha2", "subtle", "time", @@ -388,7 +382,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", - "rand_core 0.6.4", + "rand_core", "typenum", ] @@ -631,17 +625,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - [[package]] name = "getrandom" version = "0.2.10" @@ -650,7 +633,7 @@ checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -706,7 +689,7 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" dependencies = [ - "base64 0.21.4", + "base64", "bytes", "headers-core", "http", @@ -1015,7 +998,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys", ] @@ -1275,19 +1258,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - [[package]] name = "rand" version = "0.8.5" @@ -1295,18 +1265,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "rand_chacha", + "rand_core", ] [[package]] @@ -1316,16 +1276,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", + "rand_core", ] [[package]] @@ -1334,16 +1285,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.10", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", + "getrandom", ] [[package]] @@ -1429,7 +1371,7 @@ version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b0a930679d54e46fa4e66be3d9a333026da04d2b659e42aab4dfd1586452815" dependencies = [ - "base64 0.21.4", + "base64", "bytecount", "itertools", "md5", @@ -1465,9 +1407,9 @@ checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "salvo" -version = "0.58.2" +version = "0.58.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0206b25c533ed47049843951c74e884a005dcfe057b3af783059d9ae0e40d0f" +checksum = "510e7dbb3e5bf53bd7144a17a71d2be3db5f4bfdf698fa3dc76e0e0f0a9810a5" dependencies = [ "salvo-compression", "salvo_core", @@ -1476,9 +1418,9 @@ dependencies = [ [[package]] name = "salvo-compression" -version = "0.58.2" +version = "0.58.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26f3a40c0d9afe4582536a8c3af8cf4e1924408d11495c46688611ba3b6b2c3c" +checksum = "1d68b52f4ddfcfd8d066f9545d751d347a89cc7e209e1a69f60d220bacf5daa9" dependencies = [ "brotli", "bytes", @@ -1513,13 +1455,13 @@ dependencies = [ [[package]] name = "salvo_core" -version = "0.58.2" +version = "0.58.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "661eabf006e4b5dde529a7a31dd875f82b9505d64ac82a517538729d9110941a" +checksum = "95c1ffacceac361b0e502f5bd78060ef6ca4c4c2a76cecc3c91b6100495b121b" dependencies = [ "anyhow", "async-trait", - "base64 0.21.4", + "base64", "brotli", "bytes", "cookie", @@ -1543,6 +1485,7 @@ dependencies = [ "parking_lot", "percent-encoding", "pin-project", + "rand", "regex", "salvo-utils", "salvo_macros", @@ -1552,7 +1495,6 @@ dependencies = [ "serde_urlencoded", "sync_wrapper", "tempfile", - "textnonce", "thiserror", "tokio", "tokio-util", @@ -1563,11 +1505,11 @@ dependencies = [ [[package]] name = "salvo_extra" -version = "0.58.2" +version = "0.58.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "783da9bd48e8ac99b2c389f8986ac312498ee38e90597e027f40a1f5928af746" +checksum = "9cf1ce97f5128170731dea2e3d073f1436fdcbc7ae5d2fe03bad1ff2b0c80f1b" dependencies = [ - "base64 0.21.4", + "base64", "etag", "futures-util", "hyper", @@ -1583,9 +1525,9 @@ dependencies = [ [[package]] name = "salvo_macros" -version = "0.58.2" +version = "0.58.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d3886e7c3e07d17664800b7aa0015839759e231c29069dc101f7e351531bd1" +checksum = "21d6ffc291795b0dae3c5a9f279ae538274dbbdf53602f7dcf7a1314d7b0e2d9" dependencies = [ "cruet", "proc-macro-crate", @@ -1782,16 +1724,6 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "textnonce" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7743f8d70cd784ed1dc33106a18998d77758d281dc40dc3e6d050cf0f5286683" -dependencies = [ - "base64 0.12.3", - "rand 0.7.3", -] - [[package]] name = "thiserror" version = "1.0.48" @@ -2037,7 +1969,7 @@ dependencies = [ "byteorder", "bytes", "log", - "rand 0.8.5", + "rand", "thiserror", "utf-8", ] @@ -2054,7 +1986,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e37c4b6cbcc59a8dcd09a6429fbc7890286bcbb79215cea7b38a3c4c0921d93" dependencies = [ - "rand 0.8.5", + "rand", ] [[package]] @@ -2159,12 +2091,6 @@ dependencies = [ "try-lock", ] -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" diff --git a/Cargo.toml b/Cargo.toml index 854f20f..367da69 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ mime = "0.3.17" mime_guess = "2.0.4" pulldown-cmark = "0.9" ructe = "0.17.0" -salvo = { version = "0.58.2", features = ["affix", "anyhow", "caching-headers", "compression", "logging", "trailing-slash"] } +salvo = { version = "0.58.3", features = ["affix", "anyhow", "caching-headers", "compression", "logging", "trailing-slash"] } serde = { version = "1.0.189", features = ["derive"] } serde_yaml = "0.9.26" slug = "0.1.4"