From c7f533709918cc559254a7f2ccd0263335d17c69 Mon Sep 17 00:00:00 2001 From: Nutomic Date: Fri, 1 Apr 2022 18:37:51 +0000 Subject: [PATCH] Run cargo upgrade (#2176) * Run cargo upgrade and cargo update * Fixing validation (#2179) Co-authored-by: Dessalines --- Cargo.lock | 1308 +++++++++++++------------- Cargo.toml | 40 +- crates/api/Cargo.toml | 36 +- crates/api_common/Cargo.toml | 10 +- crates/api_crud/Cargo.toml | 36 +- crates/apub/Cargo.toml | 46 +- crates/apub_lib/Cargo.toml | 28 +- crates/apub_lib_derive/Cargo.toml | 8 +- crates/db_schema/Cargo.toml | 18 +- crates/db_views/Cargo.toml | 6 +- crates/db_views_actor/Cargo.toml | 2 +- crates/db_views_moderator/Cargo.toml | 2 +- crates/routes/Cargo.toml | 22 +- crates/utils/Cargo.toml | 44 +- crates/utils/src/claims.rs | 9 +- crates/websocket/Cargo.toml | 30 +- crates/websocket/src/handlers.rs | 2 +- 17 files changed, 803 insertions(+), 844 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cf16d2e4..e2efe8d6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -33,24 +33,7 @@ dependencies = [ "pin-project-lite", "smallvec", "tokio", - "tokio-util 0.7.0", -] - -[[package]] -name = "actix-codec" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13895df506faee81e423febbae3a33b27fca71831b96bb3d60adf16ebcfea952" -dependencies = [ - "bitflags", - "bytes", - "futures-core", - "futures-sink", - "log", - "memchr", - "pin-project-lite", - "tokio", - "tokio-util 0.6.9", + "tokio-util 0.7.1", ] [[package]] @@ -67,22 +50,22 @@ dependencies = [ "memchr", "pin-project-lite", "tokio", - "tokio-util 0.7.0", + "tokio-util 0.7.1", ] [[package]] name = "actix-http" -version = "3.0.0" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3fdd63b9cfeaf92eeeece719dabbddddb420a57d3fd171ce1490ecfb7086b1" +checksum = "a5885cb81a0d4d0d322864bea1bb6c2a8144626b4fdc625d4c51eba197e7797a" dependencies = [ - "actix-codec 0.5.0", + "actix-codec", "actix-rt", "actix-service", "actix-tls", "actix-utils", "ahash", - "base64 0.13.0", + "base64", "bitflags", "bytes", "bytestring", @@ -93,14 +76,14 @@ dependencies = [ "http", "httparse", "httpdate", - "itoa 1.0.1", + "itoa", "language-tags", "local-channel", "log", "mime", "percent-encoding", "pin-project-lite", - "rand 0.8.4", + "rand 0.8.5", "sha-1 0.10.0", "smallvec", ] @@ -111,8 +94,8 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "465a6172cf69b960917811022d8f29bc0b7fa1398bc4f78b3c466673db1213b6" dependencies = [ - "quote 1.0.10", - "syn 1.0.82", + "quote 1.0.17", + "syn 1.0.90", ] [[package]] @@ -131,9 +114,9 @@ dependencies = [ [[package]] name = "actix-rt" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdf3f2183be1241ed4dd22611850b85d38de0b08a09f1f7bcccbd0809084b359" +checksum = "7ea16c295198e958ef31930a6ef37d0fb64e9ca3b6116e6b93a8bdae96ee1000" dependencies = [ "actix-macros", "futures-core", @@ -142,27 +125,27 @@ dependencies = [ [[package]] name = "actix-server" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9e7472ac180abb0a8e592b653744345983a7a14f44691c8394a799d0df4dbbf" +checksum = "0da34f8e659ea1b077bb4637948b815cd3768ad5a188fdcd74ff4d84240cd824" dependencies = [ "actix-rt", "actix-service", "actix-utils", "futures-core", "futures-util", - "log", - "mio 0.8.0", + "mio", "num_cpus", "socket2", "tokio", + "tracing", ] [[package]] name = "actix-service" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3dc6a618b082974a08d7a4781d24d4691cba51500059bfebe6656a61ebfe1e" +checksum = "3b894941f818cfdc7ccc4b9e60fa7e53b5042a2e8567270f9147d5591893373a" dependencies = [ "futures-core", "paste", @@ -171,20 +154,19 @@ dependencies = [ [[package]] name = "actix-tls" -version = "3.0.0" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5ef5760747cdfb108a1f35e6911a7a40939da893f95e035f9eee0c18b4b4025" +checksum = "9fde0cf292f7cdc7f070803cb9a0d45c018441321a78b1042ffbbb81ec333297" dependencies = [ - "actix-codec 0.4.1", + "actix-codec", "actix-rt", "actix-service", "actix-utils", - "derive_more", "futures-core", "log", "pin-project-lite", "tokio-rustls", - "tokio-util 0.6.9", + "tokio-util 0.7.1", "webpki-roots", ] @@ -204,7 +186,7 @@ version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4e5ebffd51d50df56a3ae0de0e59487340ca456f05dd0b90c0a7a6dd6a74d31" dependencies = [ - "actix-codec 0.5.0", + "actix-codec", "actix-http", "actix-macros", "actix-router", @@ -223,7 +205,7 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "itoa 1.0.1", + "itoa", "language-tags", "log", "mime", @@ -235,7 +217,7 @@ dependencies = [ "serde_urlencoded", "smallvec", "socket2", - "time 0.3.5", + "time 0.3.9", "url", ] @@ -246,7 +228,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "31efe7896f3933ce03dd4710be560254272334bb321a18fd8ff62b1a557d9d19" dependencies = [ "actix", - "actix-codec 0.5.0", + "actix-codec", "actix-http", "actix-web", "bytes", @@ -263,9 +245,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7525bedf54704abb1d469e88d7e7e9226df73778798a69cea5022d53b2ae91bc" dependencies = [ "actix-router", - "proc-macro2 1.0.33", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", + "quote 1.0.17", + "syn 1.0.90", ] [[package]] @@ -274,9 +256,9 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d44b8fee1ced9671ba043476deddef739dd0959bf77030b26b738cc591737a7" dependencies = [ - "proc-macro2 1.0.33", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", + "quote 1.0.17", + "syn 1.0.90", ] [[package]] @@ -297,7 +279,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.3", + "getrandom 0.2.6", "once_cell", "version_check", ] @@ -322,9 +304,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.51" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b26702f315f53b6071259e15dd9d64528213b44d61de1ec926eca7715d62203" +checksum = "4361135be9122e0870de935d7c439aef945b9f9ddd4199a553b5270b49c82a27" [[package]] name = "arrayvec" @@ -353,9 +335,9 @@ dependencies = [ [[package]] name = "async-stream" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "171374e7e3b2504e0e5236e3b59260560f9fe94bfe9ac39ba5e4e929c5590625" +checksum = "dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e" dependencies = [ "async-stream-impl", "futures-core", @@ -363,24 +345,24 @@ dependencies = [ [[package]] name = "async-stream-impl" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "648ed8c8d2ce5409ccd57453d9d1b214b342a0d69376a6feda1fd6cae3299308" +checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27" dependencies = [ - "proc-macro2 1.0.33", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", + "quote 1.0.17", + "syn 1.0.90", ] [[package]] name = "async-trait" -version = "0.1.52" +version = "0.1.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3" +checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600" dependencies = [ - "proc-macro2 1.0.33", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", + "quote 1.0.17", + "syn 1.0.90", ] [[package]] @@ -398,15 +380,15 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "background-jobs" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77f4508c6c5b5cfc6c18d43d0ba6ecda339710206854da9e1c9ac9dfb7e3eb6f" +checksum = "5c301b3ccb60fa2aadb4da111e27b257ddc4f0509848c43c85764dc14f7a49a3" dependencies = [ "background-jobs-actix", "background-jobs-core", @@ -414,16 +396,15 @@ dependencies = [ [[package]] name = "background-jobs-actix" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dabf6a2204fe034db7910a38f8e2d183fe24eb92abd4c0aaca59f8cacf4e48b" +checksum = "65a0dcbc94e0644fcfbaddc19705fae2d6947426682aeab7582d772f4d80b8df" dependencies = [ "actix-rt", "anyhow", "async-mutex", "async-trait", "background-jobs-core", - "chrono", "num_cpus", "serde", "serde_json", @@ -436,29 +417,23 @@ dependencies = [ [[package]] name = "background-jobs-core" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "174d36b170699ecc13b7513bda9eff6f12cc889eae5d16b792daa3f7b21be452" +checksum = "82fe510c99cea8b98c438e81f43c666e9b4cd3630a42a1684ed1d01db4271cfb" dependencies = [ "actix-rt", "anyhow", "async-mutex", "async-trait", - "chrono", "serde", "serde_json", "thiserror", + "time 0.3.9", "tracing", "tracing-futures", "uuid", ] -[[package]] -name = "base64" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" - [[package]] name = "base64" version = "0.13.0" @@ -467,13 +442,14 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "bcrypt" -version = "0.10.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f691e63585950d8c1c43644d11bab9073e40f5060dd2822734ae7c3dc69a3a80" +checksum = "6fe4fef31efb0f76133ae8e3576a88e58edb7cfc5584c81c758c349ba46b43fc" dependencies = [ - "base64 0.13.0", + "base64", "blowfish", - "getrandom 0.2.3", + "getrandom 0.2.6", + "zeroize", ] [[package]] @@ -523,11 +499,11 @@ dependencies = [ [[package]] name = "block-buffer" -version = "0.10.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1d36a02058e76b040de25a4464ba1c80935655595b661505c8b39b664828b95" +checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.5", ] [[package]] @@ -541,20 +517,19 @@ dependencies = [ [[package]] name = "blowfish" -version = "0.8.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe3ff3fc1de48c1ac2e3341c4df38b0d1bfb8fdf04632a187c8b75aaa319a7ab" +checksum = "e412e2cd0f2b2d93e02543ceae7917b3c70331573df19ee046bcbc35e45e87d7" dependencies = [ "byteorder", "cipher", - "opaque-debug 0.3.0", ] [[package]] name = "bumpalo" -version = "3.8.0" +version = "3.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1e260c3a9040a7c19a12468758f4c16f31a81a1fe087482be9570ec864bb6c" +checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899" [[package]] name = "byte-tools" @@ -564,9 +539,9 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[package]] name = "bytemuck" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72957246c41db82b8ef88a5486143830adeb8227ef9837740bdec67724cf2c5b" +checksum = "0e851ca7c24871e7336801608a4797d7376545b6928a10d32d75685687141ead" [[package]] name = "byteorder" @@ -595,7 +570,7 @@ version = "0.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29256038744434f6d0e1328d7c9050f14aa5fc8562ff065b9e9481ac293ba5bc" dependencies = [ - "base64 0.13.0", + "base64", "hound", "image", "lodepng", @@ -605,9 +580,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.72" +version = "1.0.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee" +checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" [[package]] name = "cesu8" @@ -637,11 +612,12 @@ dependencies = [ [[package]] name = "cipher" -version = "0.3.0" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" +checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e" dependencies = [ - "generic-array 0.14.4", + "crypto-common", + "inout", ] [[package]] @@ -661,9 +637,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "combine" -version = "4.6.2" +version = "4.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b2f5d0ee456f3928812dfc8c6d9a1d592b98678f6d56db9b0cd2b7bc6c8db5" +checksum = "50b727aacc797f9fc28e355d21f34709ac4fc9adecfe470ad07b8f4464f53062" dependencies = [ "bytes", "memchr", @@ -689,33 +665,36 @@ dependencies = [ [[package]] name = "console-api" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "033fddce299c93dd44ae21d5f5a6e749baa5d103784bcdde65701c07272a9fde" +checksum = "cc347c19eb5b940f396ac155822caee6662f850d97306890ac3773ed76c90c5a" dependencies = [ - "prost 0.9.0", - "prost-types 0.9.0", - "tonic 0.6.2", - "tonic-build 0.6.2", + "prost", + "prost-types", + "tonic", + "tonic-build", "tracing-core", ] [[package]] name = "console-subscriber" -version = "0.1.0" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2380cc150266375aeda8f9aeadc5527395c1a8807ecf9fa97a46d1bb760ec5b" +checksum = "565a7dfea2d10dd0e5c57cc394d5d441b1910960d8c9211ed14135e0e6ec3a20" dependencies = [ "console-api", + "crossbeam-channel", + "crossbeam-utils", "futures", "hdrhistogram", "humantime", + "prost-types", "serde", "serde_json", "thread_local", "tokio", "tokio-stream", - "tonic 0.6.2", + "tonic", "tracing", "tracing-core", "tracing-subscriber", @@ -734,15 +713,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94d4706de1b0fa5b132270cddffa8585166037822e260a944fe161acd137ca05" dependencies = [ "percent-encoding", - "time 0.3.5", + "time 0.3.9", "version_check", ] [[package]] name = "core-foundation" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6888e10551bb93e424d8df1d07f1a8b4fceb0001a3a4b048bfc47554946f47b3" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" dependencies = [ "core-foundation-sys", "libc", @@ -756,27 +735,27 @@ checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" [[package]] name = "cpufeatures" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469" +checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.3.0" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "738c290dfaea84fc1ca15ad9c168d083b05a714e1efddd8edaab678dc28d2836" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam-channel" -version = "0.5.1" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" +checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53" dependencies = [ "cfg-if", "crossbeam-utils", @@ -795,10 +774,11 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.5" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" +checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c" dependencies = [ + "autocfg", "cfg-if", "crossbeam-utils", "lazy_static", @@ -808,9 +788,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.5" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" +checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" dependencies = [ "cfg-if", "lazy_static", @@ -818,11 +798,12 @@ dependencies = [ [[package]] name = "crypto-common" -version = "0.1.0" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567569e659735adb39ff2d4c20600f7cd78be5471f8c58ab162bce3c03fdbc5f" +checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.5", + "typenum", ] [[package]] @@ -853,10 +834,10 @@ checksum = "8e91455b86830a1c21799d94524df0845183fa55bafd9aa137b01c7d1065fa36" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.33", - "quote 1.0.10", + "proc-macro2 1.0.36", + "quote 1.0.17", "strsim", - "syn 1.0.82", + "syn 1.0.90", ] [[package]] @@ -867,10 +848,10 @@ checksum = "7a340f241d2ceed1deb47ae36c4144b2707ec7dd0b649f894cb39bb595986324" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.33", - "quote 1.0.10", + "proc-macro2 1.0.36", + "quote 1.0.17", "strsim", - "syn 1.0.82", + "syn 1.0.90", ] [[package]] @@ -880,8 +861,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29b5acf0dea37a7f66f7b25d2c5e93fd46f8f6968b1a5d7a3e02e97768afc95a" dependencies = [ "darling_core 0.12.4", - "quote 1.0.10", - "syn 1.0.82", + "quote 1.0.17", + "syn 1.0.90", ] [[package]] @@ -891,8 +872,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72c41b3b7352feb3211a0d743dc5700a4e3b60f51bd2b368892d1e0f9a95f44b" dependencies = [ "darling_core 0.13.1", - "quote 1.0.10", - "syn 1.0.82", + "quote 1.0.17", + "syn 1.0.90", ] [[package]] @@ -921,9 +902,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "66e616858f6187ed828df7c64a6d71720d83767a7f19740b2d1b6fe6327b36e5" dependencies = [ "darling 0.12.4", - "proc-macro2 1.0.33", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", + "quote 1.0.17", + "syn 1.0.90", ] [[package]] @@ -933,7 +914,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58a94ace95092c5acb1e97a7e846b310cfbd499652f72297da7493f618a98d73" dependencies = [ "derive_builder_core", - "syn 1.0.82", + "syn 1.0.90", ] [[package]] @@ -943,10 +924,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case", - "proc-macro2 1.0.33", - "quote 1.0.10", + "proc-macro2 1.0.36", + "quote 1.0.17", "rustc_version", - "syn 1.0.82", + "syn 1.0.90", ] [[package]] @@ -991,9 +972,9 @@ version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45f5098f628d02a7a0f68ddba586fb61e80edec3bdc1be3b921f4ceec60858d3" dependencies = [ - "proc-macro2 1.0.33", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", + "quote 1.0.17", + "syn 1.0.90", ] [[package]] @@ -1017,13 +998,12 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.0" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8549e6bfdecd113b7e221fe60b433087f6957387a20f8118ebca9b12af19143d" +checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" dependencies = [ - "block-buffer 0.10.0", + "block-buffer 0.10.2", "crypto-common", - "generic-array 0.14.4", ] [[package]] @@ -1037,18 +1017,18 @@ dependencies = [ [[package]] name = "dirs" -version = "3.0.2" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" dependencies = [ "dirs-sys", ] [[package]] name = "dirs-sys" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" dependencies = [ "libc", "redox_users", @@ -1063,9 +1043,9 @@ checksum = "31ad93652f40969dead8d4bf897a41e9462095152eb21c56e5830537e41179dd" [[package]] name = "doku" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fae0158211454f5969d619e425acf2e046001683dfac3a23fa5bf6c6a8464499" +checksum = "b7669ad18bd53786107832ce23c4cd1d859d3fe2ed6393ebcc0def93f15e5fa3" dependencies = [ "doku-derive", "serde", @@ -1073,14 +1053,14 @@ dependencies = [ [[package]] name = "doku-derive" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "366b1ae88672638e08f97cc9037ce4e5dca6c2b37699a50c72b846a4c654d4bb" +checksum = "603fe9f91b4d0e11036df029aeaeffa90b8f97e700104d5d24abb053bf9ba858" dependencies = [ "darling 0.13.1", - "proc-macro2 1.0.33", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", + "quote 1.0.17", + "syn 1.0.90", ] [[package]] @@ -1170,9 +1150,9 @@ checksum = "b5320ae4c3782150d900b79807611a59a99fc9a1d61d686faafc24b93fc8d7ca" [[package]] name = "event-listener" -version = "2.5.1" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59" +checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71" [[package]] name = "fake-simd" @@ -1182,18 +1162,18 @@ checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" [[package]] name = "fallible_collections" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaefd4190151d458f16f0793d3452d7f13aeb3701566a4cefc4c37598876cc00" +checksum = "52db5973b6a19247baf19b30f41c23a1bfffc2e9ce0a5db2f60e3cd5dc8895f7" dependencies = [ "hashbrown", ] [[package]] name = "fastrand" -version = "1.5.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b394ed3d285a429378d3b384b9eb1285267e7df4b166df24b7a6939a04dc392e" +checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf" dependencies = [ "instant", ] @@ -1204,12 +1184,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d3d6188b8804df28032815ea256b6955c9625c24da7525f387a7af02fbb8f01" -[[package]] -name = "fixedbitset" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" - [[package]] name = "fixedbitset" version = "0.4.1" @@ -1267,9 +1241,9 @@ checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" [[package]] name = "futf" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c9c1ce3fa9336301af935ab852c437817d14cd33690446569392e65170aac3b" +checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" dependencies = [ "mac", "new_debug_unreachable", @@ -1277,9 +1251,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.18" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd0210d8c325c245ff06fd95a3b13689a1a276ac8cfa8e8720cb840bfb84b9e" +checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" dependencies = [ "futures-channel", "futures-core", @@ -1292,9 +1266,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.18" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc8cd39e3dbf865f7340dce6a2d401d24fd37c6fe6c4f0ee0de8bfca2252d27" +checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" dependencies = [ "futures-core", "futures-sink", @@ -1302,15 +1276,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.18" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "629316e42fe7c2a0b9a65b47d159ceaa5453ab14e8f0a3c5eedbb8cd55b4a445" +checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" [[package]] name = "futures-executor" -version = "0.3.18" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b808bf53348a36cab739d7e04755909b9fcaaa69b7d7e588b37b6ec62704c97" +checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" dependencies = [ "futures-core", "futures-task", @@ -1319,38 +1293,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.18" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e481354db6b5c353246ccf6a728b0c5511d752c08da7260546fc0933869daa11" +checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" [[package]] name = "futures-macro" -version = "0.3.18" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a89f17b21645bc4ed773c69af9c9a0effd4a3f1a3876eadd453469f8854e7fdd" +checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" dependencies = [ - "proc-macro2 1.0.33", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", + "quote 1.0.17", + "syn 1.0.90", ] [[package]] name = "futures-sink" -version = "0.3.18" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "996c6442437b62d21a32cd9906f9c41e7dc1e19a9579843fad948696769305af" +checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" [[package]] name = "futures-task" -version = "0.3.18" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dabf1872aaab32c886832f2276d2f5399887e2bd613698a02359e4ea83f8de12" +checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" [[package]] name = "futures-util" -version = "0.3.18" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d22213122356472061ac0f1ab2cee28d2bac8491410fd68c2af53d1cedb83e" +checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" dependencies = [ "futures-channel", "futures-core", @@ -1375,9 +1349,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.4" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" +checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803" dependencies = [ "typenum", "version_check", @@ -1396,9 +1370,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.3" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" +checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" dependencies = [ "cfg-if", "libc", @@ -1423,9 +1397,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] name = "h2" -version = "0.3.9" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f072413d126e57991455e0a922b31e4c8ba7c2ffbebf6b78b4f8521397d65cd" +checksum = "62eeb471aa3e3c9197aa4bfeabfe02982f6dc96f750486c0bb0009ac58b26d2b" dependencies = [ "bytes", "fnv", @@ -1451,14 +1425,14 @@ dependencies = [ [[package]] name = "hdrhistogram" -version = "7.4.0" +version = "7.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6490be71f07a5f62b564bc58e36953f675833df11c7e4a0647bee7a07ca1ec5e" +checksum = "31672b7011be2c4f7456c4ddbcb40e7e9a4a9fad8efe49a6ebaf5f307d0109c0" dependencies = [ - "base64 0.13.0", + "base64", "byteorder", "flate2", - "nom 7.1.0", + "nom 7.1.1", "num-traits", ] @@ -1471,6 +1445,12 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "heck" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -1513,9 +1493,9 @@ dependencies = [ [[package]] name = "html2text" -version = "0.2.1" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26379dcb715e237b96102a12b505c553e2bffa74bae2e54658748d298660ef1" +checksum = "de2444cdc9d7e23756d000d9f49513bed8bb4e3743072fb45c63e6493e277bed" dependencies = [ "html5ever", "markup5ever_rcdom", @@ -1524,27 +1504,27 @@ dependencies = [ [[package]] name = "html5ever" -version = "0.25.1" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafcf38a1a36118242d29b92e1b08ef84e67e4a5ed06e0a80be20e6a32bfed6b" +checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148" dependencies = [ "log", "mac", "markup5ever", - "proc-macro2 1.0.33", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", + "quote 1.0.17", + "syn 1.0.90", ] [[package]] name = "http" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1323096b05d41827dadeaee54c9981958c0f94e670bc94ed80037d1a7b8b186b" +checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03" dependencies = [ "bytes", "fnv", - "itoa 0.4.8", + "itoa", ] [[package]] @@ -1558,16 +1538,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "http-signature-normalization" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07499ccdca5530f8dca2c295aa4554afefa617879d381466016ba12bc60a09e9" -dependencies = [ - "chrono", - "thiserror", -] - [[package]] name = "http-signature-normalization" version = "0.6.0" @@ -1579,16 +1549,16 @@ dependencies = [ [[package]] name = "http-signature-normalization-actix" -version = "0.6.0-beta.6" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c9085c2915ee253d6cfc00a67de0dab8f43b37b2da1674a0b196740c54513d3" +checksum = "86dfd54a1764ad79376b8dbf29e5bf918a463eb5ec66c90cd0388508289af6f0" dependencies = [ "actix-http", "actix-rt", "actix-web", - "base64 0.13.0", + "base64", "futures-util", - "http-signature-normalization 0.6.0", + "http-signature-normalization", "sha2", "thiserror", "tokio", @@ -1599,15 +1569,14 @@ dependencies = [ [[package]] name = "http-signature-normalization-reqwest" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2688d50434bf8a95fd848e54f63debd80e7711e4fd164ede3456ff74ec655b76" +checksum = "4a15d4498e747f1cb1b0114ad651619932eac790815d2dcef0fa89bd016fd991" dependencies = [ - "base64 0.13.0", + "base64", "bytes", - "chrono", "http", - "http-signature-normalization 0.5.4", + "http-signature-normalization", "reqwest", "reqwest-middleware", "sha2", @@ -1617,9 +1586,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503" +checksum = "9100414882e15fb7feccb4897e5f0ff0ff1ca7d1a86a23208ada4d7a18e6c6c4" [[package]] name = "httpdate" @@ -1635,9 +1604,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.16" +version = "0.14.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7ec3e62bdc98a2f0393a5048e4c30ef659440ea6e0e572965103e72bd836f55" +checksum = "b26ae0a80afebe130861d90abf98e3814a4f28a4c6ffeb5ab8ebb2be311e0ef2" dependencies = [ "bytes", "futures-channel", @@ -1648,7 +1617,7 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa 0.4.8", + "itoa", "pin-project-lite", "socket2", "tokio", @@ -1720,14 +1689,23 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" +checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223" dependencies = [ "autocfg", "hashbrown", ] +[[package]] +name = "inout" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1f03d4ab4d5dc9ec2d219f86c15d2a15fc08239d1cd3b2d6a19717c0a2f443" +dependencies = [ + "generic-array 0.14.5", +] + [[package]] name = "instant" version = "0.1.12" @@ -1739,9 +1717,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9" +checksum = "35e70ee094dc02fd9c13fdad4940090f22dbd6ac7c9e7094a46cf0232a50bc7c" [[package]] name = "itertools" @@ -1752,12 +1730,6 @@ dependencies = [ "either", ] -[[package]] -name = "itoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - [[package]] name = "itoa" version = "1.0.1" @@ -1795,20 +1767,20 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.55" +version = "0.3.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84" +checksum = "a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04" dependencies = [ "wasm-bindgen", ] [[package]] name = "jsonwebtoken" -version = "7.2.0" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afabcc15e437a6484fc4f12d0fd63068fe457bf93f1c148d3d9649c60b103f32" +checksum = "012bb02250fdd38faa5feee63235f7a459974440b9b57593822414c31f92839e" dependencies = [ - "base64 0.12.3", + "base64", "pem", "ring", "serde", @@ -1838,7 +1810,7 @@ dependencies = [ "anyhow", "async-trait", "background-jobs", - "base64 0.13.0", + "base64", "bcrypt", "captcha", "chrono", @@ -1857,7 +1829,7 @@ dependencies = [ "lemmy_utils", "lemmy_websocket", "openssl", - "rand 0.8.4", + "rand 0.8.5", "reqwest", "serde", "serde_json", @@ -1901,7 +1873,7 @@ dependencies = [ "anyhow", "async-trait", "background-jobs", - "base64 0.13.0", + "base64", "bcrypt", "chrono", "diesel", @@ -1919,7 +1891,7 @@ dependencies = [ "lemmy_utils", "lemmy_websocket", "openssl", - "rand 0.8.4", + "rand 0.8.5", "reqwest", "serde", "serde_json", @@ -1964,7 +1936,7 @@ dependencies = [ "once_cell", "parking_lot 0.12.0", "percent-encoding", - "rand 0.8.4", + "rand 0.8.5", "reqwest", "reqwest-middleware", "serde", @@ -1989,7 +1961,7 @@ dependencies = [ "anyhow", "async-trait", "background-jobs", - "base64 0.13.0", + "base64", "chrono", "diesel", "http", @@ -2012,9 +1984,9 @@ dependencies = [ name = "lemmy_apub_lib_derive" version = "0.16.2" dependencies = [ - "proc-macro2 1.0.33", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", + "quote 1.0.17", + "syn 1.0.90", "trybuild", ] @@ -2128,7 +2100,7 @@ dependencies = [ "lemmy_utils", "lemmy_websocket", "openssl", - "opentelemetry", + "opentelemetry 0.17.0", "opentelemetry-otlp", "parking_lot 0.12.0", "reqwest", @@ -2142,7 +2114,7 @@ dependencies = [ "tracing-actix-web", "tracing-error", "tracing-log", - "tracing-opentelemetry", + "tracing-opentelemetry 0.17.2", "tracing-subscriber", "url", ] @@ -2170,7 +2142,7 @@ dependencies = [ "openssl", "parking_lot 0.12.0", "percent-encoding", - "rand 0.8.4", + "rand 0.8.5", "regex", "reqwest", "reqwest-middleware", @@ -2206,9 +2178,9 @@ dependencies = [ "lemmy_db_views", "lemmy_db_views_actor", "lemmy_utils", - "opentelemetry", + "opentelemetry 0.17.0", "parking_lot 0.12.0", - "rand 0.8.4", + "rand 0.8.5", "reqwest", "reqwest-middleware", "serde", @@ -2217,7 +2189,7 @@ dependencies = [ "strum_macros", "tokio", "tracing", - "tracing-opentelemetry", + "tracing-opentelemetry 0.17.2", ] [[package]] @@ -2226,7 +2198,7 @@ version = "0.10.0-rc.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71d8da8f34d086b081c9cc3b57d3bb3b51d16fc06b5c848a188e2f14d58ac2a5" dependencies = [ - "base64 0.13.0", + "base64", "fastrand", "futures-util", "hostname", @@ -2234,7 +2206,7 @@ dependencies = [ "idna", "mime", "native-tls", - "nom 7.1.0", + "nom 7.1.1", "once_cell", "quoted_printable", "regex", @@ -2255,9 +2227,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.111" +version = "0.2.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e167738f1866a7ec625567bae89ca0d44477232a4f7c52b1c7f2adc2c98804f" +checksum = "efaa7b300f3b5fe8eb6bf21ce3895e1751d9665086af2d64b42f19701015ff4f" [[package]] name = "local-channel" @@ -2273,9 +2245,9 @@ dependencies = [ [[package]] name = "local-waker" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f9a2d3e27ce99ce2c3aad0b09b1a7b916293ea9b2bf624c13fe646fadd8da4" +checksum = "902eb695eb0591864543cbfbf6d742510642a605a61fc5e97fe6ceb5a30ac4fb" [[package]] name = "lock_api" @@ -2288,10 +2260,11 @@ dependencies = [ [[package]] name = "lodepng" -version = "3.4.7" +version = "3.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24844d5c0b922ddd52fb5bf0964a4c7f8e799a946ec01bb463771eb04fc1a323" +checksum = "7f84e1fdcdbe8b3f0f9caaadb6b86d0e0647786e993f6ea70686f6837b989ec7" dependencies = [ + "crc32fast", "fallible_collections", "flate2", "libc", @@ -2300,9 +2273,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.14" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8" dependencies = [ "cfg-if", ] @@ -2397,9 +2370,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9753f12909fd8d923f75ae5c3258cae1ed3c8ec052e1b38c93c21a6d157f789c" dependencies = [ "migrations_internals", - "proc-macro2 1.0.33", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", + "quote 1.0.17", + "syn 1.0.90", ] [[package]] @@ -2410,9 +2383,9 @@ checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" [[package]] name = "mime_guess" -version = "2.0.3" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212" +checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" dependencies = [ "mime", "unicase", @@ -2445,27 +2418,15 @@ dependencies = [ [[package]] name = "mio" -version = "0.7.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" -dependencies = [ - "libc", - "log", - "miow", - "ntapi", - "winapi", -] - -[[package]] -name = "mio" -version = "0.8.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba272f85fa0b41fc91872be579b3bbe0f56b792aa361a380eb669469f68dafb2" +checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9" dependencies = [ "libc", "log", "miow", "ntapi", + "wasi 0.11.0+wasi-snapshot-preview1", "winapi", ] @@ -2486,9 +2447,9 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "native-tls" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48ba9f7719b5a0f42f338907614285fb5fd70e53858141f69898a1fb7203b24d" +checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9" dependencies = [ "lazy_static", "libc", @@ -2529,29 +2490,28 @@ dependencies = [ [[package]] name = "nom" -version = "7.1.0" +version = "7.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d11e1ef389c76fe5b81bcaf2ea32cf88b62bc494e19f493d0b30e7a930109" +checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" dependencies = [ "memchr", "minimal-lexical", - "version_check", ] [[package]] name = "ntapi" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" +checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" dependencies = [ "winapi", ] [[package]] name = "num-bigint" -version = "0.2.6" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" +checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" dependencies = [ "autocfg", "num-integer", @@ -2601,31 +2561,34 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.13.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" dependencies = [ "hermit-abi", "libc", ] [[package]] -name = "once_cell" -version = "1.8.0" +name = "num_threads" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" +checksum = "aba1801fb138d8e85e11d0fc70baf4fe1cdfffda7c6cd34a854905df588e5ed0" +dependencies = [ + "libc", +] [[package]] -name = "opaque-debug" -version = "0.2.3" +name = "once_cell" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" +checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" [[package]] name = "opaque-debug" -version = "0.3.0" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" [[package]] name = "openssl" @@ -2643,9 +2606,9 @@ dependencies = [ [[package]] name = "openssl-probe" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" @@ -2673,7 +2636,26 @@ dependencies = [ "lazy_static", "percent-encoding", "pin-project", - "rand 0.8.4", + "rand 0.8.5", + "thiserror", +] + +[[package]] +name = "opentelemetry" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6105e89802af13fdf48c49d7646d3b533a70e536d818aae7e78ba0433d01acb8" +dependencies = [ + "async-trait", + "crossbeam-channel", + "futures-channel", + "futures-executor", + "futures-util", + "js-sys", + "lazy_static", + "percent-encoding", + "pin-project", + "rand 0.8.5", "thiserror", "tokio", "tokio-stream", @@ -2681,19 +2663,20 @@ dependencies = [ [[package]] name = "opentelemetry-otlp" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f19d4b43842433c420c548c985d158f5628bba5b518e0be64627926d19889992" +checksum = "9d1a6ca9de4c8b00aa7f1a153bd76cb263287155cec642680d79d98706f3d28a" dependencies = [ "async-trait", "futures", + "futures-util", "http", - "opentelemetry", - "prost 0.8.0", + "opentelemetry 0.17.0", + "prost", "thiserror", "tokio", - "tonic 0.5.2", - "tonic-build 0.5.2", + "tonic", + "tonic-build", ] [[package]] @@ -2746,19 +2729,17 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0744126afe1a6dd7f394cb50a716dbe086cb06e255e53d8d0185d82828358fb5" +checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc" [[package]] name = "pem" -version = "0.8.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd56cbd21fea48d0c440b41cd69c589faacade08c992d9a54e471b79d0fd13eb" +checksum = "e9a3b09a20e374558580a4914d3b7d89bd61b954a5a5e1dcbea98753addb1947" dependencies = [ - "base64 0.13.0", - "once_cell", - "regex", + "base64", ] [[package]] @@ -2794,9 +2775,9 @@ checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55" dependencies = [ "pest", "pest_meta", - "proc-macro2 1.0.33", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", + "quote 1.0.17", + "syn 1.0.90", ] [[package]] @@ -2810,23 +2791,13 @@ dependencies = [ "sha-1 0.8.2", ] -[[package]] -name = "petgraph" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "467d164a6de56270bd7c4d070df81d07beace25012d5103ced4e9ff08d6afdb7" -dependencies = [ - "fixedbitset 0.2.0", - "indexmap", -] - [[package]] name = "petgraph" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a13a2fa9d0b63e5f22328828741e523766fff0ee9e779316902290dff3f824f" dependencies = [ - "fixedbitset 0.4.1", + "fixedbitset", "indexmap", ] @@ -2836,7 +2807,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" dependencies = [ - "phf_shared", + "phf_shared 0.8.0", ] [[package]] @@ -2845,8 +2816,8 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" dependencies = [ - "phf_generator", - "phf_shared", + "phf_generator 0.8.0", + "phf_shared 0.8.0", ] [[package]] @@ -2855,10 +2826,20 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" dependencies = [ - "phf_shared", + "phf_shared 0.8.0", "rand 0.7.3", ] +[[package]] +name = "phf_generator" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +dependencies = [ + "phf_shared 0.10.0", + "rand 0.8.5", +] + [[package]] name = "phf_shared" version = "0.8.0" @@ -2868,31 +2849,40 @@ dependencies = [ "siphasher", ] +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + [[package]] name = "pin-project" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08" +checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389" +checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb" dependencies = [ - "proc-macro2 1.0.33", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", + "quote 1.0.17", + "syn 1.0.90", ] [[package]] name = "pin-project-lite" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" +checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c" [[package]] name = "pin-utils" @@ -2920,9 +2910,9 @@ dependencies = [ [[package]] name = "ppv-lite86" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba" +checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" [[package]] name = "pq-sys" @@ -2940,59 +2930,55 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] -name = "proc-macro2" -version = "0.4.30" +name = "proc-macro-error" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ - "unicode-xid 0.1.0", + "proc-macro-error-attr", + "proc-macro2 1.0.36", + "quote 1.0.17", + "syn 1.0.90", + "version_check", ] [[package]] -name = "proc-macro2" -version = "1.0.33" +name = "proc-macro-error-attr" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb37d2df5df740e582f28f8560cf425f52bb267d872fe58358eadb554909f07a" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "unicode-xid 0.2.2", + "proc-macro2 1.0.36", + "quote 1.0.17", + "version_check", ] [[package]] -name = "prost" -version = "0.8.0" +name = "proc-macro2" +version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de5e2533f59d08fcf364fd374ebda0692a70bd6d7e66ef97f306f45c6c5d8020" +checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" dependencies = [ - "bytes", - "prost-derive 0.8.0", + "unicode-xid 0.1.0", ] [[package]] -name = "prost" -version = "0.9.0" +name = "proc-macro2" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" +checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" dependencies = [ - "bytes", - "prost-derive 0.9.0", + "unicode-xid 0.2.2", ] [[package]] -name = "prost-build" -version = "0.8.0" +name = "prost" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "355f634b43cdd80724ee7848f95770e7e70eefa6dcf14fea676216573b8fd603" +checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" dependencies = [ "bytes", - "heck", - "itertools", - "log", - "multimap", - "petgraph 0.5.1", - "prost 0.8.0", - "prost-types 0.8.0", - "tempfile", - "which", + "prost-derive", ] [[package]] @@ -3002,32 +2988,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" dependencies = [ "bytes", - "heck", + "heck 0.3.3", "itertools", "lazy_static", "log", "multimap", - "petgraph 0.6.0", - "prost 0.9.0", - "prost-types 0.9.0", + "petgraph", + "prost", + "prost-types", "regex", "tempfile", "which", ] -[[package]] -name = "prost-derive" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "600d2f334aa05acb02a755e217ef1ab6dea4d51b58b7846588b747edec04efba" -dependencies = [ - "anyhow", - "itertools", - "proc-macro2 1.0.33", - "quote 1.0.10", - "syn 1.0.82", -] - [[package]] name = "prost-derive" version = "0.9.0" @@ -3036,19 +3009,9 @@ checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" dependencies = [ "anyhow", "itertools", - "proc-macro2 1.0.33", - "quote 1.0.10", - "syn 1.0.82", -] - -[[package]] -name = "prost-types" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "603bbd6394701d13f3f25aada59c7de9d35a6a5887cfc156181234a44002771b" -dependencies = [ - "bytes", - "prost 0.8.0", + "proc-macro2 1.0.36", + "quote 1.0.17", + "syn 1.0.90", ] [[package]] @@ -3058,7 +3021,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" dependencies = [ "bytes", - "prost 0.9.0", + "prost", ] [[package]] @@ -3071,6 +3034,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "quickcheck" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" +dependencies = [ + "rand 0.8.5", +] + [[package]] name = "quote" version = "0.6.13" @@ -3082,11 +3054,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.10" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05" +checksum = "632d02bff7f874a36f33ea8bb416cd484b90cc66c1194b1a1110d067a7013f58" dependencies = [ - "proc-macro2 1.0.33", + "proc-macro2 1.0.36", ] [[package]] @@ -3122,20 +3094,19 @@ dependencies = [ "libc", "rand_chacha 0.2.2", "rand_core 0.5.1", - "rand_hc 0.2.0", + "rand_hc", "rand_pcg", ] [[package]] name = "rand" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", "rand_chacha 0.3.1", "rand_core 0.6.3", - "rand_hc 0.3.1", ] [[package]] @@ -3173,7 +3144,7 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" dependencies = [ - "getrandom 0.2.3", + "getrandom 0.2.6", ] [[package]] @@ -3185,15 +3156,6 @@ dependencies = [ "rand_core 0.5.1", ] -[[package]] -name = "rand_hc" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" -dependencies = [ - "rand_core 0.6.3", -] - [[package]] name = "rand_pcg" version = "0.2.1" @@ -3230,28 +3192,29 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.10" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" +checksum = "8ae183fc1b06c149f0c1793e1eb447c8b04bfe46d48e9e48bfb8d2d7ed64ecf0" dependencies = [ "bitflags", ] [[package]] name = "redox_users" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" +checksum = "7776223e2696f1aa4c6b0170e83212f47296a00424305117d013dfe86fb0fe55" dependencies = [ - "getrandom 0.2.3", + "getrandom 0.2.6", "redox_syscall", + "thiserror", ] [[package]] name = "regex" -version = "1.5.4" +version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" +checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" dependencies = [ "aho-corasick", "memchr", @@ -3284,15 +3247,16 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.7" +version = "0.11.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bea77bc708afa10e59905c3d4af7c8fd43c9214251673095ff8b14345fcbc5" +checksum = "46a1f7aa4f35e5e8b4160449f51afc758f0ce6454315a9fa7d0d113e958c41eb" dependencies = [ - "base64 0.13.0", + "base64", "bytes", "encoding_rs", "futures-core", "futures-util", + "h2", "http", "http-body", "hyper", @@ -3321,9 +3285,9 @@ dependencies = [ [[package]] name = "reqwest-middleware" -version = "0.1.3" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb4bd0c419665f9266097de27649a7723140acd100f2676245e0461278ca97a" +checksum = "3b58621b8223cfc85b63d38b8d335c69b96a666d9b7561aa30a3b070ce1df31c" dependencies = [ "anyhow", "async-trait", @@ -3337,25 +3301,25 @@ dependencies = [ [[package]] name = "reqwest-tracing" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89af431b8c46776b5071a9a739c2b5fadbed6be2c6158d1ac5f71c4da3d2261c" +checksum = "03f32bd53de59d66d157bd974bafbb69fbb9e98f665d14218b5b991e7dba8d75" dependencies = [ "async-trait", - "opentelemetry", + "opentelemetry 0.16.0", "reqwest", "reqwest-middleware", "task-local-extensions", "tokio", "tracing", - "tracing-opentelemetry", + "tracing-opentelemetry 0.16.0", ] [[package]] name = "rgb" -version = "0.8.30" +version = "0.8.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08a9852b34c4628f8ad76797a933577059163651ec5a7dace462adc365bee66c" +checksum = "e74fdc210d8f24a7dbfedc13b04ba5764f5232754ccebfdf5fff1bad791ccbc6" dependencies = [ "bytemuck", ] @@ -3383,8 +3347,8 @@ checksum = "6f697b8b3f19bee20f30dc87213d05ce091c43bc733ab1bfc98b0e5cdd9943f3" dependencies = [ "convert_case", "lazy_static", - "proc-macro2 1.0.33", - "quote 1.0.10", + "proc-macro2 1.0.36", + "quote 1.0.17", "regex", "tinyjson", ] @@ -3418,9 +3382,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.2" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d37e5e2290f3e040b594b1a9e04377c2c671f1a1cfd9bfdef82106ac1c113f84" +checksum = "4fbfeb8d0ddb84706bc597a5574ab8912817c52a397f819e5b614e2265206921" dependencies = [ "log", "ring", @@ -3492,9 +3456,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.4.2" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525bc1abfda2e1998d152c45cf13e696f76d0a4972310b22fac1658b05df7c87" +checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc" dependencies = [ "bitflags", "core-foundation", @@ -3505,9 +3469,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.4.2" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9dd14d83160b528b7bfd66439110573efcfbe281b17fc2ca9f39f550d619c7e" +checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" dependencies = [ "core-foundation-sys", "libc", @@ -3526,59 +3490,59 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.4" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012" +checksum = "d65bd28f48be7196d222d95b9243287f48d27aca604e08497513019ff0502cc4" [[package]] name = "serde" -version = "1.0.131" +version = "1.0.136" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ad69dfbd3e45369132cc64e6748c2d65cdfb001a2b1c232d128b4ad60561c1" +checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.131" +version = "1.0.136" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b710a83c4e0dff6a3d511946b95274ad9ca9e5d3ae497b63fda866ac955358d2" +checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" dependencies = [ - "proc-macro2 1.0.33", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", + "quote 1.0.17", + "syn 1.0.90", ] [[package]] name = "serde_json" -version = "1.0.72" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0ffa0837f2dfa6fb90868c2b5468cad482e175f7dad97e7421951e663f2b527" +checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95" dependencies = [ "indexmap", - "itoa 0.4.8", + "itoa", "ryu", "serde", ] [[package]] name = "serde_urlencoded" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 0.4.8", + "itoa", "ryu", "serde", ] [[package]] name = "serde_with" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad6056b4cb69b6e43e3a0f055def223380baecc99da683884f205bf347f7c4b3" +checksum = "ec1e6ec4d8950e5b1e894eac0d360742f3b1407a6078a604a731c4b3f49cefbc" dependencies = [ "rustversion", "serde", @@ -3592,16 +3556,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12e47be9471c72889ebafb5e14d5ff930d89ae7a67bbdb5f8abb564f845a927e" dependencies = [ "darling 0.13.1", - "proc-macro2 1.0.33", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", + "quote 1.0.17", + "syn 1.0.90", ] [[package]] name = "serial_test" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0bccbcf40c8938196944a3da0e133e031a33f4d6b72db3bda3cc556e361905d" +checksum = "e5bcc41d18f7a1d50525d080fd3e953be87c4f9f1a974f3c21798ca00d54ec15" dependencies = [ "lazy_static", "parking_lot 0.11.2", @@ -3610,13 +3574,15 @@ dependencies = [ [[package]] name = "serial_test_derive" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2acd6defeddb41eb60bb468f8825d0cfd0c2a76bc03bfd235b6a1dc4f6a1ad5" +checksum = "2881bccd7d60fb32dfa3d7b3136385312f8ad75e2674aab2852867a09790cae8" dependencies = [ - "proc-macro2 1.0.33", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro-error", + "proc-macro2 1.0.36", + "quote 1.0.17", + "rustversion", + "syn 1.0.90", ] [[package]] @@ -3628,7 +3594,7 @@ dependencies = [ "block-buffer 0.7.3", "digest 0.8.1", "fake-simd", - "opaque-debug 0.2.3", + "opaque-debug", ] [[package]] @@ -3639,18 +3605,18 @@ checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.0", + "digest 0.10.3", ] [[package]] name = "sha2" -version = "0.10.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900d964dd36bb15bcf2f2b35694c072feab74969a54f2bbeec7a2d725d2bdcb6" +checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.0", + "digest 0.10.3", ] [[package]] @@ -3664,9 +3630,9 @@ dependencies = [ [[package]] name = "shell-words" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6fa3938c99da4914afedd13bf3d79bcb6c277d1b2c398d23257a304d9e1b074" +checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" [[package]] name = "signal-hook-registry" @@ -3679,20 +3645,21 @@ dependencies = [ [[package]] name = "simple_asn1" -version = "0.4.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692ca13de57ce0613a363c8c2f1de925adebc81b04c923ac60c5488bb44abe4b" +checksum = "4a762b1c38b9b990c694b9c2f8abe3372ce6a9ceaae6bca39cfc46e054f45745" dependencies = [ - "chrono", "num-bigint", "num-traits", + "thiserror", + "time 0.3.9", ] [[package]] name = "siphasher" -version = "0.3.7" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "533494a8f9b724d33625ab53c6c4800f7cc445895924a8ef649222dcb76e938b" +checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" [[package]] name = "slab" @@ -3702,9 +3669,9 @@ checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" [[package]] name = "smallvec" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309" +checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" [[package]] name = "smart-default" @@ -3712,16 +3679,16 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "133659a15339456eeeb07572eb02a91c91e9815e9cbc89566944d2c8d3efdbf6" dependencies = [ - "proc-macro2 1.0.33", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", + "quote 1.0.17", + "syn 1.0.90", ] [[package]] name = "socket2" -version = "0.4.2" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516" +checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" dependencies = [ "libc", "winapi", @@ -3741,28 +3708,28 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "string_cache" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "923f0f39b6267d37d23ce71ae7235602134b250ace715dd2c90421998ddac0c6" +checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08" dependencies = [ - "lazy_static", "new_debug_unreachable", - "parking_lot 0.11.2", - "phf_shared", + "once_cell", + "parking_lot 0.12.0", + "phf_shared 0.10.0", "precomputed-hash", "serde", ] [[package]] name = "string_cache_codegen" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f24c8e5e19d22a726626f1a5e16fe15b132dcf21d10177fa5a45ce7962996b97" +checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" dependencies = [ - "phf_generator", - "phf_shared", - "proc-macro2 1.0.33", - "quote 1.0.10", + "phf_generator 0.10.0", + "phf_shared 0.10.0", + "proc-macro2 1.0.36", + "quote 1.0.17", ] [[package]] @@ -3773,21 +3740,21 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "strum" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cae14b91c7d11c9a851d3fbc80a963198998c2a64eec840477fa92d8ce9b70bb" +checksum = "e96acfc1b70604b8b2f1ffa4c57e59176c7dbb05d556c71ecd2f5498a1dee7f8" [[package]] name = "strum_macros" -version = "0.23.1" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb0dc7ee9c15cea6199cde9a127fa16a4c5819af85395457ad72d68edc85a38" +checksum = "6878079b17446e4d3eba6192bb0a2950d5b14f0ed8424b852310e5a94345d0ef" dependencies = [ - "heck", - "proc-macro2 1.0.33", - "quote 1.0.10", + "heck 0.4.0", + "proc-macro2 1.0.36", + "quote 1.0.17", "rustversion", - "syn 1.0.82", + "syn 1.0.90", ] [[package]] @@ -3803,12 +3770,12 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.82" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8daf5dd0bb60cbd4137b1b587d2fc0ae729bc07cf01cd70b36a1ed5ade3b9d59" +checksum = "704df27628939572cd88d33f171cd6f896f4eaca85252c6e0a72d8d8287ee86f" dependencies = [ - "proc-macro2 1.0.33", - "quote 1.0.10", + "proc-macro2 1.0.36", + "quote 1.0.17", "unicode-xid 0.2.2", ] @@ -3829,13 +3796,13 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" +checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" dependencies = [ "cfg-if", + "fastrand", "libc", - "rand 0.8.4", "redox_syscall", "remove_dir_all", "winapi", @@ -3843,9 +3810,9 @@ dependencies = [ [[package]] name = "tendril" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9ef557cb397a4f0a5a3a628f06515f78563f2209e64d47055d9dc6052bf5e33" +checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" dependencies = [ "futf", "mac", @@ -3854,9 +3821,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" dependencies = [ "winapi-util", ] @@ -3876,16 +3843,16 @@ version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" dependencies = [ - "proc-macro2 1.0.33", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", + "quote 1.0.17", + "syn 1.0.90", ] [[package]] name = "thread_local" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd" +checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" dependencies = [ "once_cell", ] @@ -3914,20 +3881,23 @@ dependencies = [ [[package]] name = "time" -version = "0.3.5" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41effe7cfa8af36f439fac33861b66b049edc6f9a32331e2312660529c1c24ad" +checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd" dependencies = [ - "itoa 0.4.8", + "itoa", "libc", + "num_threads", + "quickcheck", + "serde", "time-macros", ] [[package]] name = "time-macros" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25eb0ca3468fc0acc11828786797f6ef9aa1555e4a211a60d64cc8e4d1be47d6" +checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" [[package]] name = "tinyjson" @@ -3952,19 +3922,20 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.15.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbbf1c778ec206785635ce8ad57fe52b3009ae9e0c9f574a728f3049d3e55838" +checksum = "2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee" dependencies = [ "bytes", "libc", "memchr", - "mio 0.7.14", + "mio", "num_cpus", "once_cell", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "pin-project-lite", "signal-hook-registry", + "socket2", "tokio-macros", "tracing", "winapi", @@ -3986,9 +3957,9 @@ version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" dependencies = [ - "proc-macro2 1.0.33", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", + "quote 1.0.17", + "syn 1.0.90", ] [[package]] @@ -4003,9 +3974,9 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.23.1" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4baa378e417d780beff82bf54ceb0d195193ea6a00c14e22359e7f39456b5689" +checksum = "4151fda0cf2798550ad0b34bcfc9b9dcc2a9d2471c895c68f3a8818e54f2389e" dependencies = [ "rustls", "tokio", @@ -4039,16 +4010,16 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64910e1b9c1901aaf5375561e35b9c057d95ff41a44ede043a03e09279eabaf1" +checksum = "0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764" dependencies = [ "bytes", "futures-core", "futures-sink", - "log", "pin-project-lite", "tokio", + "tracing", ] [[package]] @@ -4060,37 +4031,6 @@ dependencies = [ "serde", ] -[[package]] -name = "tonic" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "796c5e1cd49905e65dd8e700d4cb1dffcbfdb4fc9d017de08c1a537afd83627c" -dependencies = [ - "async-stream", - "async-trait", - "base64 0.13.0", - "bytes", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-timeout", - "percent-encoding", - "pin-project", - "prost 0.8.0", - "prost-derive 0.8.0", - "tokio", - "tokio-stream", - "tokio-util 0.6.9", - "tower", - "tower-layer", - "tower-service", - "tracing", - "tracing-futures", -] - [[package]] name = "tonic" version = "0.6.2" @@ -4099,7 +4039,7 @@ checksum = "ff08f4649d10a70ffa3522ca559031285d8e421d727ac85c60825761818f5d0a" dependencies = [ "async-stream", "async-trait", - "base64 0.13.0", + "base64", "bytes", "futures-core", "futures-util", @@ -4110,8 +4050,8 @@ dependencies = [ "hyper-timeout", "percent-encoding", "pin-project", - "prost 0.9.0", - "prost-derive 0.9.0", + "prost", + "prost-derive", "tokio", "tokio-stream", "tokio-util 0.6.9", @@ -4122,46 +4062,33 @@ dependencies = [ "tracing-futures", ] -[[package]] -name = "tonic-build" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b52d07035516c2b74337d2ac7746075e7dcae7643816c1b12c5ff8a7484c08" -dependencies = [ - "proc-macro2 1.0.33", - "prost-build 0.8.0", - "quote 1.0.10", - "syn 1.0.82", -] - [[package]] name = "tonic-build" version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9403f1bafde247186684b230dc6f38b5cd514584e8bec1dd32514be4745fa757" dependencies = [ - "proc-macro2 1.0.33", - "prost-build 0.9.0", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", + "prost-build", + "quote 1.0.17", + "syn 1.0.90", ] [[package]] name = "tower" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5651b5f6860a99bd1adb59dbfe1db8beb433e73709d9032b413a77e2fb7c066a" +checksum = "9a89fd63ad6adf737582df5db40d286574513c69a11dac5214dc3b5603d6713e" dependencies = [ "futures-core", "futures-util", "indexmap", "pin-project", "pin-project-lite", - "rand 0.8.4", + "rand 0.8.5", "slab", "tokio", - "tokio-stream", - "tokio-util 0.6.9", + "tokio-util 0.7.1", "tower-layer", "tower-service", "tracing", @@ -4181,9 +4108,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" -version = "0.1.29" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105" +checksum = "4a1bdf54a7c28a2bbf701e1d2233f6c77f473486b94bee4f9678da5a148dca7f" dependencies = [ "cfg-if", "log", @@ -4207,22 +4134,23 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.18" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e" +checksum = "2e65ce065b4b5c53e73bb28912318cb8c9e9ad3921f1d669eb0e68b4c8143a2b" dependencies = [ - "proc-macro2 1.0.33", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", + "quote 1.0.17", + "syn 1.0.90", ] [[package]] name = "tracing-core" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4" +checksum = "aa31669fa42c09c34d94d8165dd2012e8ff3c66aca50f3bb226b68f216f2706c" dependencies = [ "lazy_static", + "valuable", ] [[package]] @@ -4262,7 +4190,20 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ffbf13a0f8b054a4e59df3a173b818e9c6177c02789871f2073977fd0062076" dependencies = [ - "opentelemetry", + "opentelemetry 0.16.0", + "tracing", + "tracing-core", + "tracing-log", + "tracing-subscriber", +] + +[[package]] +name = "tracing-opentelemetry" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f9378e96a9361190ae297e7f3a8ff644aacd2897f244b1ff81f381669196fa6" +dependencies = [ + "opentelemetry 0.17.0", "tracing", "tracing-core", "tracing-log", @@ -4271,9 +4212,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.3" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245da694cc7fc4729f3f418b304cb57789f1bed2a78c575407ab8a23f53cb4d3" +checksum = "9e0ab7bdc962035a87fba73f3acca9b8a8d0034c2e6f60b84aeaaddddc155dce" dependencies = [ "ansi_term", "lazy_static", @@ -4295,14 +4236,15 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "trybuild" -version = "1.0.53" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d664de8ea7e531ad4c0f5a834f20b8cb2b8e6dfe88d05796ee7887518ed67b9" +checksum = "2ae8c4cee9b97b861a6e3be1d5acb6f50a86bbb68b1f3a896db8342fb6d0f94c" dependencies = [ "dissimilar", "glob", - "lazy_static", + "once_cell", "serde", + "serde_derive", "serde_json", "termcolor", "toml", @@ -4326,9 +4268,9 @@ checksum = "a9b2228007eba4120145f785df0f6c92ea538f5a3635a612ecf4e334c8c1446d" [[package]] name = "typenum" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec" +checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" [[package]] name = "ucd-trie" @@ -4368,9 +4310,9 @@ dependencies = [ [[package]] name = "unicode-segmentation" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" +checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" [[package]] name = "unicode-width" @@ -4427,10 +4369,16 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ - "getrandom 0.2.3", + "getrandom 0.2.6", "serde", ] +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + [[package]] name = "vcpkg" version = "0.2.15" @@ -4439,9 +4387,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version_check" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "walkdir" @@ -4476,11 +4424,17 @@ version = "0.10.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + [[package]] name = "wasm-bindgen" -version = "0.2.78" +version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce" +checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4488,24 +4442,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.78" +version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b" +checksum = "8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca" dependencies = [ "bumpalo", "lazy_static", "log", - "proc-macro2 1.0.33", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", + "quote 1.0.17", + "syn 1.0.90", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.28" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e8d7523cb1f2a4c96c1317ca690031b714a51cc14e05f712446691f413f5d39" +checksum = "2eb6ec270a31b1d3c7e266b999739109abce8b6c87e4b31fcfcd788b65267395" dependencies = [ "cfg-if", "js-sys", @@ -4515,38 +4469,38 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.78" +version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9" +checksum = "2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01" dependencies = [ - "quote 1.0.10", + "quote 1.0.17", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.78" +version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab" +checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc" dependencies = [ - "proc-macro2 1.0.33", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", + "quote 1.0.17", + "syn 1.0.90", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.78" +version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc" +checksum = "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2" [[package]] name = "web-sys" -version = "0.3.55" +version = "0.3.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb" +checksum = "c060b319f29dd25724f09a2ba1418f142f539b2be99fbf4d2d5a8f7330afb8eb" dependencies = [ "js-sys", "wasm-bindgen", @@ -4591,9 +4545,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.22.1" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c475786c6f47219345717a043a37ec04cb4bc185e28853adcc4fa0a947eba630" +checksum = "552ceb903e957524388c4d3475725ff2c8b7960922063af6ce53c9a43da07449" dependencies = [ "webpki", ] @@ -4606,9 +4560,9 @@ checksum = "d8b77fdfd5a253be4ab714e4ffa3c49caf146b4de743e97510c0656cf90f1e8e" [[package]] name = "which" -version = "4.2.2" +version = "4.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea187a8ef279bc014ec368c27a920da2024d2a711109bfbe3440585d5cf27ad9" +checksum = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae" dependencies = [ "either", "lazy_static", @@ -4691,9 +4645,9 @@ checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" [[package]] name = "winreg" -version = "0.7.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" dependencies = [ "winapi", ] @@ -4706,9 +4660,9 @@ checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" [[package]] name = "xdg" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a23fe958c70412687039c86f578938b4a0bb50ec788e96bce4d6ab00ddd5803" +checksum = "0c4583db5cbd4c4c0303df2d15af80f0539db703fa1c68802d4cbbd2dd0f88f6" dependencies = [ "dirs", ] @@ -4724,3 +4678,9 @@ dependencies = [ "markup5ever", "time 0.1.44", ] + +[[package]] +name = "zeroize" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eb5728b8afd3f280a869ce1d4c554ffaed35f45c231fc41bfbd0381bef50317" diff --git a/Cargo.toml b/Cargo.toml index 6edfdc5c..93ac2939 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -50,29 +50,29 @@ lemmy_routes = { version = "=0.16.2", path = "./crates/routes" } diesel = "1.4.8" diesel_migrations = "1.4.0" chrono = { version = "0.4.19", features = ["serde"] } -serde = { version = "1.0.131", features = ["derive"] } +serde = { version = "1.0.136", features = ["derive"] } actix = "0.13.0" -actix-web = { version = "4.0.0", default-features = false, features = ["macros", "rustls"] } -tracing = "0.1.29" -tracing-actix-web = { version = "0.5.0", default-features = false } +actix-web = { version = "4.0.1", default-features = false, features = ["macros", "rustls"] } +tracing = "0.1.32" +tracing-actix-web = { version = "0.5.1", default-features = false } tracing-error = "0.2.0" tracing-log = "0.1.2" -tracing-subscriber = { version = "0.3.3", features = ["env-filter"] } -console-subscriber = { version = "0.1.0", optional = true } -strum = "0.23.0" +tracing-subscriber = { version = "0.3.9", features = ["env-filter"] } +console-subscriber = { version = "0.1.3", optional = true } +strum = "0.24.0" url = { version = "2.2.2", features = ["serde"] } openssl = "0.10.38" -http-signature-normalization-actix = { version = "0.6.0-beta.6", default-features = false, features = ["sha-2"] } -tokio = { version = "1.14.0", features = ["sync", "tracing"] } -anyhow = "1.0.51" -reqwest = { version = "0.11.7", features = ["json"] } -reqwest-middleware = "0.1.3" -reqwest-tracing = { version = "0.2.0", features = ["opentelemetry_0_16"] } -actix-rt = { version = "2.5.0", default-features = false } -serde_json = { version = "1.0.72", features = ["preserve_order"] } +http-signature-normalization-actix = { version = "0.6.1", default-features = false, features = ["sha-2"] } +tokio = { version = "1.17.0", features = ["sync", "tracing"] } +anyhow = "1.0.56" +reqwest = { version = "0.11.10", features = ["json"] } +reqwest-middleware = "0.1.5" +reqwest-tracing = { version = "0.2.1", features = ["opentelemetry_0_16"] } +actix-rt = { version = "2.7.0", default-features = false } +serde_json = { version = "1.0.79", features = ["preserve_order"] } clokwerk = "0.3.5" -doku = "0.10.2" -opentelemetry = { version = "0.16", features = ["rt-tokio"] } -opentelemetry-otlp = "0.9" -tracing-opentelemetry = "0.16" -parking_lot = "0.12" +doku = "0.11.0" +opentelemetry = { version = "0.17.0", features = ["rt-tokio"] } +opentelemetry-otlp = "0.10.0" +tracing-opentelemetry = "0.17.2" +parking_lot = "0.12.0" diff --git a/crates/api/Cargo.toml b/crates/api/Cargo.toml index 9a6bf8fe..caf60428 100644 --- a/crates/api/Cargo.toml +++ b/crates/api/Cargo.toml @@ -23,30 +23,30 @@ lemmy_db_views_actor = { version = "=0.16.2", path = "../db_views_actor" } lemmy_api_common = { version = "=0.16.2", path = "../api_common" } lemmy_websocket = { version = "=0.16.2", path = "../websocket" } diesel = "1.4.8" -bcrypt = "0.10.1" +bcrypt = "0.12.1" chrono = { version = "0.4.19", features = ["serde"] } -serde_json = { version = "1.0.72", features = ["preserve_order"] } -serde = { version = "1.0.131", features = ["derive"] } +serde_json = { version = "1.0.79", features = ["preserve_order"] } +serde = { version = "1.0.136", features = ["derive"] } actix = "0.13.0" -actix-web = { version = "4.0.0", default-features = false } -actix-rt = { version = "2.5.0", default-features = false } -rand = "0.8.4" -strum = "0.23.0" -strum_macros = "0.23.1" +actix-web = { version = "4.0.1", default-features = false } +actix-rt = { version = "2.7.0", default-features = false } +rand = "0.8.5" +strum = "0.24.0" +strum_macros = "0.24.0" url = { version = "2.2.2", features = ["serde"] } openssl = "0.10.38" -http = "0.2.5" -http-signature-normalization-actix = { version = "0.6.0-beta.6", default-features = false, features = ["sha-2"] } +http = "0.2.6" +http-signature-normalization-actix = { version = "0.6.1", default-features = false, features = ["sha-2"] } base64 = "0.13.0" -tokio = "1.14.0" -futures = "0.3.17" +tokio = "1.17.0" +futures = "0.3.21" itertools = "0.10.3" uuid = { version = "0.8.2", features = ["serde", "v4"] } -sha2 = "0.10.0" -async-trait = "0.1.52" +sha2 = "0.10.2" +async-trait = "0.1.53" captcha = "0.0.8" -anyhow = "1.0.51" +anyhow = "1.0.56" thiserror = "1.0.30" -tracing = "0.1.29" -background-jobs = "0.11.0" -reqwest = { version = "0.11.7", features = ["json"] } +tracing = "0.1.32" +background-jobs = "0.12.0" +reqwest = { version = "0.11.10", features = ["json"] } diff --git a/crates/api_common/Cargo.toml b/crates/api_common/Cargo.toml index 4c4ea2c2..f3e1c800 100644 --- a/crates/api_common/Cargo.toml +++ b/crates/api_common/Cargo.toml @@ -18,12 +18,12 @@ lemmy_db_views_moderator = { version = "=0.16.2", path = "../db_views_moderator" lemmy_db_views_actor = { version = "=0.16.2", path = "../db_views_actor" } lemmy_db_schema = { version = "=0.16.2", path = "../db_schema" } lemmy_utils = { version = "=0.16.2", path = "../utils" } -serde = { version = "1.0.131", features = ["derive"] } +serde = { version = "1.0.136", features = ["derive"] } diesel = "1.4.8" -actix-web = { version = "4.0.0", default-features = false, features = ["cookies"] } +actix-web = { version = "4.0.1", default-features = false, features = ["cookies"] } chrono = { version = "0.4.19", features = ["serde"] } -serde_json = { version = "1.0.72", features = ["preserve_order"] } -tracing = "0.1.29" +serde_json = { version = "1.0.79", features = ["preserve_order"] } +tracing = "0.1.32" url = "2.2.2" itertools = "0.10.3" -rosetta-i18n = "0.1" +rosetta-i18n = "0.1.2" diff --git a/crates/api_crud/Cargo.toml b/crates/api_crud/Cargo.toml index 159beaaf..ff2eb6c5 100644 --- a/crates/api_crud/Cargo.toml +++ b/crates/api_crud/Cargo.toml @@ -18,30 +18,30 @@ lemmy_db_views_actor = { version = "=0.16.2", path = "../db_views_actor" } lemmy_api_common = { version = "=0.16.2", path = "../api_common" } lemmy_websocket = { version = "=0.16.2", path = "../websocket" } diesel = "1.4.8" -bcrypt = "0.10.1" +bcrypt = "0.12.1" chrono = { version = "0.4.19", features = ["serde"] } -serde_json = { version = "1.0.72", features = ["preserve_order"] } -serde = { version = "1.0.131", features = ["derive"] } +serde_json = { version = "1.0.79", features = ["preserve_order"] } +serde = { version = "1.0.136", features = ["derive"] } actix = "0.13.0" -actix-web = { version = "4.0.0", default-features = false } -actix-rt = { version = "2.5.0", default-features = false } -tracing = "0.1.29" -rand = "0.8.4" -strum = "0.23.0" -strum_macros = "0.23.1" +actix-web = { version = "4.0.1", default-features = false } +actix-rt = { version = "2.7.0", default-features = false } +tracing = "0.1.32" +rand = "0.8.5" +strum = "0.24.0" +strum_macros = "0.24.0" url = { version = "2.2.2", features = ["serde"] } openssl = "0.10.38" -http = "0.2.5" -http-signature-normalization-actix = { version = "0.6.0-beta.6", default-features = false, features = ["sha-2"] } +http = "0.2.6" +http-signature-normalization-actix = { version = "0.6.1", default-features = false, features = ["sha-2"] } base64 = "0.13.0" -tokio = "1.14.0" -futures = "0.3.17" +tokio = "1.17.0" +futures = "0.3.21" itertools = "0.10.3" uuid = { version = "0.8.2", features = ["serde", "v4"] } -sha2 = "0.10.0" -async-trait = "0.1.52" -anyhow = "1.0.51" +sha2 = "0.10.2" +async-trait = "0.1.53" +anyhow = "1.0.56" thiserror = "1.0.30" -background-jobs = "0.11.0" -reqwest = { version = "0.11.7", features = ["json"] } +background-jobs = "0.12.0" +reqwest = { version = "0.11.10", features = ["json"] } webmention = "0.4.0" diff --git a/crates/apub/Cargo.toml b/crates/apub/Cargo.toml index 4f7338df..5521b3a4 100644 --- a/crates/apub/Cargo.toml +++ b/crates/apub/Cargo.toml @@ -22,37 +22,37 @@ lemmy_api_common = { version = "=0.16.2", path = "../api_common" } lemmy_websocket = { version = "=0.16.2", path = "../websocket" } diesel = "1.4.8" activitystreams-kinds = "0.2.1" -bcrypt = "0.10.1" +bcrypt = "0.12.1" chrono = { version = "0.4.19", features = ["serde"] } -serde_json = { version = "1.0.72", features = ["preserve_order"] } -serde = { version = "1.0.131", features = ["derive"] } -serde_with = "1.11.0" +serde_json = { version = "1.0.79", features = ["preserve_order"] } +serde = { version = "1.0.136", features = ["derive"] } +serde_with = "1.12.0" actix = "0.13.0" -actix-web = { version = "4.0.0", default-features = false } -actix-rt = { version = "2.5.0", default-features = false } -tracing = "0.1.29" -rand = "0.8.4" -strum = "0.23.0" -strum_macros = "0.23.1" +actix-web = { version = "4.0.1", default-features = false } +actix-rt = { version = "2.7.0", default-features = false } +tracing = "0.1.32" +rand = "0.8.5" +strum = "0.24.0" +strum_macros = "0.24.0" url = { version = "2.2.2", features = ["serde"] } percent-encoding = "2.1.0" -http = "0.2.5" -http-signature-normalization-actix = { version = "0.6.0-beta.6", default-features = false, features = ["server", "sha-2"] } -tokio = "1.14.0" -futures = "0.3.17" +http = "0.2.6" +http-signature-normalization-actix = { version = "0.6.1", default-features = false, features = ["server", "sha-2"] } +tokio = "1.17.0" +futures = "0.3.21" itertools = "0.10.3" uuid = { version = "0.8.2", features = ["serde", "v4"] } -sha2 = "0.10.0" -async-trait = "0.1.52" -anyhow = "1.0.51" +sha2 = "0.10.2" +async-trait = "0.1.53" +anyhow = "1.0.56" thiserror = "1.0.30" -background-jobs = "0.11.0" -reqwest = { version = "0.11.7", features = ["json"] } +background-jobs = "0.12.0" +reqwest = { version = "0.11.10", features = ["json"] } html2md = "0.2.13" -once_cell = "1.8.0" -parking_lot = "0.12" +once_cell = "1.10.0" +parking_lot = "0.12.0" [dev-dependencies] -serial_test = "0.5.1" +serial_test = "0.6.0" assert-json-diff = "2.0.1" -reqwest-middleware = "0.1.3" +reqwest-middleware = "0.1.5" diff --git a/crates/apub_lib/Cargo.toml b/crates/apub_lib/Cargo.toml index e91ad89a..411ae9bd 100644 --- a/crates/apub_lib/Cargo.toml +++ b/crates/apub_lib/Cargo.toml @@ -11,21 +11,21 @@ documentation = "https://join-lemmy.org/docs/en/index.html" lemmy_utils = { version = "=0.16.2", path = "../utils" } lemmy_apub_lib_derive = { version = "=0.16.2", path = "../apub_lib_derive" } chrono = "0.4.19" -serde = { version = "1.0.131", features = ["derive"] } -async-trait = "0.1.52" +serde = { version = "1.0.136", features = ["derive"] } +async-trait = "0.1.53" url = { version = "2.2.2", features = ["serde"] } -serde_json = { version = "1.0.72", features = ["preserve_order"] } -anyhow = "1.0.51" -reqwest = { version = "0.11.7", features = ["json"] } -reqwest-middleware = "0.1.3" -tracing = "0.1.29" +serde_json = { version = "1.0.79", features = ["preserve_order"] } +anyhow = "1.0.56" +reqwest = { version = "0.11.10", features = ["json"] } +reqwest-middleware = "0.1.5" +tracing = "0.1.32" base64 = "0.13.0" openssl = "0.10.38" -once_cell = "1.8.0" -http = "0.2.5" -sha2 = "0.10.0" -actix-web = { version = "4.0.0", default-features = false } -http-signature-normalization-actix = { version = "0.6.0-beta.6", default-features = false, features = ["server", "sha-2"] } -http-signature-normalization-reqwest = { version = "0.4.0", default-features = false, features = ["sha-2", "middleware"] } -background-jobs = "0.11.0" +once_cell = "1.10.0" +http = "0.2.6" +sha2 = "0.10.2" +actix-web = { version = "4.0.1", default-features = false } +http-signature-normalization-actix = { version = "0.6.1", default-features = false, features = ["server", "sha-2"] } +http-signature-normalization-reqwest = { version = "0.5.0", default-features = false, features = ["sha-2", "middleware"] } +background-jobs = "0.12.0" diesel = "1.4.8" diff --git a/crates/apub_lib_derive/Cargo.toml b/crates/apub_lib_derive/Cargo.toml index 6d46fd58..73ec5320 100644 --- a/crates/apub_lib_derive/Cargo.toml +++ b/crates/apub_lib_derive/Cargo.toml @@ -11,9 +11,9 @@ documentation = "https://join-lemmy.org/docs/en/index.html" proc-macro = true [dev-dependencies] -trybuild = { version = "1.0.53", features = ["diff"] } +trybuild = { version = "1.0.57", features = ["diff"] } [dependencies] -proc-macro2 = "1.0.33" -syn = "1.0.82" -quote = "1.0.10" +proc-macro2 = "1.0.36" +syn = "1.0.90" +quote = "1.0.17" diff --git a/crates/db_schema/Cargo.toml b/crates/db_schema/Cargo.toml index 96e97ffe..b416f596 100644 --- a/crates/db_schema/Cargo.toml +++ b/crates/db_schema/Cargo.toml @@ -18,16 +18,16 @@ lemmy_apub_lib = { version = "=0.16.2", path = "../apub_lib" } diesel = { version = "1.4.8", features = ["postgres","chrono","r2d2","serde_json"] } diesel_migrations = "1.4.0" chrono = { version = "0.4.19", features = ["serde"] } -serde = { version = "1.0.131", features = ["derive"] } -serde_json = { version = "1.0.72", features = ["preserve_order"] } +serde = { version = "1.0.136", features = ["derive"] } +serde_json = { version = "1.0.79", features = ["preserve_order"] } url = { version = "2.2.2", features = ["serde"] } diesel-derive-newtype = "0.1.2" -regex = "1.5.4" -once_cell = "1.8.0" -strum = "0.23.0" -strum_macros = "0.23.1" -sha2 = "0.10.0" -bcrypt = "0.10.1" +regex = "1.5.5" +once_cell = "1.10.0" +strum = "0.24.0" +strum_macros = "0.24.0" +sha2 = "0.10.2" +bcrypt = "0.12.1" [dev-dependencies] -serial_test = "0.5.1" +serial_test = "0.6.0" diff --git a/crates/db_views/Cargo.toml b/crates/db_views/Cargo.toml index 57bd363d..70ce064d 100644 --- a/crates/db_views/Cargo.toml +++ b/crates/db_views/Cargo.toml @@ -13,9 +13,9 @@ doctest = false [dependencies] lemmy_db_schema = { version = "=0.16.2", path = "../db_schema" } diesel = { version = "1.4.8", features = ["postgres","chrono","r2d2","serde_json"] } -serde = { version = "1.0.131", features = ["derive"] } -tracing = "0.1.29" +serde = { version = "1.0.136", features = ["derive"] } +tracing = "0.1.32" url = "2.2.2" [dev-dependencies] -serial_test = "0.5.1" +serial_test = "0.6.0" diff --git a/crates/db_views_actor/Cargo.toml b/crates/db_views_actor/Cargo.toml index 1ad6e753..a54124e7 100644 --- a/crates/db_views_actor/Cargo.toml +++ b/crates/db_views_actor/Cargo.toml @@ -13,4 +13,4 @@ doctest = false [dependencies] lemmy_db_schema = { version = "=0.16.2", path = "../db_schema" } diesel = { version = "1.4.8", features = ["postgres","chrono","r2d2","serde_json"] } -serde = { version = "1.0.131", features = ["derive"] } +serde = { version = "1.0.136", features = ["derive"] } diff --git a/crates/db_views_moderator/Cargo.toml b/crates/db_views_moderator/Cargo.toml index c9e4ae55..7b9d99ec 100644 --- a/crates/db_views_moderator/Cargo.toml +++ b/crates/db_views_moderator/Cargo.toml @@ -13,4 +13,4 @@ doctest = false [dependencies] lemmy_db_schema = { version = "=0.16.2", path = "../db_schema" } diesel = { version = "1.4.8", features = ["postgres","chrono","r2d2","serde_json"] } -serde = { version = "1.0.131", features = ["derive"] } +serde = { version = "1.0.136", features = ["derive"] } diff --git a/crates/routes/Cargo.toml b/crates/routes/Cargo.toml index 3831b720..fa1763f2 100644 --- a/crates/routes/Cargo.toml +++ b/crates/routes/Cargo.toml @@ -20,18 +20,18 @@ lemmy_api_common = { version = "=0.16.2", path = "../api_common" } lemmy_apub = { version = "=0.16.2", path = "../apub" } diesel = "1.4.8" actix = "0.13.0" -actix-web = { version = "4.0.0", default-features = false, features = ["rustls"] } +actix-web = { version = "4.0.1", default-features = false, features = ["rustls"] } actix-web-actors = { version = "4.1.0", default-features = false } -sha2 = "0.10.0" -anyhow = "1.0.51" +sha2 = "0.10.2" +anyhow = "1.0.56" chrono = { version = "0.4.19", features = ["serde"] } -futures = "0.3.17" -reqwest = { version = "0.11.7", features = ["stream"] } -reqwest-middleware = "0.1.3" +futures = "0.3.21" +reqwest = { version = "0.11.10", features = ["stream"] } +reqwest-middleware = "0.1.5" rss = "2.0.0" -serde = { version = "1.0.131", features = ["derive"] } +serde = { version = "1.0.136", features = ["derive"] } url = { version = "2.2.2", features = ["serde"] } -strum = "0.23.0" -once_cell = "1.8.0" -tracing = "0.1.29" -tokio = { version = "1.14.0", features = ["sync"] } +strum = "0.24.0" +once_cell = "1.10.0" +tracing = "0.1.32" +tokio = { version = "1.17.0", features = ["sync"] } diff --git a/crates/utils/Cargo.toml b/crates/utils/Cargo.toml index 19990d5e..2489cc35 100644 --- a/crates/utils/Cargo.toml +++ b/crates/utils/Cargo.toml @@ -13,42 +13,42 @@ path = "src/lib.rs" doctest = false [dependencies] -regex = "1.5.4" +regex = "1.5.5" chrono = { version = "0.4.19", features = ["serde"] } lettre = "0.10.0-rc.4" -tracing = "0.1.29" +tracing = "0.1.32" tracing-error = "0.2.0" itertools = "0.10.3" -rand = "0.8.4" +rand = "0.8.5" percent-encoding = "2.1.0" -serde = { version = "1.0.131", features = ["derive"] } -serde_json = { version = "1.0.72", features = ["preserve_order"] } +serde = { version = "1.0.136", features = ["derive"] } +serde_json = { version = "1.0.79", features = ["preserve_order"] } thiserror = "1.0.30" comrak = { version = "0.12.1", default-features = false } -once_cell = "1.8.0" +once_cell = "1.10.0" openssl = "0.10.38" url = { version = "2.2.2", features = ["serde"] } -actix-web = { version = "4.0.0", default-features = false, features = ["rustls"] } -actix-rt = { version = "2.5.0", default-features = false } -anyhow = "1.0.51" -reqwest = { version = "0.11.7", features = ["json"] } -reqwest-middleware = "0.1.3" -tokio = { version = "1.14.0", features = ["sync"] } -strum = "0.23.0" -strum_macros = "0.23.1" -futures = "0.3.17" +actix-web = { version = "4.0.1", default-features = false, features = ["rustls"] } +actix-rt = { version = "2.7.0", default-features = false } +anyhow = "1.0.56" +reqwest = { version = "0.11.10", features = ["json"] } +reqwest-middleware = "0.1.5" +tokio = { version = "1.17.0", features = ["sync"] } +strum = "0.24.0" +strum_macros = "0.24.0" +futures = "0.3.21" diesel = "1.4.8" -http = "0.2.5" +http = "0.2.6" deser-hjson = "1.0.2" smart-default = "0.6.0" webpage = { version = "1.4.0", default-features = false, features = ["serde"] } -jsonwebtoken = "7.2.0" -doku = "0.10.2" +jsonwebtoken = "8.0.1" +doku = "0.11.0" uuid = { version = "0.8.2", features = ["serde", "v4"] } encoding = "0.2.33" -html2text = "0.2.1" -rosetta-i18n = "0.1" -parking_lot = "0.12" +html2text = "0.3.1" +rosetta-i18n = "0.1.2" +parking_lot = "0.12.0" [build-dependencies] -rosetta-build = "0.1" +rosetta-build = "0.1.2" diff --git a/crates/utils/src/claims.rs b/crates/utils/src/claims.rs index d68b4119..d49ecfa8 100644 --- a/crates/utils/src/claims.rs +++ b/crates/utils/src/claims.rs @@ -16,12 +16,11 @@ pub struct Claims { impl Claims { pub fn decode(jwt: &str, jwt_secret: &str) -> Result, LemmyError> { - let v = Validation { - validate_exp: false, - ..Validation::default() - }; + let mut validation = Validation::default(); + validation.validate_exp = false; + validation.required_spec_claims.remove("exp"); let key = DecodingKey::from_secret(jwt_secret.as_ref()); - Ok(decode::(jwt, &key, &v)?) + Ok(decode::(jwt, &key, &validation)?) } pub fn jwt(local_user_id: i32, jwt_secret: &str, hostname: &str) -> Result { diff --git a/crates/websocket/Cargo.toml b/crates/websocket/Cargo.toml index d6fc1f24..738b56a2 100644 --- a/crates/websocket/Cargo.toml +++ b/crates/websocket/Cargo.toml @@ -18,22 +18,22 @@ lemmy_api_common = { version = "=0.16.2", path = "../api_common" } lemmy_db_schema = { version = "=0.16.2", path = "../db_schema" } lemmy_db_views = { version = "=0.16.2", path = "../db_views" } lemmy_db_views_actor = { version = "=0.16.2", path = "../db_views_actor" } -reqwest = { version = "0.11.7", features = ["json"] } -reqwest-middleware = "0.1.3" -tracing = "0.1.29" -rand = "0.8.4" -serde = { version = "1.0.131", features = ["derive"] } -serde_json = { version = "1.0.72", features = ["preserve_order"] } +reqwest = { version = "0.11.10", features = ["json"] } +reqwest-middleware = "0.1.5" +tracing = "0.1.32" +rand = "0.8.5" +serde = { version = "1.0.136", features = ["derive"] } +serde_json = { version = "1.0.79", features = ["preserve_order"] } actix = "0.13.0" -anyhow = "1.0.51" +anyhow = "1.0.56" diesel = "1.4.8" -background-jobs = "0.11.0" -tokio = "1.14.0" -strum = "0.23.0" -strum_macros = "0.23.1" +background-jobs = "0.12.0" +tokio = "1.17.0" +strum = "0.24.0" +strum_macros = "0.24.0" chrono = { version = "0.4.19", features = ["serde"] } -actix-web = { version = "4.0.0", default-features = false, features = ["rustls"] } +actix-web = { version = "4.0.1", default-features = false, features = ["rustls"] } actix-web-actors = { version = "4.1.0", default-features = false } -opentelemetry = "0.16" -tracing-opentelemetry = "0.16" -parking_lot = "0.12" +opentelemetry = "0.17.0" +tracing-opentelemetry = "0.17.2" +parking_lot = "0.12.0" diff --git a/crates/websocket/src/handlers.rs b/crates/websocket/src/handlers.rs index 94ca8bf9..6085e245 100644 --- a/crates/websocket/src/handlers.rs +++ b/crates/websocket/src/handlers.rs @@ -71,7 +71,7 @@ fn root_span() -> tracing::Span { trace_id = tracing::field::Empty, ); { - let trace_id = span.context().span().span_context().trace_id().to_hex(); + let trace_id = span.context().span().span_context().trace_id().to_string(); span.record("trace_id", &tracing::field::display(trace_id)); } -- 2.44.1