diff --git a/flake.nix b/flake.nix index ccd935e1..8a85454e 100644 --- a/flake.nix +++ b/flake.nix @@ -254,7 +254,9 @@ }; in { overlays = import ./overlays { - inherit (inputs) bevy-julia bevy-mandelbrot tracer; + inherit (inputs) + fenix naersk rust-overlay + bevy-julia bevy-mandelbrot tracer; }; legacyPackages = lib.attrsets.mapAttrs (_: pkgs: pkgs.appendOverlays overlayList) nixos.legacyPackages; diff --git a/overlays/default.nix b/overlays/default.nix index 7dbd3ec5..4d1c2fb0 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,6 +1,9 @@ -{ bevy-julia +{ bevy-julia , bevy-mandelbrot , tracer +, fenix +, naersk +, rust-overlay }: final: prev: @@ -96,7 +99,9 @@ with final; { pi-sensors = callPackage ./pi-sensors { }; - plume = callPackage ./plume { }; + plume = callPackage ./plume { + inherit fenix naersk; + }; readsb = callPackage ./readsb.nix { }; diff --git a/overlays/plume/0001-cargo-update.patch b/overlays/plume/0001-cargo-update.patch index 9ca9af43..172c41d7 100644 --- a/overlays/plume/0001-cargo-update.patch +++ b/overlays/plume/0001-cargo-update.patch @@ -1,94 +1,421 @@ -From 4543edd52c5ff7e369c11a79aecdf9a99ef3d0e8 Mon Sep 17 00:00:00 2001 +From 14f5868e9ff3f2c50602b94d5aa80eadc846eb61 Mon Sep 17 00:00:00 2001 From: Astro -Date: Sun, 19 Jun 2022 23:15:30 +0200 -Subject: [PATCH] cargo update +Date: Thu, 30 Nov 2023 03:31:36 +0100 +Subject: [PATCH 1/2] cargo update --- - Cargo.lock | 450 ++++++++++++++++++++--------------------- - Cargo.toml | 3 + - plume-front/Cargo.toml | 2 +- - 3 files changed, 225 insertions(+), 230 deletions(-) + Cargo.lock | 1836 ++++++++++++++++++++++++++++------------------------ + Cargo.toml | 3 + + 2 files changed, 981 insertions(+), 858 deletions(-) diff --git a/Cargo.lock b/Cargo.lock -index fd91e109..be2aa1f8 100644 +index 27a833d5..ed674a4b 100644 --- a/Cargo.lock +++ b/Cargo.lock -@@ -121,7 +121,7 @@ version = "0.7.6" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +@@ -10,10 +10,10 @@ checksum = "459a89e7d449cf49e57044d59dcf637d2927362b7a75737c90bd3679ba476a78" dependencies = [ -- "getrandom 0.2.6", -+ "getrandom 0.2.7", + "activitystreams-kinds", + "iri-string", +- "mime 0.3.16", +- "serde 1.0.152", ++ "mime 0.3.17", ++ "serde 1.0.193", + "serde_json", +- "time 0.3.17", ++ "time 0.3.30", + ] + + [[package]] +@@ -23,7 +23,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "bb8e19a0810cc25df3535061a08b7d8f8a734d309ea4411c57a9767e4a2ffa0e" + dependencies = [ + "activitystreams", +- "serde 1.0.152", ++ "serde 1.0.193", + "serde_json", + ] + +@@ -34,14 +34,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "6d014a4fb8828870b7b46bee6257b9a89d06188ae8d435381ba94f14c8c697d8" + dependencies = [ + "iri-string", +- "serde 1.0.152", ++ "serde 1.0.193", + ] + + [[package]] + name = "addr2line" +-version = "0.19.0" ++version = "0.21.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" ++checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" + dependencies = [ + "gimli", + ] +@@ -117,20 +117,20 @@ dependencies = [ + + [[package]] + name = "ahash" +-version = "0.7.6" ++version = "0.7.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" ++checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" + dependencies = [ +- "getrandom 0.2.8", ++ "getrandom 0.2.11", "once_cell", "version_check 0.9.4", ] -@@ -199,13 +199,13 @@ dependencies = [ + + [[package]] + name = "aho-corasick" +-version = "0.7.20" ++version = "1.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" ++checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" + dependencies = [ + "memchr", + ] +@@ -145,9 +145,15 @@ dependencies = [ + "maplit", + "once_cell", + "tendril", +- "url 2.3.1", ++ "url 2.5.0", + ] + ++[[package]] ++name = "android-tzdata" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" ++ + [[package]] + name = "android_system_properties" + version = "0.1.5" +@@ -202,32 +208,32 @@ version = "2.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12" + dependencies = [ +- "serde 1.0.152", ++ "serde 1.0.193", + "serde_json", + ] [[package]] name = "async-trait" --version = "0.1.53" -+version = "0.1.56" +-version = "0.1.60" ++version = "0.1.74" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600" -+checksum = "96cf8829f67d2eab0b2dfa42c5d0ef737e0724e4a82b01b3e292456202b19716" +-checksum = "677d1d8ab452a3936018a687b20e6f7cf5363d713b732b8884001317b0e48aa3" ++checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ -- "proc-macro2 1.0.37", -- "quote 1.0.18", -- "syn 1.0.92", -+ "proc-macro2 1.0.39", -+ "quote 1.0.19", -+ "syn 1.0.98", +- "proc-macro2 1.0.49", +- "quote 1.0.23", +- "syn 1.0.107", ++ "proc-macro2 1.0.70", ++ "quote 1.0.33", ++ "syn 2.0.39", ] [[package]] -@@ -337,7 +337,7 @@ checksum = "6fe4fef31efb0f76133ae8e3576a88e58edb7cfc5584c81c758c349ba46b43fc" + name = "atom_syndication" +-version = "0.12.0" ++version = "0.12.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "91a85f2ee28cbd1ecf91288460f6dc74661fd99b4e9a559836a667ccf63aa38c" ++checksum = "571832dcff775e26562e8e6930cd483de5587301d40d3a3b85d532b6383e15a7" dependencies = [ - "base64 0.13.0", + "chrono", + "derive_builder", + "diligent-date-parser", + "never", +- "quick-xml 0.27.1", ++ "quick-xml 0.30.0", + ] + + [[package]] +@@ -247,12 +253,12 @@ version = "0.22.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "1fcf00bc6d5abb29b5f97e3c61a90b6d3caa12f3faf897d4a3e3607c050a35a7" + dependencies = [ +- "http 0.2.8", +- "log 0.4.17", ++ "http 0.2.11", ++ "log 0.4.20", + "native-tls", +- "serde 1.0.152", ++ "serde 1.0.193", + "serde_json", +- "url 2.3.1", ++ "url 2.5.0", + ] + + [[package]] +@@ -289,20 +295,20 @@ checksum = "3776743bb68d4ad02ba30ba8f64373f1be4e082fe47651767171ce75bb2f6cf5" + dependencies = [ + "attohttpc", + "dirs", +- "log 0.4.17", ++ "log 0.4.20", + "quick-xml 0.26.0", + "rust-ini 0.18.0", +- "serde 1.0.152", ++ "serde 1.0.193", + "thiserror", +- "time 0.3.17", +- "url 2.3.1", ++ "time 0.3.30", ++ "url 2.5.0", + ] + + [[package]] + name = "aws-region" +-version = "0.25.3" ++version = "0.25.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "056557a61427d0e5ba29dd931031c8ffed4ee7a550e7cd55692a9d8deb0a9dba" ++checksum = "42fed2b9fca70f2908268d057a607f2a906f47edbf856ea8587de9038d264e22" + dependencies = [ + "thiserror", + ] +@@ -324,9 +330,9 @@ dependencies = [ + + [[package]] + name = "backtrace" +-version = "0.3.67" ++version = "0.3.69" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" ++checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" + dependencies = [ + "addr2line", + "cc", +@@ -378,6 +384,12 @@ version = "0.13.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + ++[[package]] ++name = "base64" ++version = "0.21.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" ++ + [[package]] + name = "bcrypt" + version = "0.12.1" +@@ -386,7 +398,7 @@ checksum = "6fe4fef31efb0f76133ae8e3576a88e58edb7cfc5584c81c758c349ba46b43fc" + dependencies = [ + "base64 0.13.1", "blowfish", -- "getrandom 0.2.6", -+ "getrandom 0.2.7", +- "getrandom 0.2.8", ++ "getrandom 0.2.11", "zeroize", ] -@@ -408,15 +408,15 @@ checksum = "40e38929add23cdf8a366df9b0e088953150724bcbe5fc330b0d8eb3b328eec8" +@@ -396,7 +408,7 @@ version = "1.3.3" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" + dependencies = [ +- "serde 1.0.152", ++ "serde 1.0.193", + ] + + [[package]] +@@ -411,6 +423,12 @@ version = "1.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + ++[[package]] ++name = "bitflags" ++version = "2.4.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" ++ + [[package]] + name = "bitpacking" + version = "0.8.4" +@@ -444,8 +462,8 @@ version = "0.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "b872f3528eeeb4370ee73b51194dc1cd93680c2d0eb6c7a223889038d2c1a167" + dependencies = [ +- "quote 1.0.23", +- "syn 1.0.107", ++ "quote 1.0.33", ++ "syn 1.0.109", + ] + + [[package]] +@@ -455,7 +473,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "e412e2cd0f2b2d93e02543ceae7917b3c70331573df19ee046bcbc35e45e87d7" + dependencies = [ + "byteorder", +- "cipher 0.4.3", ++ "cipher 0.4.4", + ] + + [[package]] +@@ -476,21 +494,21 @@ checksum = "40e38929add23cdf8a366df9b0e088953150724bcbe5fc330b0d8eb3b328eec8" [[package]] name = "bumpalo" --version = "3.9.1" -+version = "3.10.0" +-version = "3.11.1" ++version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899" -+checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3" +-checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" ++checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytecount" --version = "0.6.2" -+version = "0.6.3" +-version = "0.6.3" ++version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "72feb31ffc86498dacdbd0fcebb56138e7177a8cc5cea4516031d15ae85a742e" -+checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" +-checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" ++checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205" [[package]] name = "byteorder" -@@ -493,7 +493,7 @@ dependencies = [ - "num-integer", - "num-traits 0.2.15", - "serde 1.0.137", -- "time 0.1.43", -+ "time 0.1.44", - "winapi 0.3.9", +-version = "1.4.3" ++version = "1.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" ++checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + + [[package]] + name = "bytes" +@@ -499,7 +517,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" + dependencies = [ + "byteorder", +- "either 1.8.0", ++ "either 1.9.0", + "iovec", ] -@@ -591,7 +591,7 @@ version = "0.1.13" +@@ -511,15 +529,18 @@ checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" + + [[package]] + name = "bytes" +-version = "1.3.0" ++version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "615f6e27d000a2bffbc7f2f6a8669179378fa27ee4d0a509e985dfc0a7defb40" +-checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" ++checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + + [[package]] + name = "cc" +-version = "1.0.78" ++version = "1.0.83" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" ++checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" ++dependencies = [ ++ "libc", ++] + + [[package]] + name = "census" +@@ -553,18 +574,17 @@ dependencies = [ + + [[package]] + name = "chrono" +-version = "0.4.23" ++version = "0.4.31" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" ++checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" + dependencies = [ ++ "android-tzdata", + "iana-time-zone", + "js-sys", +- "num-integer", +- "num-traits 0.2.15", +- "serde 1.0.152", +- "time 0.1.45", ++ "num-traits 0.2.17", ++ "serde 1.0.193", + "wasm-bindgen", +- "winapi 0.3.9", ++ "windows-targets 0.48.5", + ] + + [[package]] +@@ -578,9 +598,9 @@ dependencies = [ + + [[package]] + name = "cipher" +-version = "0.4.3" ++version = "0.4.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e" ++checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" + dependencies = [ + "crypto-common", + "inout", +@@ -610,16 +630,6 @@ dependencies = [ + "bitflags 1.3.2", + ] + +-[[package]] +-name = "codespan-reporting" +-version = "0.11.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +-dependencies = [ +- "termcolor", +- "unicode-width", +-] +- + [[package]] + name = "combine" + version = "4.6.6" +@@ -636,12 +646,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "19b076e143e1d9538dde65da30f8481c2a6c44040edb8e02b9bf1351edb92ce3" dependencies = [ -- "getrandom 0.2.6", -+ "getrandom 0.2.7", "lazy_static", - "proc-macro-hack 0.5.19", +- "nom 5.1.2", ++ "nom 5.1.3", + "rust-ini 0.13.0", +- "serde 1.0.152", ++ "serde 1.0.193", + "serde-hjson", + "serde_json", +- "toml 0.5.10", ++ "toml 0.5.11", + "yaml-rust", + ] + +@@ -657,31 +667,28 @@ dependencies = [ + + [[package]] + name = "const-random" +-version = "0.1.15" ++version = "0.1.17" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "368a7a772ead6ce7e1de82bfb04c485f3db8ec744f72925af5735e29a22cc18e" ++checksum = "5aaf16c9c2c612020bcfd042e170f6e32de9b9d75adb5277cdbbd2e2c8c8299a" + dependencies = [ + "const-random-macro", +- "proc-macro-hack 0.5.20+deprecated", + ] + + [[package]] + name = "const-random-macro" +-version = "0.1.15" ++version = "0.1.16" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9d7d6ab3c3a2282db210df5f02c4dab6e0a7057af0fb7ebd4070f30fe05c0ddb" ++checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" + dependencies = [ +- "getrandom 0.2.8", ++ "getrandom 0.2.11", + "once_cell", +- "proc-macro-hack 0.5.20+deprecated", "tiny-keccak", -@@ -599,9 +599,7 @@ dependencies = [ + ] [[package]] name = "conv" @@ -96,1185 +423,3797 @@ index fd91e109..be2aa1f8 100644 -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ff10625fd0ac447827aa30ea8b861fead473bb60aeb73af6c1c58caf0d1299" +version = "0.3.4" ++source = "git+https://github.com/DanielKeep/rust-conv#90a1e85edcc6d63616436a6049b08ba87c76d703" dependencies = [ "custom_derive", ] -@@ -619,7 +617,7 @@ dependencies = [ - "percent-encoding 2.1.0", +@@ -696,7 +703,7 @@ dependencies = [ + "base64 0.13.1", + "hkdf", + "hmac 0.10.1", +- "percent-encoding 2.2.0", ++ "percent-encoding 2.3.1", "rand 0.8.5", - "sha2", -- "time 0.1.43", -+ "time 0.1.44", - ] + "sha2 0.9.9", + "time 0.1.45", +@@ -721,9 +728,9 @@ dependencies = [ + "cookie 0.12.0", + "failure", + "idna 0.1.5", +- "log 0.4.17", ++ "log 0.4.20", + "publicsuffix", +- "serde 1.0.152", ++ "serde 1.0.193", + "serde_json", + "time 0.1.45", + "try_from", +@@ -742,15 +749,15 @@ dependencies = [ [[package]] -@@ -628,7 +626,7 @@ version = "0.12.0" + name = "core-foundation-sys" +-version = "0.8.3" ++version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "888604f00b3db336d2af898ec3c1d5d0ddf5e6d462220f2ededc33a87ac4bbd5" - dependencies = [ -- "time 0.1.43", -+ "time 0.1.44", - "url 1.7.2", - ] +-checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" ++checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" -@@ -645,7 +643,7 @@ dependencies = [ - "publicsuffix", - "serde 1.0.137", - "serde_json", -- "time 0.1.43", -+ "time 0.1.44", - "try_from", - "url 1.7.2", + [[package]] + name = "cpufeatures" +-version = "0.2.5" ++version = "0.2.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" ++checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" + dependencies = [ + "libc", ] -@@ -711,11 +709,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "4ae5588f6b3c3cb05239e90bd110f257254aecd01e4635400391aeae07497845" +@@ -791,11 +798,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" dependencies = [ "cfg-if 1.0.0", -- "crossbeam-channel 0.5.4", -+ "crossbeam-channel 0.5.5", - "crossbeam-deque 0.8.1", -- "crossbeam-epoch 0.9.8", -+ "crossbeam-epoch 0.9.9", - "crossbeam-queue 0.3.5", -- "crossbeam-utils 0.8.8", -+ "crossbeam-utils 0.8.9", +- "crossbeam-channel 0.5.6", +- "crossbeam-deque 0.8.2", +- "crossbeam-epoch 0.9.13", ++ "crossbeam-channel 0.5.8", ++ "crossbeam-deque 0.8.3", ++ "crossbeam-epoch 0.9.15", + "crossbeam-queue 0.3.8", +- "crossbeam-utils 0.8.14", ++ "crossbeam-utils 0.8.16", ] [[package]] -@@ -730,12 +728,12 @@ dependencies = [ +@@ -810,12 +817,12 @@ dependencies = [ [[package]] name = "crossbeam-channel" --version = "0.5.4" -+version = "0.5.5" +-version = "0.5.6" ++version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53" -+checksum = "4c02a4d71819009c192cf4872265391563fd6a84c81ff2c0f2a7026ca4c1d85c" +-checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" ++checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if 1.0.0", -- "crossbeam-utils 0.8.8", -+ "crossbeam-utils 0.8.9", +- "crossbeam-utils 0.8.14", ++ "crossbeam-utils 0.8.16", ] [[package]] -@@ -756,8 +754,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" +@@ -831,13 +838,13 @@ dependencies = [ + + [[package]] + name = "crossbeam-deque" +-version = "0.8.2" ++version = "0.8.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" ++checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ "cfg-if 1.0.0", -- "crossbeam-epoch 0.9.8", -- "crossbeam-utils 0.8.8", -+ "crossbeam-epoch 0.9.9", -+ "crossbeam-utils 0.8.9", +- "crossbeam-epoch 0.9.13", +- "crossbeam-utils 0.8.14", ++ "crossbeam-epoch 0.9.15", ++ "crossbeam-utils 0.8.16", ] [[package]] -@@ -777,15 +775,15 @@ dependencies = [ +@@ -857,14 +864,14 @@ dependencies = [ [[package]] name = "crossbeam-epoch" --version = "0.9.8" -+version = "0.9.9" +-version = "0.9.13" ++version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c" -+checksum = "07db9d94cbd326813772c968ccd25999e5f8ae22f4f8d1b11effa37ef6ce281d" +-checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" ++checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg 1.1.0", "cfg-if 1.0.0", -- "crossbeam-utils 0.8.8", -- "lazy_static", -+ "crossbeam-utils 0.8.9", - "memoffset 0.6.5", -+ "once_cell", +- "crossbeam-utils 0.8.14", +- "memoffset 0.7.1", ++ "crossbeam-utils 0.8.16", ++ "memoffset 0.9.0", "scopeguard", ] -@@ -807,7 +805,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "1f25d8400f4a7a5778f0e4e52384a48cbd9b5c495d110786187fc750075277a2" +@@ -886,7 +893,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" dependencies = [ "cfg-if 1.0.0", -- "crossbeam-utils 0.8.8", -+ "crossbeam-utils 0.8.9", +- "crossbeam-utils 0.8.14", ++ "crossbeam-utils 0.8.16", ] [[package]] -@@ -823,12 +821,12 @@ dependencies = [ +@@ -902,9 +909,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" --version = "0.8.8" -+version = "0.8.9" +-version = "0.8.14" ++version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" -+checksum = "8ff1f980957787286a554052d03c7aee98d99cc32e09f6d45f0a814133c87978" +-checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" ++checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if 1.0.0", -- "lazy_static", -+ "once_cell", ] +@@ -946,12 +953,12 @@ dependencies = [ [[package]] -@@ -900,10 +898,10 @@ checksum = "8e91455b86830a1c21799d94524df0845183fa55bafd9aa137b01c7d1065fa36" - dependencies = [ - "fnv", - "ident_case", -- "proc-macro2 1.0.37", -- "quote 1.0.18", -+ "proc-macro2 1.0.39", -+ "quote 1.0.19", - "strsim 0.10.0", -- "syn 1.0.92", -+ "syn 1.0.98", - ] - - [[package]] -@@ -913,8 +911,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "29b5acf0dea37a7f66f7b25d2c5e93fd46f8f6968b1a5d7a3e02e97768afc95a" - dependencies = [ - "darling_core", -- "quote 1.0.18", -- "syn 1.0.92", -+ "quote 1.0.19", -+ "syn 1.0.98", - ] - - [[package]] -@@ -975,9 +973,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "66e616858f6187ed828df7c64a6d71720d83767a7f19740b2d1b6fe6327b36e5" - dependencies = [ - "darling", -- "proc-macro2 1.0.37", -- "quote 1.0.18", -- "syn 1.0.92", -+ "proc-macro2 1.0.39", -+ "quote 1.0.19", -+ "syn 1.0.98", - ] - - [[package]] -@@ -987,7 +985,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "58a94ace95092c5acb1e97a7e846b310cfbd499652f72297da7493f618a98d73" - dependencies = [ - "derive_builder_core", -- "syn 1.0.92", -+ "syn 1.0.98", - ] - - [[package]] -@@ -1054,9 +1052,9 @@ version = "1.4.1" + name = "ctrlc" +-version = "3.2.4" ++version = "3.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "45f5098f628d02a7a0f68ddba586fb61e80edec3bdc1be3b921f4ceec60858d3" +-checksum = "1631ca6e3c59112501a9d87fd86f21591ff77acd31331e8a73f8d80a65bbdd71" ++checksum = "82e95fbd621905b854affdc67943b043a0fbb6ed7385fd5a25650d19a8a6cfdf" dependencies = [ -- "proc-macro2 1.0.37", -- "quote 1.0.18", -- "syn 1.0.92", -+ "proc-macro2 1.0.39", -+ "quote 1.0.19", -+ "syn 1.0.98", +- "nix 0.26.1", +- "windows-sys 0.42.0", ++ "nix 0.27.1", ++ "windows-sys 0.48.0", ] [[package]] -@@ -1128,7 +1126,7 @@ dependencies = [ - "encoding", - "lazy_static", - "rand 0.4.6", -- "time 0.1.43", -+ "time 0.1.44", - "version_check 0.1.5", - ] - -@@ -1232,9 +1230,9 @@ version = "0.1.8" +@@ -960,55 +967,11 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" - dependencies = [ -- "proc-macro2 1.0.37", -- "quote 1.0.18", -- "syn 1.0.92", -+ "proc-macro2 1.0.39", -+ "quote 1.0.19", -+ "syn 1.0.98", - "synstructure", - ] - -@@ -1270,13 +1268,11 @@ dependencies = [ - - [[package]] - name = "flate2" --version = "1.0.23" -+version = "1.0.24" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b39522e96686d38f4bc984b9198e3a0613264abaebaff2c5c918bfa6b6da09af" -+checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" - dependencies = [ -- "cfg-if 1.0.0", - "crc32fast", -- "libc", - "miniz_oxide", - ] - -@@ -1456,9 +1452,9 @@ version = "0.3.21" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" - dependencies = [ -- "proc-macro2 1.0.37", -- "quote 1.0.18", -- "syn 1.0.92", -+ "proc-macro2 1.0.39", -+ "quote 1.0.19", -+ "syn 1.0.98", - ] - - [[package]] -@@ -1514,14 +1510,14 @@ dependencies = [ - - [[package]] - name = "getrandom" --version = "0.2.6" -+version = "0.2.7" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" -+checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" - dependencies = [ - "cfg-if 1.0.0", - "js-sys", - "libc", -- "wasi 0.10.2+wasi-snapshot-preview1", -+ "wasi 0.11.0+wasi-snapshot-preview1", - "wasm-bindgen", - ] - -@@ -1543,9 +1539,9 @@ checksum = "649db3b5cda06091ea6aacb9f66f7002dfe885505b324b8ed795261253ffc2b3" - dependencies = [ - "gettext", - "gettext-utils", -- "proc-macro2 1.0.37", -- "quote 1.0.18", -- "syn 1.0.92", -+ "proc-macro2 1.0.39", -+ "quote 1.0.19", -+ "syn 1.0.98", - ] - - [[package]] -@@ -1657,7 +1653,7 @@ dependencies = [ - "futures-core", - "futures-sink", - "futures-util", -- "http 0.2.7", -+ "http 0.2.8", - "indexmap", - "slab", - "tokio 0.2.25", -@@ -1677,11 +1673,11 @@ dependencies = [ - "futures-core", - "futures-sink", - "futures-util", -- "http 0.2.7", -+ "http 0.2.8", - "indexmap", - "slab", - "tokio 1.19.2", -- "tokio-util 0.7.1", -+ "tokio-util 0.7.3", - "tracing", - ] - -@@ -1757,9 +1753,9 @@ dependencies = [ - "log 0.4.17", - "mac", - "markup5ever", -- "proc-macro2 1.0.37", -- "quote 1.0.18", -- "syn 1.0.92", -+ "proc-macro2 1.0.39", -+ "quote 1.0.19", -+ "syn 1.0.98", - ] - - [[package]] -@@ -1781,13 +1777,13 @@ dependencies = [ - - [[package]] - name = "http" --version = "0.2.7" -+version = "0.2.8" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ff8670570af52249509a86f5e3e18a08c60b177071826898fde8997cf5f6bfbb" -+checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" - dependencies = [ - "bytes 1.1.0", - "fnv", -- "itoa 1.0.1", -+ "itoa 1.0.2", - ] - - [[package]] -@@ -1809,17 +1805,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" - dependencies = [ - "bytes 0.5.6", -- "http 0.2.7", -+ "http 0.2.8", - ] - - [[package]] - name = "http-body" --version = "0.4.4" -+version = "0.4.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6" -+checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" - dependencies = [ - "bytes 1.1.0", -- "http 0.2.7", -+ "http 0.2.8", - "pin-project-lite 0.2.9", - ] - -@@ -1853,7 +1849,7 @@ dependencies = [ - "log 0.3.9", - "mime 0.2.6", - "num_cpus", -- "time 0.1.43", -+ "time 0.1.44", - "traitobject", - "typeable", - "unicase 1.4.2", -@@ -1878,7 +1874,7 @@ dependencies = [ - "log 0.4.17", - "net2", - "rustc_version", -- "time 0.1.43", -+ "time 0.1.44", - "tokio 0.1.22", - "tokio-buf", - "tokio-executor", -@@ -1901,7 +1897,7 @@ dependencies = [ - "futures-core", - "futures-util", - "h2 0.2.7", -- "http 0.2.7", -+ "http 0.2.8", - "http-body 0.3.1", - "httparse", - "httpdate 0.3.2", -@@ -1916,20 +1912,20 @@ dependencies = [ - - [[package]] - name = "hyper" --version = "0.14.18" -+version = "0.14.19" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b26ae0a80afebe130861d90abf98e3814a4f28a4c6ffeb5ab8ebb2be311e0ef2" -+checksum = "42dc3c131584288d375f2d07f822b0cb012d8c6fb899a5b9fdb3cb7eb9b6004f" - dependencies = [ - "bytes 1.1.0", - "futures-channel", - "futures-core", - "futures-util", - "h2 0.3.13", -- "http 0.2.7", -- "http-body 0.4.4", -+ "http 0.2.8", -+ "http-body 0.4.5", - "httparse", - "httpdate 1.0.2", -- "itoa 1.0.1", -+ "itoa 1.0.2", - "pin-project-lite 0.2.9", - "socket2 0.4.4", - "tokio 1.19.2", -@@ -1971,7 +1967,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" - dependencies = [ - "bytes 1.1.0", -- "hyper 0.14.18", -+ "hyper 0.14.19", - "native-tls", - "tokio 1.19.2", - "tokio-native-tls", -@@ -2013,12 +2009,12 @@ checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" - - [[package]] - name = "indexmap" --version = "1.8.1" -+version = "1.9.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee" -+checksum = "6c6392766afd7964e2531940894cffe4bd8d7d17dbc3c1c4857040fd4b33bdb3" - dependencies = [ - "autocfg 1.1.0", -- "hashbrown 0.11.2", -+ "hashbrown 0.12.1", - ] - - [[package]] -@@ -2076,9 +2072,9 @@ checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" - - [[package]] - name = "iri-string" --version = "0.5.4" -+version = "0.5.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6e76a2a488a2bce15f9e696e3b9b66a4e1412c13339344bba8a24b7eae30f91b" -+checksum = "141fcdf9a9482268670cec9575062b4db299646cdf7897222b689bcb1d86d68b" - dependencies = [ - "serde 1.0.137", - ] -@@ -2109,9 +2105,9 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - - [[package]] - name = "itoa" --version = "1.0.1" -+version = "1.0.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" -+checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" - - [[package]] - name = "js-sys" -@@ -2181,7 +2177,7 @@ dependencies = [ - "tokio 1.19.2", - "tokio-native-tls", - "tokio-stream", -- "tokio-util 0.7.1", -+ "tokio-util 0.7.3", - "url 2.2.2", - ] - -@@ -2213,7 +2209,7 @@ dependencies = [ - "email", - "lettre", - "mime 0.3.16", -- "time 0.1.43", -+ "time 0.1.44", - "uuid 0.7.4", - ] - -@@ -2238,9 +2234,9 @@ dependencies = [ - - [[package]] - name = "libc" --version = "0.2.125" -+version = "0.2.126" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b" -+checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" - - [[package]] - name = "libsqlite3-sys" -@@ -2500,9 +2496,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "9753f12909fd8d923f75ae5c3258cae1ed3c8ec052e1b38c93c21a6d157f789c" - dependencies = [ - "migrations_internals", -- "proc-macro2 1.0.37", -- "quote 1.0.18", -- "syn 1.0.92", -+ "proc-macro2 1.0.39", -+ "quote 1.0.19", -+ "syn 1.0.98", - ] - - [[package]] -@@ -2538,9 +2534,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - - [[package]] - name = "miniz_oxide" --version = "0.5.1" -+version = "0.5.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082" -+checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc" - dependencies = [ - "adler", - ] -@@ -2566,16 +2562,14 @@ dependencies = [ - - [[package]] - name = "mio" --version = "0.8.2" -+version = "0.8.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9" -+checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" - dependencies = [ - "libc", - "log 0.4.17", -- "miow 0.3.7", -- "ntapi", - "wasi 0.11.0+wasi-snapshot-preview1", -- "winapi 0.3.9", -+ "windows-sys", - ] - - [[package]] -@@ -2667,7 +2661,7 @@ version = "0.7.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" - dependencies = [ -- "getrandom 0.2.6", -+ "getrandom 0.2.7", - ] - - [[package]] -@@ -2801,15 +2795,6 @@ dependencies = [ - "winapi 0.3.9", - ] + checksum = "ef8ae57c4978a2acd8b869ce6b9ca1dfe817bff704c220209fdef2c0b75a01b9" -[[package]] --name = "ntapi" --version = "0.3.7" +-name = "cxx" +-version = "1.0.85" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" +-checksum = "5add3fc1717409d029b20c5b6903fc0c0b02fa6741d820054f4a2efa5e5816fd" -dependencies = [ -- "winapi 0.3.9", +- "cc", +- "cxxbridge-flags", +- "cxxbridge-macro", +- "link-cplusplus", +-] +- +-[[package]] +-name = "cxx-build" +-version = "1.0.85" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b4c87959ba14bc6fbc61df77c3fcfe180fc32b93538c4f1031dd802ccb5f2ff0" +-dependencies = [ +- "cc", +- "codespan-reporting", +- "once_cell", +- "proc-macro2 1.0.49", +- "quote 1.0.23", +- "scratch", +- "syn 1.0.107", +-] +- +-[[package]] +-name = "cxxbridge-flags" +-version = "1.0.85" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "69a3e162fde4e594ed2b07d0f83c6c67b745e7f28ce58c6df5e6b6bef99dfb59" +- +-[[package]] +-name = "cxxbridge-macro" +-version = "1.0.85" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3e7e2adeb6a0d4a282e581096b06e1791532b7d576dcde5ccd9382acf55db8e6" +-dependencies = [ +- "proc-macro2 1.0.49", +- "quote 1.0.23", +- "syn 1.0.107", -] - [[package]] - name = "num-bigint" - version = "0.4.3" -@@ -2881,9 +2866,9 @@ dependencies = [ + name = "darling" +-version = "0.14.2" ++version = "0.14.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b0dd3cd20dc6b5a876612a6e5accfe7f3dd883db6d07acfbf14c128f61550dfa" ++checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" + dependencies = [ + "darling_core", + "darling_macro", +@@ -1016,27 +979,27 @@ dependencies = [ [[package]] - name = "object" --version = "0.28.3" -+version = "0.28.4" + name = "darling_core" +-version = "0.14.2" ++version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "40bec70ba014595f99f7aa110b84331ffe1ee9aece7fe6f387cc7e3ecda4d456" -+checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424" +-checksum = "a784d2ccaf7c98501746bf0be29b2022ba41fd62a2e622af997a03e9f972859f" ++checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" dependencies = [ + "fnv", + "ident_case", +- "proc-macro2 1.0.49", +- "quote 1.0.23", ++ "proc-macro2 1.0.70", ++ "quote 1.0.33", + "strsim 0.10.0", +- "syn 1.0.107", ++ "syn 1.0.109", + ] + + [[package]] + name = "darling_macro" +-version = "0.14.2" ++version = "0.14.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e" ++checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" + dependencies = [ + "darling_core", +- "quote 1.0.23", +- "syn 1.0.107", ++ "quote 1.0.33", ++ "syn 1.0.109", + ] + + [[package]] +@@ -1081,6 +1044,16 @@ dependencies = [ + "backtrace 0.1.8", + ] + ++[[package]] ++name = "deranged" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" ++dependencies = [ ++ "powerfmt", ++ "serde 1.0.193", ++] ++ + [[package]] + name = "derive_builder" + version = "0.12.0" +@@ -1097,9 +1070,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" + dependencies = [ + "darling", +- "proc-macro2 1.0.49", +- "quote 1.0.23", +- "syn 1.0.107", ++ "proc-macro2 1.0.70", ++ "quote 1.0.33", ++ "syn 1.0.109", + ] + + [[package]] +@@ -1109,7 +1082,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" + dependencies = [ + "derive_builder_core", +- "syn 1.0.107", ++ "syn 1.0.109", + ] + + [[package]] +@@ -1161,13 +1134,13 @@ dependencies = [ + + [[package]] + name = "diesel-derive-newtype" +-version = "1.0.0" ++version = "1.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6f5e96f584cab47f91f47a496e33cb35558f63d375f374282421dcccaa9f7ef5" ++checksum = "9ef0370bcaee31d2e411eceb660059fc2af2be1119b7cd81573891599990ad6f" + dependencies = [ +- "proc-macro2 0.4.30", +- "quote 0.6.13", +- "syn 0.14.9", ++ "proc-macro2 1.0.70", ++ "quote 1.0.33", ++ "syn 2.0.39", + ] + + [[package]] +@@ -1176,9 +1149,9 @@ version = "1.4.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "45f5098f628d02a7a0f68ddba586fb61e80edec3bdc1be3b921f4ceec60858d3" + dependencies = [ +- "proc-macro2 1.0.49", +- "quote 1.0.23", +- "syn 1.0.107", ++ "proc-macro2 1.0.70", ++ "quote 1.0.33", ++ "syn 1.0.109", + ] + + [[package]] +@@ -1202,9 +1175,9 @@ dependencies = [ + + [[package]] + name = "digest" +-version = "0.10.6" ++version = "0.10.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" ++checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" + dependencies = [ + "block-buffer 0.10.4", + "crypto-common", +@@ -1272,9 +1245,9 @@ checksum = "a39bffec1e2015c5d8a6773cb0cf48d0d758c842398f624c34969071f5499ea7" + + [[package]] + name = "either" +-version = "1.8.0" ++version = "1.9.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" ++checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + + [[package]] + name = "email" +@@ -1357,13 +1330,29 @@ checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" + + [[package]] + name = "encoding_rs" +-version = "0.8.31" ++version = "0.8.33" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" ++checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" + dependencies = [ + "cfg-if 1.0.0", + ] + ++[[package]] ++name = "equivalent" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" ++ ++[[package]] ++name = "errno" ++version = "0.3.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" ++dependencies = [ ++ "libc", ++ "windows-sys 0.52.0", ++] ++ + [[package]] + name = "fail" + version = "0.4.0" +@@ -1371,7 +1360,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "3be3c61c59fdc91f5dbc3ea31ee8623122ce80057058be560654c5d410d181a6" + dependencies = [ + "lazy_static", +- "log 0.4.17", ++ "log 0.4.20", + "rand 0.7.3", + ] + +@@ -1381,7 +1370,7 @@ version = "0.1.8" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" + dependencies = [ +- "backtrace 0.3.67", ++ "backtrace 0.3.69", + "failure_derive", + ] + +@@ -1391,9 +1380,9 @@ version = "0.1.8" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" + dependencies = [ +- "proc-macro2 1.0.49", +- "quote 1.0.23", +- "syn 1.0.107", ++ "proc-macro2 1.0.70", ++ "quote 1.0.33", ++ "syn 1.0.109", + "synstructure", + ] + +@@ -1408,30 +1397,36 @@ dependencies = [ + + [[package]] + name = "fastrand" +-version = "1.8.0" ++version = "1.9.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" ++checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" + dependencies = [ + "instant", + ] + ++[[package]] ++name = "fastrand" ++version = "2.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" ++ + [[package]] + name = "filetime" +-version = "0.2.19" ++version = "0.2.22" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9" ++checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" + dependencies = [ + "cfg-if 1.0.0", + "libc", +- "redox_syscall 0.2.16", +- "windows-sys 0.42.0", ++ "redox_syscall 0.3.5", ++ "windows-sys 0.48.0", + ] + + [[package]] + name = "flate2" +-version = "1.0.25" ++version = "1.0.28" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" ++checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" + dependencies = [ + "crc32fast", + "miniz_oxide", +@@ -1447,7 +1442,7 @@ dependencies = [ + "futures-sink", + "nanorand", + "pin-project", +- "spin 0.9.4", ++ "spin 0.9.8", + ] + + [[package]] +@@ -1473,11 +1468,11 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + + [[package]] + name = "form_urlencoded" +-version = "1.1.0" ++version = "1.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" ++checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" + dependencies = [ +- "percent-encoding 2.2.0", ++ "percent-encoding 2.3.1", + ] + + [[package]] +@@ -1549,9 +1544,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" + + [[package]] + name = "futures" +-version = "0.3.25" ++version = "0.3.29" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" ++checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" + dependencies = [ + "futures-channel", + "futures-core", +@@ -1564,9 +1559,9 @@ dependencies = [ + + [[package]] + name = "futures-channel" +-version = "0.3.25" ++version = "0.3.29" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" ++checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" + dependencies = [ + "futures-core", + "futures-sink", +@@ -1574,9 +1569,9 @@ dependencies = [ + + [[package]] + name = "futures-core" +-version = "0.3.25" ++version = "0.3.29" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" ++checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" + + [[package]] + name = "futures-cpupool" +@@ -1590,9 +1585,9 @@ dependencies = [ + + [[package]] + name = "futures-executor" +-version = "0.3.25" ++version = "0.3.29" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" ++checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" + dependencies = [ + "futures-core", + "futures-task", +@@ -1602,38 +1597,38 @@ dependencies = [ + + [[package]] + name = "futures-io" +-version = "0.3.25" ++version = "0.3.29" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" ++checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" + + [[package]] + name = "futures-macro" +-version = "0.3.25" ++version = "0.3.29" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" ++checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" + dependencies = [ +- "proc-macro2 1.0.49", +- "quote 1.0.23", +- "syn 1.0.107", ++ "proc-macro2 1.0.70", ++ "quote 1.0.33", ++ "syn 2.0.39", + ] + + [[package]] + name = "futures-sink" +-version = "0.3.25" ++version = "0.3.29" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" ++checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" + + [[package]] + name = "futures-task" +-version = "0.3.25" ++version = "0.3.29" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" ++checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" + + [[package]] + name = "futures-util" +-version = "0.3.25" ++version = "0.3.29" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" ++checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" + dependencies = [ + "futures-channel", + "futures-core", +@@ -1642,16 +1637,16 @@ dependencies = [ + "futures-sink", + "futures-task", "memchr", - ] -@@ -2943,9 +2928,9 @@ version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" - dependencies = [ -- "proc-macro2 1.0.37", -- "quote 1.0.18", -- "syn 1.0.92", -+ "proc-macro2 1.0.39", -+ "quote 1.0.19", -+ "syn 1.0.98", +- "pin-project-lite 0.2.9", ++ "pin-project-lite 0.2.13", + "pin-utils", + "slab", ] [[package]] -@@ -2956,9 +2941,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - - [[package]] - name = "openssl-sys" --version = "0.9.73" -+version = "0.9.74" + name = "generic-array" +-version = "0.14.6" ++version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9d5fd19fb3e0a8191c1e34935718976a3e70c112ab9a24af6d7cadccd9d90bc0" -+checksum = "835363342df5fba8354c5b453325b110ffd54044e588c539cf2f20a8014e4cb1" +-checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" ++checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ - "autocfg 1.1.0", - "cc", -@@ -3009,9 +2994,9 @@ dependencies = [ - - [[package]] - name = "parking_lot" --version = "0.12.0" -+version = "0.12.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" -+checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" - dependencies = [ - "lock_api 0.4.7", - "parking_lot_core 0.9.3", -@@ -3070,9 +3055,9 @@ dependencies = [ - - [[package]] - name = "pear_codegen" --version = "0.1.4" -+version = "0.1.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "bfc1c836fdc3d1ef87c348b237b5b5c4dff922156fb2d968f57734f9669768ca" -+checksum = "c0288ba5d581afbc93e2bbd931c1013584c15ecf46b1cdb927edc7abddbc8ca6" - dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", -@@ -3146,9 +3131,9 @@ version = "1.0.10" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb" - dependencies = [ -- "proc-macro2 1.0.37", -- "quote 1.0.18", -- "syn 1.0.92", -+ "proc-macro2 1.0.39", -+ "quote 1.0.19", -+ "syn 1.0.98", - ] - - [[package]] -@@ -3384,9 +3369,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" - dependencies = [ - "proc-macro-error-attr", -- "proc-macro2 1.0.37", -- "quote 1.0.18", -- "syn 1.0.92", -+ "proc-macro2 1.0.39", -+ "quote 1.0.19", -+ "syn 1.0.98", + "typenum", "version_check 0.9.4", - ] - -@@ -3396,8 +3381,8 @@ version = "1.0.4" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" - dependencies = [ -- "proc-macro2 1.0.37", -- "quote 1.0.18", -+ "proc-macro2 1.0.39", -+ "quote 1.0.19", - "version_check 0.9.4", - ] - -@@ -3442,11 +3427,11 @@ dependencies = [ +@@ -1670,9 +1665,9 @@ dependencies = [ [[package]] - name = "proc-macro2" --version = "1.0.37" -+version = "1.0.39" + name = "getrandom" +-version = "0.2.8" ++version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1" -+checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f" +-checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" ++checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ -- "unicode-xid 0.2.3", -+ "unicode-ident", + "cfg-if 1.0.0", + "js-sys", +@@ -1699,9 +1694,9 @@ checksum = "649db3b5cda06091ea6aacb9f66f7002dfe885505b324b8ed795261253ffc2b3" + dependencies = [ + "gettext", + "gettext-utils", +- "proc-macro2 1.0.49", +- "quote 1.0.23", +- "syn 1.0.107", ++ "proc-macro2 1.0.70", ++ "quote 1.0.33", ++ "syn 1.0.109", ] [[package]] -@@ -3505,11 +3490,11 @@ dependencies = [ +@@ -1722,9 +1717,9 @@ dependencies = [ [[package]] - name = "quote" --version = "1.0.18" -+version = "1.0.19" + name = "gimli" +-version = "0.27.0" ++version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" -+checksum = "f53dc8cf16a769a6f677e09e7ff2cd4be1ea0f48754aac39520536962011de0d" +-checksum = "dec7af912d60cdbd3677c1af9352ebae6fb8394d165568a2234df0fa00f87793" ++checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + + [[package]] + name = "glob" +@@ -1743,7 +1738,7 @@ dependencies = [ + "failure_derive", + "guid-macro-impl", + "guid-parser", +- "proc-macro-hack 0.4.3", ++ "proc-macro-hack", + "winapi 0.2.8", + ] + +@@ -1769,7 +1764,7 @@ checksum = "08d50f7c496073b5a5dec0f6f1c149113a50960ce25dd2a559987a5a71190816" dependencies = [ -- "proc-macro2 1.0.37", -+ "proc-macro2 1.0.39", + "chomp", + "guid-parser", +- "proc-macro-hack 0.4.3", ++ "proc-macro-hack", + "quote 0.4.2", + "syn 0.12.15", + ] +@@ -1795,8 +1790,8 @@ dependencies = [ + "fnv", + "futures 0.1.31", + "http 0.1.21", +- "indexmap", +- "log 0.4.17", ++ "indexmap 1.9.3", ++ "log 0.4.20", + "slab", + "string", + "tokio-io", +@@ -1813,8 +1808,8 @@ dependencies = [ + "futures-core", + "futures-sink", + "futures-util", +- "http 0.2.8", +- "indexmap", ++ "http 0.2.11", ++ "indexmap 1.9.3", + "slab", + "tokio 0.2.25", + "tokio-util 0.3.1", +@@ -1824,20 +1819,20 @@ dependencies = [ + + [[package]] + name = "h2" +-version = "0.3.15" ++version = "0.3.22" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" ++checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" + dependencies = [ +- "bytes 1.3.0", ++ "bytes 1.5.0", + "fnv", + "futures-core", + "futures-sink", + "futures-util", +- "http 0.2.8", +- "indexmap", ++ "http 0.2.11", ++ "indexmap 2.1.0", + "slab", +- "tokio 1.24.1", +- "tokio-util 0.7.4", ++ "tokio 1.34.0", ++ "tokio-util 0.7.10", + "tracing", + ] + +@@ -1847,7 +1842,7 @@ version = "0.11.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" + dependencies = [ +- "ahash 0.7.6", ++ "ahash 0.7.7", ] [[package]] -@@ -3639,7 +3624,7 @@ version = "0.6.3" +@@ -1856,9 +1851,15 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" + checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ -- "getrandom 0.2.6", -+ "getrandom 0.2.7", +- "ahash 0.7.6", ++ "ahash 0.7.7", + ] + ++[[package]] ++name = "hashbrown" ++version = "0.14.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" ++ + [[package]] + name = "hermit-abi" + version = "0.1.19" +@@ -1870,12 +1871,9 @@ dependencies = [ + + [[package]] + name = "hermit-abi" +-version = "0.2.6" ++version = "0.3.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +-dependencies = [ +- "libc", +-] ++checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" + + [[package]] + name = "hex" +@@ -1909,7 +1907,7 @@ version = "0.12.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" + dependencies = [ +- "digest 0.10.6", ++ "digest 0.10.7", ] [[package]] -@@ -3715,9 +3700,9 @@ dependencies = [ - - [[package]] - name = "rayon" --version = "1.5.2" -+version = "1.5.3" +@@ -1928,12 +1926,12 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fd249e82c21598a9a426a4e00dd7adc1d640b22445ec8545feef801d1a74c221" -+checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" + checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" dependencies = [ - "autocfg 1.1.0", - "crossbeam-deque 0.8.1", -@@ -3727,13 +3712,13 @@ dependencies = [ +- "log 0.4.17", ++ "log 0.4.20", + "mac", + "markup5ever", +- "proc-macro2 1.0.49", +- "quote 1.0.23", +- "syn 1.0.107", ++ "proc-macro2 1.0.70", ++ "quote 1.0.33", ++ "syn 1.0.109", + ] [[package]] - name = "rayon-core" +@@ -1955,13 +1953,13 @@ dependencies = [ + + [[package]] + name = "http" +-version = "0.2.8" ++version = "0.2.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" ++checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" + dependencies = [ +- "bytes 1.3.0", ++ "bytes 1.5.0", + "fnv", +- "itoa 1.0.5", ++ "itoa 1.0.9", + ] + + [[package]] +@@ -1983,7 +1981,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" + dependencies = [ + "bytes 0.5.6", +- "http 0.2.8", ++ "http 0.2.11", + ] + + [[package]] +@@ -1992,9 +1990,9 @@ version = "0.4.5" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" + dependencies = [ +- "bytes 1.3.0", +- "http 0.2.8", +- "pin-project-lite 0.2.9", ++ "bytes 1.5.0", ++ "http 0.2.11", ++ "pin-project-lite 0.2.13", + ] + + [[package]] +@@ -2011,9 +2009,9 @@ checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" + + [[package]] + name = "httpdate" +-version = "1.0.2" ++version = "1.0.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" ++checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + + [[package]] + name = "hyper" +@@ -2049,7 +2047,7 @@ dependencies = [ + "httparse", + "iovec", + "itoa 0.4.8", +- "log 0.4.17", ++ "log 0.4.20", + "net2", + "rustc_version", + "time 0.1.45", +@@ -2075,7 +2073,7 @@ dependencies = [ + "futures-core", + "futures-util", + "h2 0.2.7", +- "http 0.2.8", ++ "http 0.2.11", + "http-body 0.3.1", + "httparse", + "httpdate 0.3.2", +@@ -2085,31 +2083,31 @@ dependencies = [ + "tokio 0.2.25", + "tower-service", + "tracing", +- "want 0.3.0", ++ "want 0.3.1", + ] + + [[package]] + name = "hyper" +-version = "0.14.23" ++version = "0.14.27" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" ++checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" + dependencies = [ +- "bytes 1.3.0", ++ "bytes 1.5.0", + "futures-channel", + "futures-core", + "futures-util", +- "h2 0.3.15", +- "http 0.2.8", ++ "h2 0.3.22", ++ "http 0.2.11", + "http-body 0.4.5", + "httparse", +- "httpdate 1.0.2", +- "itoa 1.0.5", +- "pin-project-lite 0.2.9", +- "socket2 0.4.7", +- "tokio 1.24.1", ++ "httpdate 1.0.3", ++ "itoa 1.0.9", ++ "pin-project-lite 0.2.13", ++ "socket2 0.4.10", ++ "tokio 1.34.0", + "tower-service", + "tracing", +- "want 0.3.0", ++ "want 0.3.1", + ] + + [[package]] +@@ -2144,35 +2142,34 @@ version = "0.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" + dependencies = [ +- "bytes 1.3.0", +- "hyper 0.14.23", ++ "bytes 1.5.0", ++ "hyper 0.14.27", + "native-tls", +- "tokio 1.24.1", ++ "tokio 1.34.0", + "tokio-native-tls", + ] + + [[package]] + name = "iana-time-zone" +-version = "0.1.53" ++version = "0.1.58" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" ++checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" + dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", +- "winapi 0.3.9", ++ "windows-core", + ] + + [[package]] + name = "iana-time-zone-haiku" +-version = "0.1.1" ++version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" ++checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" + dependencies = [ +- "cxx", +- "cxx-build", ++ "cc", + ] + + [[package]] +@@ -2205,9 +2202,9 @@ dependencies = [ + + [[package]] + name = "idna" +-version = "0.3.0" ++version = "0.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" ++checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" + dependencies = [ + "unicode-bidi", + "unicode-normalization", +@@ -2221,14 +2218,24 @@ checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" + + [[package]] + name = "indexmap" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9f51245e1e62e1f1629cbfec37b5793bbabcaeb90f30e94d2ba03564687353e4" -+checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" +-checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" ++checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ -- "crossbeam-channel 0.5.4", -+ "crossbeam-channel 0.5.5", - "crossbeam-deque 0.8.1", -- "crossbeam-utils 0.8.8", -+ "crossbeam-utils 0.8.9", - "num_cpus", + "autocfg 1.1.0", + "hashbrown 0.12.3", ] -@@ -3763,9 +3748,9 @@ dependencies = [ ++[[package]] ++name = "indexmap" ++version = "2.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" ++dependencies = [ ++ "equivalent", ++ "hashbrown 0.14.3", ++] ++ + [[package]] + name = "inotify" + version = "0.7.1" +@@ -2278,9 +2285,9 @@ dependencies = [ + + [[package]] + name = "ipnet" +-version = "2.7.0" ++version = "2.9.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "11b0d96e660696543b251e58030cf9787df56da39dab19ad60eae7353040917e" ++checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + + [[package]] + name = "iri-string" +@@ -2288,7 +2295,7 @@ version = "0.5.6" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "bf071934ee7ee97e52fa1868a9540a7885eab75926bd70794030304a9797cea1" + dependencies = [ +- "serde 1.0.152", ++ "serde 1.0.193", + ] + + [[package]] +@@ -2297,7 +2304,7 @@ version = "0.8.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484" + dependencies = [ +- "either 1.8.0", ++ "either 1.9.0", + ] + + [[package]] +@@ -2306,7 +2313,7 @@ version = "0.10.5" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" + dependencies = [ +- "either 1.8.0", ++ "either 1.9.0", + ] + + [[package]] +@@ -2317,15 +2324,15 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" + + [[package]] + name = "itoa" +-version = "1.0.5" ++version = "1.0.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" ++checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" + + [[package]] + name = "js-sys" +-version = "0.3.60" ++version = "0.3.66" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" ++checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" + dependencies = [ + "wasm-bindgen", + ] +@@ -2360,36 +2367,36 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + + [[package]] + name = "lber" +-version = "0.4.0" ++version = "0.4.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b5d85f5e00e12cb50c70c3b1c1f0daff6546eb4c608b44d0a990e38a539e0446" ++checksum = "2df7f9fd9f64cf8f59e1a4a0753fe7d575a5b38d3d7ac5758dcee9357d83ef0a" + dependencies = [ +- "bytes 1.3.0", +- "nom 7.1.2", ++ "bytes 1.5.0", ++ "nom 7.1.3", + ] + + [[package]] + name = "ldap3" +-version = "0.11.1" ++version = "0.11.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c5cfbd3c59ca16d6671b002b8b3dd013cd825d9c77a1664a3135194d3270511e" ++checksum = "6dceb52eac140c8679326f619b963577ccf5a4ab025fe5e6db424d2fd3e4f400" + dependencies = [ + "async-trait", +- "bytes 1.3.0", +- "futures 0.3.25", ++ "bytes 1.5.0", ++ "futures 0.3.29", + "futures-util", + "lazy_static", + "lber", +- "log 0.4.17", ++ "log 0.4.20", + "native-tls", +- "nom 7.1.2", +- "percent-encoding 2.2.0", ++ "nom 7.1.3", ++ "percent-encoding 2.3.1", + "thiserror", +- "tokio 1.24.1", ++ "tokio 1.34.0", + "tokio-native-tls", + "tokio-stream", +- "tokio-util 0.7.4", +- "url 2.3.1", ++ "tokio-util 0.7.10", ++ "url 2.5.0", + ] + + [[package]] +@@ -2402,10 +2409,10 @@ dependencies = [ + "bufstream", + "fast_chemail", + "hostname", +- "log 0.4.17", ++ "log 0.4.20", + "native-tls", + "nom 4.2.3", +- "serde 1.0.152", ++ "serde 1.0.193", + "serde_derive", + "serde_json", + ] +@@ -2419,7 +2426,7 @@ dependencies = [ + "base64 0.10.1", + "email", + "lettre", +- "mime 0.3.16", ++ "mime 0.3.17", + "time 0.1.45", + "uuid 0.7.4", + ] +@@ -2445,9 +2452,20 @@ dependencies = [ + + [[package]] + name = "libc" +-version = "0.2.139" ++version = "0.2.150" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" ++checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" ++ ++[[package]] ++name = "libredox" ++version = "0.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" ++dependencies = [ ++ "bitflags 2.4.1", ++ "libc", ++ "redox_syscall 0.4.1", ++] + + [[package]] + name = "libsqlite3-sys" +@@ -2472,7 +2490,7 @@ dependencies = [ + "lindera-dictionary", + "lindera-ipadic", + "lindera-ipadic-builder", +- "serde 1.0.152", ++ "serde 1.0.193", + "serde_json", + ] + +@@ -2485,7 +2503,7 @@ dependencies = [ + "bincode", + "byteorder", + "encoding", +- "serde 1.0.152", ++ "serde 1.0.193", + "yada", + ] + +@@ -2551,15 +2569,6 @@ dependencies = [ + "safemem", + ] + +-[[package]] +-name = "link-cplusplus" +-version = "1.0.8" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" +-dependencies = [ +- "cc", +-] +- + [[package]] + name = "linked-hash-map" + version = "0.3.0" +@@ -2576,6 +2585,12 @@ version = "0.5.6" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + ++[[package]] ++name = "linux-raw-sys" ++version = "0.4.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" ++ + [[package]] + name = "lock_api" + version = "0.3.4" +@@ -2587,9 +2602,9 @@ dependencies = [ + + [[package]] + name = "lock_api" +-version = "0.4.9" ++version = "0.4.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" ++checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" + dependencies = [ + "autocfg 1.1.0", + "scopeguard", +@@ -2601,17 +2616,14 @@ version = "0.3.9" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" + dependencies = [ +- "log 0.4.17", ++ "log 0.4.20", + ] + + [[package]] + name = "log" +-version = "0.4.17" ++version = "0.4.20" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +-dependencies = [ +- "cfg-if 1.0.0", +-] ++checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + + [[package]] + name = "lru" +@@ -2640,7 +2652,7 @@ version = "0.11.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" + dependencies = [ +- "log 0.4.17", ++ "log 0.4.20", + "phf", + "phf_codegen", + "string_cache", +@@ -2650,9 +2662,9 @@ dependencies = [ + + [[package]] + name = "matches" +-version = "0.1.9" ++version = "0.1.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" ++checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + + [[package]] + name = "maybe-async" +@@ -2660,9 +2672,9 @@ version = "0.2.7" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "0f1b8c13cb1f814b634a96b2c725449fe7ed464a7b8781de8688be5ffbd3f305" + dependencies = [ +- "proc-macro2 1.0.49", +- "quote 1.0.23", +- "syn 1.0.107", ++ "proc-macro2 1.0.70", ++ "quote 1.0.33", ++ "syn 1.0.109", + ] + + [[package]] +@@ -2679,9 +2691,9 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" + + [[package]] + name = "memchr" +-version = "2.5.0" ++version = "2.6.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" ++checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" + + [[package]] + name = "memmap" +@@ -2704,9 +2716,9 @@ dependencies = [ + + [[package]] + name = "memoffset" +-version = "0.7.1" ++version = "0.9.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" ++checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" + dependencies = [ + "autocfg 1.1.0", + ] +@@ -2727,9 +2739,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "9753f12909fd8d923f75ae5c3258cae1ed3c8ec052e1b38c93c21a6d157f789c" + dependencies = [ + "migrations_internals", +- "proc-macro2 1.0.49", +- "quote 1.0.23", +- "syn 1.0.107", ++ "proc-macro2 1.0.70", ++ "quote 1.0.33", ++ "syn 1.0.109", + ] + + [[package]] +@@ -2743,9 +2755,9 @@ dependencies = [ + + [[package]] + name = "mime" +-version = "0.3.16" ++version = "0.3.17" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" ++checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + + [[package]] + name = "mime_guess" +@@ -2753,15 +2765,15 @@ version = "2.0.4" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" + dependencies = [ +- "mime 0.3.16", +- "unicase 2.6.0", ++ "mime 0.3.17", ++ "unicase 2.7.0", + ] + + [[package]] + name = "minidom" +-version = "0.15.1" ++version = "0.15.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2e9ce45d459e358790a285e7609ff5ae4cfab88b75f237e8838e62029dda397b" ++checksum = "f45614075738ce1b77a1768912a60c0227525971b03e09122a05b8a34a2a6278" + dependencies = [ + "rxml", + ] +@@ -2774,9 +2786,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + + [[package]] + name = "miniz_oxide" +-version = "0.6.2" ++version = "0.7.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" ++checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" + dependencies = [ + "adler", + ] +@@ -2793,7 +2805,7 @@ dependencies = [ + "iovec", + "kernel32-sys", + "libc", +- "log 0.4.17", ++ "log 0.4.20", + "miow 0.2.2", + "net2", + "slab", +@@ -2802,14 +2814,13 @@ dependencies = [ + + [[package]] + name = "mio" +-version = "0.8.5" ++version = "0.8.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" ++checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" + dependencies = [ + "libc", +- "log 0.4.17", + "wasi 0.11.0+wasi-snapshot-preview1", +- "windows-sys 0.42.0", ++ "windows-sys 0.48.0", + ] + + [[package]] +@@ -2819,7 +2830,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" + dependencies = [ + "lazycell", +- "log 0.4.17", ++ "log 0.4.20", + "mio 0.6.23", + "slab", + ] +@@ -2830,7 +2841,7 @@ version = "0.1.7" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656" + dependencies = [ +- "log 0.4.17", ++ "log 0.4.20", + "mio 0.6.23", + "miow 0.3.7", + "winapi 0.3.9", +@@ -2876,8 +2887,8 @@ checksum = "00dec633863867f29cb39df64a397cdf4a6354708ddd7759f70c7fb51c5f9182" + dependencies = [ + "buf_redux", + "httparse", +- "log 0.4.17", +- "mime 0.3.16", ++ "log 0.4.20", ++ "mime 0.3.17", + "mime_guess", + "quick-error", + "rand 0.8.5", +@@ -2901,7 +2912,7 @@ version = "0.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" + dependencies = [ +- "getrandom 0.2.8", ++ "getrandom 0.2.11", + ] + + [[package]] +@@ -2912,7 +2923,7 @@ checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" + dependencies = [ + "lazy_static", + "libc", +- "log 0.4.17", ++ "log 0.4.20", + "openssl", + "openssl-probe", + "openssl-sys", +@@ -2924,9 +2935,9 @@ dependencies = [ + + [[package]] + name = "net2" +-version = "0.2.38" ++version = "0.2.39" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "74d0df99cfcd2530b2e694f6e17e7f37b8e26bb23983ac530c0c97408837c631" ++checksum = "b13b648036a2339d06de780866fbdfda0dde886de7b3af2ddeba8b14f4ee34ac" + dependencies = [ + "cfg-if 0.1.10", + "libc", +@@ -2960,14 +2971,13 @@ dependencies = [ + + [[package]] + name = "nix" +-version = "0.26.1" ++version = "0.27.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "46a58d1d356c6597d08cde02c2f09d785b09e28711837b1ed667dc652c08a694" ++checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" + dependencies = [ +- "bitflags 1.3.2", ++ "bitflags 2.4.1", + "cfg-if 1.0.0", + "libc", +- "static_assertions", + ] + + [[package]] +@@ -2982,9 +2992,9 @@ dependencies = [ + + [[package]] + name = "nom" +-version = "5.1.2" ++version = "5.1.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" ++checksum = "08959a387a676302eebf4ddbcbc611da04285579f76f88ee0506c63b1a61dd4b" + dependencies = [ + "lexical-core", + "memchr", +@@ -2993,9 +3003,9 @@ dependencies = [ + + [[package]] + name = "nom" +-version = "7.1.2" ++version = "7.1.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e5507769c4919c998e69e49c839d9dc6e693ede4cc4290d6ad8b41d4f09c548c" ++checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" + dependencies = [ + "memchr", + "minimal-lexical", +@@ -3003,13 +3013,13 @@ dependencies = [ + + [[package]] + name = "nom_locate" +-version = "4.0.0" ++version = "4.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "37794436ca3029a3089e0b95d42da1f0b565ad271e4d3bb4bad0c7bb70b10605" ++checksum = "1e3c83c053b0713da60c5b8de47fe8e494fe3ece5267b2f23090a07a053ba8f3" + dependencies = [ + "bytecount", + "memchr", +- "nom 7.1.2", ++ "nom 7.1.3", + ] + + [[package]] +@@ -3042,13 +3052,13 @@ dependencies = [ + + [[package]] + name = "num-bigint" +-version = "0.4.3" ++version = "0.4.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" ++checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" + dependencies = [ + "autocfg 1.1.0", + "num-integer", +- "num-traits 0.2.15", ++ "num-traits 0.2.17", + ] + + [[package]] +@@ -3058,7 +3068,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" + dependencies = [ + "autocfg 1.1.0", +- "num-traits 0.2.15", ++ "num-traits 0.2.17", + ] + + [[package]] +@@ -3069,7 +3079,7 @@ checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" + dependencies = [ + "autocfg 1.1.0", + "num-integer", +- "num-traits 0.2.15", ++ "num-traits 0.2.17", + ] + + [[package]] +@@ -3078,42 +3088,42 @@ version = "0.1.43" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" + dependencies = [ +- "num-traits 0.2.15", ++ "num-traits 0.2.17", + ] + + [[package]] + name = "num-traits" +-version = "0.2.15" ++version = "0.2.17" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" ++checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" + dependencies = [ + "autocfg 1.1.0", + ] + + [[package]] + name = "num_cpus" +-version = "1.15.0" ++version = "1.16.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" ++checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" + dependencies = [ +- "hermit-abi 0.2.6", ++ "hermit-abi 0.3.3", + "libc", + ] + + [[package]] + name = "object" +-version = "0.30.1" ++version = "0.32.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8d864c91689fdc196779b98dba0aceac6118594c2df6ee5d943eb6a8df4d107a" ++checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" + dependencies = [ + "memchr", + ] + + [[package]] + name = "once_cell" +-version = "1.17.0" ++version = "1.18.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" ++checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + + [[package]] + name = "onig" +@@ -3145,11 +3155,11 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" + + [[package]] + name = "openssl" +-version = "0.10.45" ++version = "0.10.60" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1" ++checksum = "79a4c6c3a2b158f7f8f2a2fc5a969fa3a068df6fc9dbb4a43845436e3af7c800" + dependencies = [ +- "bitflags 1.3.2", ++ "bitflags 2.4.1", + "cfg-if 1.0.0", + "foreign-types", + "libc", +@@ -3160,13 +3170,13 @@ dependencies = [ + + [[package]] + name = "openssl-macros" +-version = "0.1.0" ++version = "0.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" ++checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" + dependencies = [ +- "proc-macro2 1.0.49", +- "quote 1.0.23", +- "syn 1.0.107", ++ "proc-macro2 1.0.70", ++ "quote 1.0.33", ++ "syn 2.0.39", + ] + + [[package]] +@@ -3177,11 +3187,10 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + + [[package]] + name = "openssl-sys" +-version = "0.9.80" ++version = "0.9.96" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7" ++checksum = "3812c071ba60da8b5677cc12bcb1d42989a65553772897a7e0355545a819838f" + dependencies = [ +- "autocfg 1.1.0", + "cc", + "libc", + "pkg-config", +@@ -3239,8 +3248,8 @@ version = "0.12.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" + dependencies = [ +- "lock_api 0.4.9", +- "parking_lot_core 0.9.5", ++ "lock_api 0.4.11", ++ "parking_lot_core 0.9.9", + ] + + [[package]] +@@ -3260,15 +3269,15 @@ dependencies = [ + + [[package]] + name = "parking_lot_core" +-version = "0.9.5" ++version = "0.9.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba" ++checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" + dependencies = [ + "cfg-if 1.0.0", + "libc", +- "redox_syscall 0.2.16", +- "smallvec 1.10.0", +- "windows-sys 0.42.0", ++ "redox_syscall 0.4.1", ++ "smallvec 1.11.2", ++ "windows-targets 0.48.5", + ] + + [[package]] +@@ -3301,9 +3310,9 @@ checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" + + [[package]] + name = "percent-encoding" +-version = "2.2.0" ++version = "2.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" ++checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + + [[package]] + name = "phf" +@@ -3345,22 +3354,22 @@ dependencies = [ + + [[package]] + name = "pin-project" +-version = "1.0.12" ++version = "1.1.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" ++checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" + dependencies = [ + "pin-project-internal", + ] + + [[package]] + name = "pin-project-internal" +-version = "1.0.12" ++version = "1.1.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" ++checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" + dependencies = [ +- "proc-macro2 1.0.49", +- "quote 1.0.23", +- "syn 1.0.107", ++ "proc-macro2 1.0.70", ++ "quote 1.0.33", ++ "syn 2.0.39", + ] + + [[package]] +@@ -3371,9 +3380,9 @@ checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" + + [[package]] + name = "pin-project-lite" +-version = "0.2.9" ++version = "0.2.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" ++checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + + [[package]] + name = "pin-utils" +@@ -3383,22 +3392,22 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + + [[package]] + name = "pkg-config" +-version = "0.3.26" ++version = "0.3.27" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" ++checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + + [[package]] + name = "plist" +-version = "1.3.1" ++version = "1.6.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bd39bc6cdc9355ad1dc5eeedefee696bb35c34caf21768741e81826c0bbd7225" ++checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef" + dependencies = [ +- "base64 0.13.1", +- "indexmap", ++ "base64 0.21.5", ++ "indexmap 2.1.0", + "line-wrap", +- "serde 1.0.152", +- "time 0.3.17", +- "xml-rs", ++ "quick-xml 0.31.0", ++ "serde 1.0.193", ++ "time 0.3.30", + ] + + [[package]] +@@ -3430,7 +3439,7 @@ dependencies = [ + "rsass", + "ructe", + "scheduled-thread-pool", +- "serde 1.0.152", ++ "serde 1.0.193", + "serde_json", + "shrinkwraprs", + "tracing", +@@ -3443,7 +3452,7 @@ dependencies = [ + name = "plume-api" + version = "0.7.2" + dependencies = [ +- "serde 1.0.152", ++ "serde 1.0.193", + "serde_derive", + ] + +@@ -3470,22 +3479,22 @@ dependencies = [ + "base64 0.13.1", + "chrono", + "flume", +- "futures 0.3.25", ++ "futures 0.3.29", + "hex", + "once_cell", + "openssl", + "pulldown-cmark", +- "regex-syntax 0.6.28", +- "reqwest 0.11.13", ++ "regex-syntax 0.6.29", ++ "reqwest 0.11.22", + "rocket", +- "serde 1.0.152", ++ "serde 1.0.193", + "serde_derive", + "serde_json", + "shrinkwraprs", + "syntect", +- "tokio 1.24.1", ++ "tokio 1.34.0", + "tracing", +- "url 2.3.1", ++ "url 2.5.0", + ] + + [[package]] +@@ -3498,7 +3507,7 @@ dependencies = [ + "gettext-utils", + "js-sys", + "lazy_static", +- "serde 1.0.152", ++ "serde 1.0.193", + "serde_derive", + "serde_json", + "wasm-bindgen", +@@ -3540,19 +3549,19 @@ dependencies = [ + "plume-api", + "plume-common", + "plume-macro", +- "reqwest 0.11.13", ++ "reqwest 0.11.22", + "riker", + "rocket", + "rocket_i18n", + "rust-s3", + "scheduled-thread-pool", +- "serde 1.0.152", ++ "serde 1.0.193", + "serde_derive", + "serde_json", + "shrinkwraprs", + "tantivy 0.13.3", + "tracing", +- "url 2.3.1", ++ "url 2.5.0", + "walkdir", + "webfinger", + "whatlang", +@@ -3569,6 +3578,12 @@ dependencies = [ + "universal-hash", + ] + ++[[package]] ++name = "powerfmt" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" ++ + [[package]] + name = "ppv-lite86" + version = "0.2.17" +@@ -3577,9 +3592,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + + [[package]] + name = "pq-sys" +-version = "0.4.7" ++version = "0.4.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3b845d6d8ec554f972a2c5298aad68953fd64e7441e846075450b44656a016d1" ++checksum = "31c0052426df997c0cbd30789eb44ca097e3541717a7b8fa36b1c464ee7edebd" + dependencies = [ + "vcpkg", + ] +@@ -3597,9 +3612,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" + dependencies = [ + "proc-macro-error-attr", +- "proc-macro2 1.0.49", +- "quote 1.0.23", +- "syn 1.0.107", ++ "proc-macro2 1.0.70", ++ "quote 1.0.33", ++ "syn 1.0.109", + "version_check 0.9.4", + ] + +@@ -3609,8 +3624,8 @@ version = "1.0.4" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" + dependencies = [ +- "proc-macro2 1.0.49", +- "quote 1.0.23", ++ "proc-macro2 1.0.70", ++ "quote 1.0.33", + "version_check 0.9.4", + ] + +@@ -3623,12 +3638,6 @@ dependencies = [ + "proc-macro-hack-impl", + ] + +-[[package]] +-name = "proc-macro-hack" +-version = "0.5.20+deprecated" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" +- + [[package]] + name = "proc-macro-hack-impl" + version = "0.4.3" +@@ -3655,9 +3664,9 @@ dependencies = [ + + [[package]] + name = "proc-macro2" +-version = "1.0.49" ++version = "1.0.70" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" ++checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" + dependencies = [ + "unicode-ident", + ] +@@ -3669,7 +3678,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "95b4ce31ff0a27d93c8de1849cf58162283752f065a90d508f1105fa6c9a213f" + dependencies = [ + "idna 0.2.3", +- "url 2.3.1", ++ "url 2.5.0", + ] + + [[package]] +@@ -3679,7 +3688,7 @@ source = "git+https://git.joinplu.me/Plume/pulldown-cmark?branch=bidi-plume#5851 + dependencies = [ + "bitflags 1.3.2", + "memchr", +- "unicase 2.6.0", ++ "unicase 2.7.0", + ] + + [[package]] +@@ -3695,19 +3704,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "7f50b1c63b38611e7d4d7f68b82d3ad0cc71a2ad2e7f61fc10f1328d917c93cd" + dependencies = [ + "memchr", +- "serde 1.0.152", ++ "serde 1.0.193", + ] + + [[package]] + name = "quick-xml" +-version = "0.27.1" ++version = "0.30.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ffc053f057dd768a56f62cd7e434c42c831d296968997e9ac1f76ea7c2d14c41" ++checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" + dependencies = [ + "encoding_rs", + "memchr", + ] + ++[[package]] ++name = "quick-xml" ++version = "0.31.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" ++dependencies = [ ++ "memchr", ++] ++ + [[package]] + name = "quote" + version = "0.4.2" +@@ -3728,11 +3746,11 @@ dependencies = [ + + [[package]] + name = "quote" +-version = "1.0.23" ++version = "1.0.33" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" ++checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" + dependencies = [ +- "proc-macro2 1.0.49", ++ "proc-macro2 1.0.70", + ] + + [[package]] +@@ -3741,7 +3759,7 @@ version = "0.8.10" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93" + dependencies = [ +- "log 0.4.17", ++ "log 0.4.20", + "parking_lot 0.12.1", + "scheduled-thread-pool", + ] +@@ -3862,7 +3880,7 @@ version = "0.6.4" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" + dependencies = [ +- "getrandom 0.2.8", ++ "getrandom 0.2.11", + ] + + [[package]] +@@ -3938,24 +3956,22 @@ dependencies = [ + + [[package]] + name = "rayon" +-version = "1.6.1" ++version = "1.8.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" ++checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" + dependencies = [ +- "either 1.8.0", ++ "either 1.9.0", + "rayon-core", + ] + + [[package]] + name = "rayon-core" +-version = "1.10.1" ++version = "1.12.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3" ++checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" + dependencies = [ +- "crossbeam-channel 0.5.6", +- "crossbeam-deque 0.8.2", +- "crossbeam-utils 0.8.14", +- "num_cpus", ++ "crossbeam-deque 0.8.3", ++ "crossbeam-utils 0.8.16", + ] + + [[package]] +@@ -3975,33 +3991,54 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" + + [[package]] + name = "redox_syscall" +-version = "0.2.16" ++version = "0.3.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" ++checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" ++dependencies = [ ++ "bitflags 1.3.2", ++] ++ ++[[package]] ++name = "redox_syscall" ++version = "0.4.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" + dependencies = [ + "bitflags 1.3.2", + ] + + [[package]] + name = "redox_users" +-version = "0.4.3" ++version = "0.4.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" ++checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" + dependencies = [ +- "getrandom 0.2.8", +- "redox_syscall 0.2.16", ++ "getrandom 0.2.11", ++ "libredox", + "thiserror", + ] [[package]] name = "regex" --version = "1.5.5" -+version = "1.5.6" +-version = "1.7.0" ++version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" -+checksum = "d83f127d94bdbcda4c8cc2e50f6f84f4b611f69c902699ca385a39c3a75f9ff1" +-checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" ++checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", -@@ -3816,7 +3801,7 @@ dependencies = [ - "serde 1.0.137", +- "regex-syntax 0.6.28", ++ "regex-automata", ++ "regex-syntax 0.8.2", ++] ++ ++[[package]] ++name = "regex-automata" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" ++dependencies = [ ++ "aho-corasick", ++ "memchr", ++ "regex-syntax 0.8.2", + ] + + [[package]] +@@ -4012,9 +4049,15 @@ checksum = "8e931c58b93d86f080c734bfd2bce7dd0079ae2331235818133c8be7f422e20e" + + [[package]] + name = "regex-syntax" +-version = "0.6.28" ++version = "0.6.29" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" ++checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" ++ ++[[package]] ++name = "regex-syntax" ++version = "0.8.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + + [[package]] + name = "remove_dir_all" +@@ -4041,11 +4084,11 @@ dependencies = [ + "http 0.1.21", + "hyper 0.12.36", + "hyper-tls 0.3.2", +- "log 0.4.17", +- "mime 0.3.16", ++ "log 0.4.20", ++ "mime 0.3.17", + "mime_guess", + "native-tls", +- "serde 1.0.152", ++ "serde 1.0.193", "serde_json", "serde_urlencoded 0.5.5", -- "time 0.1.43", -+ "time 0.1.44", - "tokio 0.1.22", - "tokio-executor", - "tokio-io", -@@ -3838,7 +3823,7 @@ dependencies = [ + "time 0.1.45", +@@ -4070,24 +4113,24 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", -- "http 0.2.7", -+ "http 0.2.8", +- "http 0.2.8", ++ "http 0.2.11", "http-body 0.3.1", "hyper 0.13.10", "hyper-tls 0.4.3", -@@ -3874,9 +3859,9 @@ dependencies = [ + "ipnet", + "js-sys", + "lazy_static", +- "log 0.4.17", +- "mime 0.3.16", ++ "log 0.4.20", ++ "mime 0.3.17", + "mime_guess", + "native-tls", +- "percent-encoding 2.2.0", +- "pin-project-lite 0.2.9", +- "serde 1.0.152", ++ "percent-encoding 2.3.1", ++ "pin-project-lite 0.2.13", ++ "serde 1.0.193", + "serde_urlencoded 0.7.1", + "tokio 0.2.25", + "tokio-tls", +- "url 2.3.1", ++ "url 2.5.0", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +@@ -4096,41 +4139,43 @@ dependencies = [ + + [[package]] + name = "reqwest" +-version = "0.11.13" ++version = "0.11.22" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c" ++checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" + dependencies = [ +- "base64 0.13.1", +- "bytes 1.3.0", ++ "base64 0.21.5", ++ "bytes 1.5.0", + "encoding_rs", "futures-core", "futures-util", - "h2 0.3.13", -- "http 0.2.7", -- "http-body 0.4.4", -- "hyper 0.14.18", -+ "http 0.2.8", -+ "http-body 0.4.5", -+ "hyper 0.14.19", +- "h2 0.3.15", +- "http 0.2.8", ++ "h2 0.3.22", ++ "http 0.2.11", + "http-body 0.4.5", +- "hyper 0.14.23", ++ "hyper 0.14.27", "hyper-tls 0.5.0", "ipnet", "js-sys", -@@ -3959,7 +3944,7 @@ dependencies = [ - "rocket_codegen", +- "log 0.4.17", +- "mime 0.3.16", ++ "log 0.4.20", ++ "mime 0.3.17", + "native-tls", + "once_cell", +- "percent-encoding 2.2.0", +- "pin-project-lite 0.2.9", +- "serde 1.0.152", ++ "percent-encoding 2.3.1", ++ "pin-project-lite 0.2.13", ++ "serde 1.0.193", + "serde_json", + "serde_urlencoded 0.7.1", +- "tokio 1.24.1", ++ "system-configuration", ++ "tokio 1.34.0", + "tokio-native-tls", + "tokio-socks", +- "tokio-util 0.7.4", ++ "tokio-util 0.7.10", + "tower-service", +- "url 2.3.1", ++ "url 2.5.0", + "wasm-bindgen", + "wasm-bindgen-futures", ++ "wasm-streams", + "web-sys", +- "winreg 0.10.1", ++ "winreg 0.50.0", + ] + + [[package]] +@@ -4142,7 +4187,7 @@ dependencies = [ + "chrono", + "config", + "dashmap", +- "futures 0.3.25", ++ "futures 0.3.29", + "num_cpus", + "pin-utils", + "rand 0.7.3", +@@ -4188,7 +4233,7 @@ checksum = "83b9d9dc08c5dcc1d8126a9dd615545e6a358f8c13c883c8dfed8c0376fa355e" + dependencies = [ + "atty", + "base64 0.13.1", +- "log 0.4.17", ++ "log 0.4.20", + "memchr", + "num_cpus", + "pear", +@@ -4209,7 +4254,7 @@ checksum = "2810037b5820098af97bd4fdd309e76a8101ceb178147de775c835a2537284fe" + dependencies = [ + "devise", + "glob", +- "indexmap", ++ "indexmap 1.9.3", + "quote 0.6.13", "rocket_http", - "state", -- "time 0.1.43", -+ "time 0.1.44", - "toml 0.4.10", "version_check 0.9.4", - "yansi", -@@ -4002,7 +3987,7 @@ dependencies = [ +@@ -4222,10 +4267,10 @@ version = "0.4.11" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "e20efbc6a211cb3df5375accf532d4186f224b623f39eca650b19b96240c596b" + dependencies = [ +- "log 0.4.17", ++ "log 0.4.20", + "notify", + "rocket", +- "serde 1.0.152", ++ "serde 1.0.193", + "serde_json", + ] + +@@ -4237,7 +4282,7 @@ dependencies = [ + "data-encoding", "ring", "rocket", - "serde 1.0.137", -- "time 0.1.43", -+ "time 0.1.44", +- "serde 1.0.152", ++ "serde 1.0.193", + "time 0.1.45", ] - [[package]] -@@ -4018,7 +4003,7 @@ dependencies = [ - "percent-encoding 1.0.1", - "smallvec 1.8.0", - "state", -- "time 0.1.43", -+ "time 0.1.44", - "unicode-xid 0.1.0", - ] - -@@ -4046,9 +4031,9 @@ dependencies = [ - - [[package]] - name = "rsass" --version = "0.25.0" -+version = "0.25.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c0a591e01b92182a881aa6d89df6e56c6923a6589662c0194921466024d7d78b" -+checksum = "0ab003a9ff922b4d7b1f5f383bc54645887ad278f534dfc65e071096fcb30023" +@@ -4249,10 +4294,10 @@ checksum = "2bf9cbd128e1f321a2d0bebd2b7cf0aafd89ca43edf69e49b56a5c46e48eb19f" dependencies = [ - "fastrand", + "cookie 0.11.5", + "hyper 0.10.16", +- "indexmap", ++ "indexmap 1.9.3", + "pear", + "percent-encoding 1.0.1", +- "smallvec 1.10.0", ++ "smallvec 1.11.2", + "state", + "time 0.1.45", + "unicode-xid 0.1.0", +@@ -4275,7 +4320,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "2bf099a1888612545b683d2661a1940089f6c2e5a8e38979b2159da876bfd956" + dependencies = [ + "libc", +- "serde 1.0.152", ++ "serde 1.0.193", + "serde_json", + "winapi 0.3.9", + ] +@@ -4287,14 +4332,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "665387d3be91521de331a04cc7118c8c129ffe43c5f4e8a61e78990850046b5a" + dependencies = [ + "arc-swap", +- "fastrand", ++ "fastrand 1.9.0", "lazy_static", -@@ -4107,9 +4092,9 @@ dependencies = [ +- "nom 7.1.2", ++ "nom 7.1.3", + "nom_locate", + "num-bigint", + "num-integer", + "num-rational", +- "num-traits 0.2.15", ++ "num-traits 0.2.17", + "tracing", + ] + +@@ -4308,7 +4353,7 @@ dependencies = [ + "bytecount", + "itertools 0.10.5", + "md5", +- "nom 7.1.2", ++ "nom 7.1.3", + ] + + [[package]] +@@ -4338,27 +4383,27 @@ dependencies = [ + "aws-region", + "base64 0.13.1", + "block_on_proc", +- "bytes 1.3.0", ++ "bytes 1.5.0", + "cfg-if 1.0.0", +- "futures 0.3.25", ++ "futures 0.3.29", + "hex", + "hmac 0.12.1", +- "http 0.2.8", +- "log 0.4.17", ++ "http 0.2.11", ++ "log 0.4.20", + "maybe-async", + "md5", + "minidom", +- "percent-encoding 2.2.0", ++ "percent-encoding 2.3.1", + "quick-xml 0.26.0", +- "reqwest 0.11.13", +- "serde 1.0.152", ++ "reqwest 0.11.22", ++ "serde 1.0.193", + "serde_derive", +- "sha2 0.10.6", ++ "sha2 0.10.8", + "thiserror", +- "time 0.3.17", +- "tokio 1.24.1", ++ "time 0.3.30", ++ "tokio 1.34.0", + "tokio-stream", +- "url 2.3.1", ++ "url 2.5.0", + ] + + [[package]] +@@ -4367,15 +4412,15 @@ version = "1.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "e46a2036019fdb888131db7a4c847a1063a7493f971ed94ea82c67eada63ca54" + dependencies = [ +- "serde 1.0.152", ++ "serde 1.0.193", + "serde_derive", + ] + + [[package]] + name = "rustc-demangle" +-version = "0.1.21" ++version = "0.1.23" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" ++checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + + [[package]] + name = "rustc_version" +@@ -4386,30 +4431,41 @@ dependencies = [ + "semver", + ] + ++[[package]] ++name = "rustix" ++version = "0.38.25" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e" ++dependencies = [ ++ "bitflags 2.4.1", ++ "errno", ++ "libc", ++ "linux-raw-sys", ++ "windows-sys 0.48.0", ++] ++ + [[package]] + name = "rxml" +-version = "0.8.2" ++version = "0.9.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1a071866b8c681dc2cfffa77184adc32b57b0caad4e620b6292609703bceb804" ++checksum = "a98f186c7a2f3abbffb802984b7f1dfd65dac8be1aafdaabbca4137f53f0dff7" + dependencies = [ +- "bytes 1.3.0", +- "pin-project-lite 0.2.9", ++ "bytes 1.5.0", + "rxml_validation", + "smartstring", +- "tokio 1.24.1", + ] + + [[package]] + name = "rxml_validation" +-version = "0.8.2" ++version = "0.9.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "53bc79743f9a66c2fb1f951cd83735f275d46bfe466259fbc5897bb60a0d00ee" ++checksum = "22a197350ece202f19a166d1ad6d9d6de145e1d2a8ef47db299abe164dbd7530" [[package]] name = "ryu" --version = "1.0.9" -+version = "1.0.10" +-version = "1.0.12" ++version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" -+checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695" +-checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" ++checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "safemem" -@@ -4128,12 +4113,12 @@ dependencies = [ +@@ -4428,40 +4484,33 @@ dependencies = [ [[package]] name = "schannel" --version = "0.1.19" -+version = "0.1.20" +-version = "0.1.20" ++version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" -+checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" +-checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" ++checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "lazy_static", -- "winapi 0.3.9", -+ "windows-sys", +- "lazy_static", +- "windows-sys 0.36.1", ++ "windows-sys 0.48.0", ] [[package]] -@@ -4142,7 +4127,7 @@ version = "0.2.6" + name = "scheduled-thread-pool" +-version = "0.2.6" ++version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "977a7519bff143a44f842fd07e80ad1329295bd71686457f18e496736f4bf9bf" +-checksum = "977a7519bff143a44f842fd07e80ad1329295bd71686457f18e496736f4bf9bf" ++checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19" dependencies = [ -- "parking_lot 0.12.0", -+ "parking_lot 0.12.1", + "parking_lot 0.12.1", ] [[package]] -@@ -4223,9 +4208,9 @@ version = "1.0.137" + name = "scopeguard" +-version = "1.1.0" ++version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be" +-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +- +-[[package]] +-name = "scratch" +-version = "1.0.3" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" ++checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + + [[package]] + name = "security-framework" +-version = "2.7.0" ++version = "2.9.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" ++checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ -- "proc-macro2 1.0.37", -- "quote 1.0.18", -- "syn 1.0.92", -+ "proc-macro2 1.0.39", -+ "quote 1.0.19", -+ "syn 1.0.98", + "bitflags 1.3.2", + "core-foundation", +@@ -4472,9 +4521,9 @@ dependencies = [ + + [[package]] + name = "security-framework-sys" +-version = "2.6.1" ++version = "2.9.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" ++checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" + dependencies = [ + "core-foundation-sys", + "libc", +@@ -4503,9 +4552,9 @@ checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8" + + [[package]] + name = "serde" +-version = "1.0.152" ++version = "1.0.193" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" ++checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" + dependencies = [ + "serde_derive", + ] +@@ -4525,24 +4574,24 @@ dependencies = [ + + [[package]] + name = "serde_derive" +-version = "1.0.152" ++version = "1.0.193" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" ++checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" + dependencies = [ +- "proc-macro2 1.0.49", +- "quote 1.0.23", +- "syn 1.0.107", ++ "proc-macro2 1.0.70", ++ "quote 1.0.33", ++ "syn 2.0.39", ] [[package]] -@@ -4234,7 +4219,7 @@ version = "1.0.81" + name = "serde_json" +-version = "1.0.91" ++version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c" +-checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" ++checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ -- "itoa 1.0.1", -+ "itoa 1.0.2", +- "itoa 1.0.5", ++ "itoa 1.0.9", "ryu", - "serde 1.0.137", +- "serde 1.0.152", ++ "serde 1.0.193", ] -@@ -4267,7 +4252,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + + [[package]] +@@ -4562,7 +4611,7 @@ checksum = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a" + dependencies = [ + "dtoa", + "itoa 0.4.8", +- "serde 1.0.152", ++ "serde 1.0.193", + "url 1.7.2", + ] + +@@ -4573,9 +4622,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", -- "itoa 1.0.1", -+ "itoa 1.0.2", +- "itoa 1.0.5", ++ "itoa 1.0.9", "ryu", - "serde 1.0.137", +- "serde 1.0.152", ++ "serde 1.0.193", ] -@@ -4302,9 +4287,9 @@ checksum = "e63e6744142336dfb606fe2b068afa2e1cca1ee6a5d8377277a92945d81fa331" + + [[package]] +@@ -4593,20 +4642,20 @@ dependencies = [ + + [[package]] + name = "sha2" +-version = "0.10.6" ++version = "0.10.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" ++checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" + dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", +- "digest 0.10.6", ++ "digest 0.10.7", + ] + + [[package]] + name = "sharded-slab" +-version = "0.1.4" ++version = "0.1.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" ++checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" + dependencies = [ + "lazy_static", + ] +@@ -4619,31 +4668,31 @@ checksum = "e63e6744142336dfb606fe2b068afa2e1cca1ee6a5d8377277a92945d81fa331" dependencies = [ "bitflags 1.3.2", "itertools 0.8.2", -- "proc-macro2 1.0.37", -- "quote 1.0.18", -- "syn 1.0.92", -+ "proc-macro2 1.0.39", -+ "quote 1.0.19", -+ "syn 1.0.98", +- "proc-macro2 1.0.49", +- "quote 1.0.23", +- "syn 1.0.107", ++ "proc-macro2 1.0.70", ++ "quote 1.0.33", ++ "syn 1.0.109", ] [[package]] -@@ -4442,7 +4427,7 @@ checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08" + name = "signal-hook-registry" +-version = "1.4.0" ++version = "1.4.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" ++checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" + dependencies = [ + "libc", + ] + + [[package]] + name = "siphasher" +-version = "0.3.10" ++version = "0.3.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" ++checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + + [[package]] + name = "slab" +-version = "0.4.7" ++version = "0.4.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" ++checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" + dependencies = [ + "autocfg 1.1.0", + ] +@@ -4671,7 +4720,7 @@ version = "4.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "6706b2ace5bbae7291d3f8d2473e2bfab073ccd7d03670946197aec98471fa3e" + dependencies = [ +- "log 0.4.17", ++ "log 0.4.20", + "slog", + "slog-scope", + ] +@@ -4687,17 +4736,19 @@ dependencies = [ + + [[package]] + name = "smallvec" +-version = "1.10.0" ++version = "1.11.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" ++checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" + + [[package]] + name = "smartstring" +-version = "0.2.10" ++version = "1.0.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e714dff2b33f2321fdcd475b71cec79781a692d846f37f415fb395a1d2bcd48e" ++checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" + dependencies = [ ++ "autocfg 1.1.0", + "static_assertions", ++ "version_check 0.9.4", + ] + + [[package]] +@@ -4719,14 +4770,24 @@ dependencies = [ + + [[package]] + name = "socket2" +-version = "0.4.7" ++version = "0.4.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" ++checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" + dependencies = [ + "libc", + "winapi 0.3.9", + ] + ++[[package]] ++name = "socket2" ++version = "0.5.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" ++dependencies = [ ++ "libc", ++ "windows-sys 0.48.0", ++] ++ + [[package]] + name = "spin" + version = "0.5.2" +@@ -4735,11 +4796,11 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + + [[package]] + name = "spin" +-version = "0.9.4" ++version = "0.9.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09" ++checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + dependencies = [ +- "lock_api 0.4.9", ++ "lock_api 0.4.11", + ] + + [[package]] +@@ -4771,16 +4832,16 @@ dependencies = [ + + [[package]] + name = "string_cache" +-version = "0.8.4" ++version = "0.8.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08" ++checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" dependencies = [ "new_debug_unreachable", "once_cell", -- "parking_lot 0.12.0", -+ "parking_lot 0.12.1", + "parking_lot 0.12.1", "phf_shared", "precomputed-hash", - "serde 1.0.137", -@@ -4456,8 +4441,8 @@ checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" +- "serde 1.0.152", ++ "serde 1.0.193", + ] + + [[package]] +@@ -4791,8 +4852,8 @@ checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" dependencies = [ "phf_generator", "phf_shared", -- "proc-macro2 1.0.37", -- "quote 1.0.18", -+ "proc-macro2 1.0.39", -+ "quote 1.0.19", +- "proc-macro2 1.0.49", +- "quote 1.0.23", ++ "proc-macro2 1.0.70", ++ "quote 1.0.33", ] [[package]] -@@ -4513,13 +4498,13 @@ dependencies = [ +@@ -4824,17 +4885,6 @@ dependencies = [ + "unicode-xid 0.1.0", + ] + +-[[package]] +-name = "syn" +-version = "0.14.9" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "261ae9ecaa397c42b960649561949d69311f08eeaea86a65696e6e46517cf741" +-dependencies = [ +- "proc-macro2 0.4.30", +- "quote 0.6.13", +- "unicode-xid 0.1.0", +-] +- + [[package]] + name = "syn" + version = "0.15.44" +@@ -4848,12 +4898,23 @@ dependencies = [ [[package]] name = "syn" --version = "1.0.92" -+version = "1.0.98" +-version = "1.0.107" ++version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7ff7c592601f11445996a06f8ad0c27f094a58857c2f89e97974ab9235b92c52" -+checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" +-checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" ++checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ -- "proc-macro2 1.0.37", -- "quote 1.0.18", -- "unicode-xid 0.2.3", -+ "proc-macro2 1.0.39", -+ "quote 1.0.19", +- "proc-macro2 1.0.49", +- "quote 1.0.23", ++ "proc-macro2 1.0.70", ++ "quote 1.0.33", + "unicode-ident", ++] ++ ++[[package]] ++name = "syn" ++version = "2.0.39" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" ++dependencies = [ ++ "proc-macro2 1.0.70", ++ "quote 1.0.33", + "unicode-ident", ] - [[package]] -@@ -4528,9 +4513,9 @@ version = "0.12.6" +@@ -4863,9 +4924,9 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ -- "proc-macro2 1.0.37", -- "quote 1.0.18", -- "syn 1.0.92", -+ "proc-macro2 1.0.39", -+ "quote 1.0.19", -+ "syn 1.0.98", - "unicode-xid 0.2.3", +- "proc-macro2 1.0.49", +- "quote 1.0.23", +- "syn 1.0.107", ++ "proc-macro2 1.0.70", ++ "quote 1.0.33", ++ "syn 1.0.109", + "unicode-xid 0.2.4", ] -@@ -4742,9 +4727,9 @@ version = "1.0.31" +@@ -4883,14 +4944,35 @@ dependencies = [ + "lazycell", + "onig", + "plist", +- "regex-syntax 0.6.28", +- "serde 1.0.152", ++ "regex-syntax 0.6.29", ++ "serde 1.0.193", + "serde_derive", + "serde_json", + "walkdir", + "yaml-rust", + ] + ++[[package]] ++name = "system-configuration" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" ++dependencies = [ ++ "bitflags 1.3.2", ++ "core-foundation", ++ "system-configuration-sys", ++] ++ ++[[package]] ++name = "system-configuration-sys" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" ++dependencies = [ ++ "core-foundation-sys", ++ "libc", ++] ++ + [[package]] + name = "tantivy" + version = "0.13.3" +@@ -4910,10 +4992,10 @@ dependencies = [ + "failure", + "fnv", + "fs2", +- "futures 0.3.25", ++ "futures 0.3.29", + "htmlescape", + "levenshtein_automata", +- "log 0.4.17", ++ "log 0.4.20", + "memmap", + "murmurhash32", + "notify", +@@ -4924,9 +5006,9 @@ dependencies = [ + "rayon", + "regex", + "rust-stemmers", +- "serde 1.0.152", ++ "serde 1.0.193", + "serde_json", +- "smallvec 1.10.0", ++ "smallvec 1.11.2", + "snap", + "stable_deref_trait", + "tantivy-fst", +@@ -4953,10 +5035,10 @@ dependencies = [ + "fail", + "fnv", + "fs2", +- "futures 0.3.25", ++ "futures 0.3.29", + "htmlescape", + "levenshtein_automata", +- "log 0.4.17", ++ "log 0.4.20", + "lru", + "memmap", + "murmurhash32", +@@ -4965,9 +5047,9 @@ dependencies = [ + "rayon", + "regex", + "rust-stemmers", +- "serde 1.0.152", ++ "serde 1.0.193", + "serde_json", +- "smallvec 1.10.0", ++ "smallvec 1.11.2", + "snap", + "stable_deref_trait", + "tantivy-fst", +@@ -5009,9 +5091,9 @@ dependencies = [ + + [[package]] + name = "tar" +-version = "0.4.38" ++version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" +-checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" ++checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" dependencies = [ -- "proc-macro2 1.0.37", -- "quote 1.0.18", -- "syn 1.0.92", -+ "proc-macro2 1.0.39", -+ "quote 1.0.19", -+ "syn 1.0.98", + "filetime", + "libc", +@@ -5030,16 +5112,15 @@ dependencies = [ + + [[package]] + name = "tempfile" +-version = "3.3.0" ++version = "3.8.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" ++checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" + dependencies = [ + "cfg-if 1.0.0", +- "fastrand", +- "libc", +- "redox_syscall 0.2.16", +- "remove_dir_all", +- "winapi 0.3.9", ++ "fastrand 2.0.1", ++ "redox_syscall 0.4.1", ++ "rustix", ++ "windows-sys 0.48.0", ] [[package]] -@@ -4758,11 +4743,12 @@ dependencies = [ +@@ -5053,15 +5134,6 @@ dependencies = [ + "utf-8", + ] + +-[[package]] +-name = "termcolor" +-version = "1.1.3" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +-dependencies = [ +- "winapi-util", +-] +- + [[package]] + name = "textwrap" + version = "0.11.0" +@@ -5073,30 +5145,31 @@ dependencies = [ + + [[package]] + name = "thiserror" +-version = "1.0.38" ++version = "1.0.50" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" ++checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" + dependencies = [ + "thiserror-impl", + ] + + [[package]] + name = "thiserror-impl" +-version = "1.0.38" ++version = "1.0.50" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" ++checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" + dependencies = [ +- "proc-macro2 1.0.49", +- "quote 1.0.23", +- "syn 1.0.107", ++ "proc-macro2 1.0.70", ++ "quote 1.0.33", ++ "syn 2.0.39", + ] + + [[package]] + name = "thread_local" +-version = "1.1.4" ++version = "1.1.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" ++checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" + dependencies = [ ++ "cfg-if 1.0.0", + "once_cell", + ] + +@@ -5113,27 +5186,29 @@ dependencies = [ [[package]] name = "time" --version = "0.1.43" -+version = "0.1.44" +-version = "0.3.17" ++version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" -+checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +-checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" ++checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ - "libc", -+ "wasi 0.10.0+wasi-snapshot-preview1", - "winapi 0.3.9", +- "itoa 1.0.5", +- "serde 1.0.152", ++ "deranged", ++ "itoa 1.0.9", ++ "powerfmt", ++ "serde 1.0.193", + "time-core", + "time-macros", ] -@@ -4772,7 +4758,7 @@ version = "0.3.9" + [[package]] + name = "time-core" +-version = "0.1.0" ++version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd" +-checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" ++checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.6" ++version = "0.2.15" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" ++checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" dependencies = [ -- "itoa 1.0.1", -+ "itoa 1.0.2", - "libc", - "num_threads", + "time-core", ] -@@ -4853,14 +4839,14 @@ dependencies = [ - "bytes 1.1.0", +@@ -5158,9 +5233,9 @@ dependencies = [ + + [[package]] + name = "tinyvec_macros" +-version = "0.1.0" ++version = "0.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" ++checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + + [[package]] + name = "tokio" +@@ -5207,22 +5282,21 @@ dependencies = [ + + [[package]] + name = "tokio" +-version = "1.24.1" ++version = "1.34.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1d9f76183f91ecfb55e1d7d5602bd1d979e38a3a522fe900241cf195624d67ae" ++checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" + dependencies = [ +- "autocfg 1.1.0", +- "bytes 1.3.0", ++ "backtrace 0.3.69", ++ "bytes 1.5.0", "libc", - "memchr", -- "mio 0.8.2", -+ "mio 0.8.4", +- "memchr", +- "mio 0.8.5", ++ "mio 0.8.9", "num_cpus", - "once_cell", -- "parking_lot 0.12.0", -+ "parking_lot 0.12.1", - "pin-project-lite 0.2.9", + "parking_lot 0.12.1", +- "pin-project-lite 0.2.9", ++ "pin-project-lite 0.2.13", "signal-hook-registry", - "socket2 0.4.4", -- "tokio-macros 1.7.0", -+ "tokio-macros 1.8.0", - "winapi 0.3.9", +- "socket2 0.4.7", +- "tokio-macros 1.8.2", +- "windows-sys 0.42.0", ++ "socket2 0.5.5", ++ "tokio-macros 2.2.0", ++ "windows-sys 0.48.0", ] -@@ -4912,20 +4898,20 @@ version = "0.2.6" + [[package]] +@@ -5232,7 +5306,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46" + dependencies = [ + "bytes 0.4.12", +- "either 1.8.0", ++ "either 1.9.0", + "futures 0.1.31", + ] + +@@ -5264,7 +5338,7 @@ checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674" + dependencies = [ + "bytes 0.4.12", + "futures 0.1.31", +- "log 0.4.17", ++ "log 0.4.20", + ] + + [[package]] +@@ -5273,30 +5347,30 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" dependencies = [ -- "proc-macro2 1.0.37", -- "quote 1.0.18", -- "syn 1.0.92", -+ "proc-macro2 1.0.39", -+ "quote 1.0.19", -+ "syn 1.0.98", +- "proc-macro2 1.0.49", +- "quote 1.0.23", +- "syn 1.0.107", ++ "proc-macro2 1.0.70", ++ "quote 1.0.33", ++ "syn 1.0.109", ] [[package]] name = "tokio-macros" --version = "1.7.0" -+version = "1.8.0" +-version = "1.8.2" ++version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" -+checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" +-checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" ++checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ -- "proc-macro2 1.0.37", -- "quote 1.0.18", -- "syn 1.0.92", -+ "proc-macro2 1.0.39", -+ "quote 1.0.19", -+ "syn 1.0.98", +- "proc-macro2 1.0.49", +- "quote 1.0.23", +- "syn 1.0.107", ++ "proc-macro2 1.0.70", ++ "quote 1.0.33", ++ "syn 2.0.39", ] [[package]] -@@ -4971,9 +4957,9 @@ dependencies = [ + name = "tokio-native-tls" +-version = "0.3.0" ++version = "0.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" ++checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" + dependencies = [ + "native-tls", +- "tokio 1.24.1", ++ "tokio 1.34.0", + ] + + [[package]] +@@ -5308,7 +5382,7 @@ dependencies = [ + "crossbeam-utils 0.7.2", + "futures 0.1.31", + "lazy_static", +- "log 0.4.17", ++ "log 0.4.20", + "mio 0.6.23", + "num_cpus", + "parking_lot 0.9.0", +@@ -5324,21 +5398,21 @@ version = "0.5.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0" + dependencies = [ +- "either 1.8.0", ++ "either 1.9.0", + "futures-util", + "thiserror", +- "tokio 1.24.1", ++ "tokio 1.34.0", + ] [[package]] name = "tokio-stream" --version = "0.1.8" -+version = "0.1.9" +-version = "0.1.11" ++version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3" -+checksum = "df54d54117d6fdc4e4fea40fe1e4e566b3505700e148a6827e59b34b0d2600d9" +-checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce" ++checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" dependencies = [ "futures-core", - "pin-project-lite 0.2.9", -@@ -5059,9 +5045,9 @@ dependencies = [ +- "pin-project-lite 0.2.9", +- "tokio 1.24.1", ++ "pin-project-lite 0.2.13", ++ "tokio 1.34.0", + ] + + [[package]] +@@ -5376,7 +5450,7 @@ dependencies = [ + "crossbeam-utils 0.7.2", + "futures 0.1.31", + "lazy_static", +- "log 0.4.17", ++ "log 0.4.20", + "num_cpus", + "slab", + "tokio-executor", +@@ -5413,22 +5487,22 @@ dependencies = [ + "bytes 0.5.6", + "futures-core", + "futures-sink", +- "log 0.4.17", ++ "log 0.4.20", + "pin-project-lite 0.1.12", + "tokio 0.2.25", + ] [[package]] name = "tokio-util" --version = "0.7.1" -+version = "0.7.3" +-version = "0.7.4" ++version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764" -+checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45" +-checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" ++checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" dependencies = [ - "bytes 1.1.0", +- "bytes 1.3.0", ++ "bytes 1.5.0", "futures-core", -@@ -5091,9 +5077,9 @@ dependencies = [ + "futures-sink", +- "pin-project-lite 0.2.9", +- "tokio 1.24.1", ++ "pin-project-lite 0.2.13", ++ "tokio 1.34.0", + "tracing", + ] + +@@ -5438,16 +5512,16 @@ version = "0.4.10" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" + dependencies = [ +- "serde 1.0.152", ++ "serde 1.0.193", + ] [[package]] - name = "tower-service" --version = "0.3.1" -+version = "0.3.2" + name = "toml" +-version = "0.5.10" ++version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" -+checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +-checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f" ++checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" + dependencies = [ +- "serde 1.0.152", ++ "serde 1.0.193", + ] + + [[package]] +@@ -5458,33 +5532,32 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -@@ -5114,9 +5100,9 @@ version = "0.1.21" +-version = "0.1.37" ++version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "cc6b8ad3567499f98a1db7a752b07a7c8c7c7c34c332ec00effb2b0027974b7c" +-checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" ++checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ -- "proc-macro2 1.0.37", -- "quote 1.0.18", -- "syn 1.0.92", -+ "proc-macro2 1.0.39", -+ "quote 1.0.19", -+ "syn 1.0.98", +- "cfg-if 1.0.0", +- "log 0.4.17", +- "pin-project-lite 0.2.9", ++ "log 0.4.20", ++ "pin-project-lite 0.2.13", + "tracing-attributes", + "tracing-core", ] [[package]] -@@ -5230,6 +5216,12 @@ version = "0.3.8" + name = "tracing-attributes" +-version = "0.1.23" ++version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" +-checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" ++checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" + dependencies = [ +- "proc-macro2 1.0.49", +- "quote 1.0.23", +- "syn 1.0.107", ++ "proc-macro2 1.0.70", ++ "quote 1.0.33", ++ "syn 2.0.39", + ] + + [[package]] + name = "tracing-core" +-version = "0.1.30" ++version = "0.1.32" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" ++checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" + dependencies = [ + "once_cell", + "valuable", +@@ -5502,24 +5575,24 @@ dependencies = [ + + [[package]] + name = "tracing-log" +-version = "0.1.3" ++version = "0.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" ++checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" + dependencies = [ +- "lazy_static", +- "log 0.4.17", ++ "log 0.4.20", ++ "once_cell", + "tracing-core", + ] + + [[package]] + name = "tracing-subscriber" +-version = "0.3.16" ++version = "0.3.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" ++checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" + dependencies = [ + "nu-ansi-term", + "sharded-slab", +- "smallvec 1.10.0", ++ "smallvec 1.11.2", + "thread_local", + "tracing-core", + "tracing-log", +@@ -5533,9 +5606,9 @@ checksum = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" + + [[package]] + name = "try-lock" +-version = "0.2.3" ++version = "0.2.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" ++checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" + + [[package]] + name = "try_from" +@@ -5563,9 +5636,9 @@ checksum = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887" + + [[package]] + name = "typenum" +-version = "1.16.0" ++version = "1.17.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" ++checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + + [[package]] + name = "unicase" +@@ -5578,24 +5651,24 @@ dependencies = [ + + [[package]] + name = "unicase" +-version = "2.6.0" ++version = "2.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" ++checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" + dependencies = [ + "version_check 0.9.4", + ] + + [[package]] + name = "unicode-bidi" +-version = "0.3.8" ++version = "0.3.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" ++checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + + [[package]] + name = "unicode-ident" +-version = "1.0.6" ++version = "1.0.12" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" ++checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" -+[[package]] -+name = "unicode-ident" -+version = "1.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c" -+ [[package]] name = "unicode-normalization" - version = "0.1.19" -@@ -5323,7 +5315,7 @@ version = "0.8.2" +@@ -5608,9 +5681,9 @@ dependencies = [ + + [[package]] + name = "unicode-width" +-version = "0.1.10" ++version = "0.1.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" ++checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + + [[package]] + name = "unicode-xid" +@@ -5653,13 +5726,13 @@ dependencies = [ + + [[package]] + name = "url" +-version = "2.3.1" ++version = "2.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" ++checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" + dependencies = [ + "form_urlencoded", +- "idna 0.3.0", +- "percent-encoding 2.2.0", ++ "idna 0.5.0", ++ "percent-encoding 2.3.1", + ] + + [[package]] +@@ -5689,8 +5762,8 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ -- "getrandom 0.2.6", -+ "getrandom 0.2.7", - "serde 1.0.137", +- "getrandom 0.2.8", +- "serde 1.0.152", ++ "getrandom 0.2.11", ++ "serde 1.0.193", ] -@@ -5352,10 +5344,10 @@ dependencies = [ + [[package]] +@@ -5702,10 +5775,10 @@ dependencies = [ + "idna 0.2.3", + "lazy_static", + "regex", +- "serde 1.0.152", ++ "serde 1.0.193", + "serde_derive", + "serde_json", +- "url 2.3.1", ++ "url 2.5.0", + "validator_derive", + ] + +@@ -5718,10 +5791,10 @@ dependencies = [ "if_chain", "lazy_static", "proc-macro-error", -- "proc-macro2 1.0.37", -- "quote 1.0.18", -+ "proc-macro2 1.0.39", -+ "quote 1.0.19", +- "proc-macro2 1.0.49", +- "quote 1.0.23", ++ "proc-macro2 1.0.70", ++ "quote 1.0.33", "regex", -- "syn 1.0.92", -+ "syn 1.0.98", +- "syn 1.0.107", ++ "syn 1.0.109", "validator_types", ] -@@ -5365,8 +5357,8 @@ version = "0.15.0" +@@ -5731,8 +5804,8 @@ version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2ddf34293296847abfc1493b15c6e2f5d3cd19f57ad7d22673bf4c6278da329" dependencies = [ -- "proc-macro2 1.0.37", -- "syn 1.0.92", -+ "proc-macro2 1.0.39", -+ "syn 1.0.98", +- "proc-macro2 1.0.49", +- "syn 1.0.107", ++ "proc-macro2 1.0.70", ++ "syn 1.0.109", ] [[package]] -@@ -5445,9 +5437,9 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" +@@ -5773,12 +5846,11 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" [[package]] - name = "wasi" --version = "0.10.2+wasi-snapshot-preview1" -+version = "0.10.0+wasi-snapshot-preview1" + name = "walkdir" +-version = "2.3.2" ++version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" -+checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" +-checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" ++checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" + dependencies = [ + "same-file", +- "winapi 0.3.9", + "winapi-util", + ] + +@@ -5789,17 +5861,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230" + dependencies = [ + "futures 0.1.31", +- "log 0.4.17", ++ "log 0.4.20", + "try-lock", + ] [[package]] - name = "wasi" -@@ -5476,17 +5468,17 @@ dependencies = [ + name = "want" +-version = "0.3.0" ++version = "0.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" ++checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" + dependencies = [ +- "log 0.4.17", + "try-lock", + ] + +@@ -5823,36 +5894,36 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + + [[package]] + name = "wasm-bindgen" +-version = "0.2.83" ++version = "0.2.89" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" ++checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" + dependencies = [ + "cfg-if 1.0.0", +- "serde 1.0.152", ++ "serde 1.0.193", + "serde_json", + "wasm-bindgen-macro", + ] + + [[package]] + name = "wasm-bindgen-backend" +-version = "0.2.83" ++version = "0.2.89" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" ++checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" + dependencies = [ "bumpalo", - "lazy_static", - "log 0.4.17", -- "proc-macro2 1.0.37", -- "quote 1.0.18", -- "syn 1.0.92", -+ "proc-macro2 1.0.39", -+ "quote 1.0.19", -+ "syn 1.0.98", +- "log 0.4.17", ++ "log 0.4.20", + "once_cell", +- "proc-macro2 1.0.49", +- "quote 1.0.23", +- "syn 1.0.107", ++ "proc-macro2 1.0.70", ++ "quote 1.0.33", ++ "syn 2.0.39", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" --version = "0.4.30" -+version = "0.4.31" +-version = "0.4.33" ++version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6f741de44b75e14c35df886aff5f1eb73aa114fa5d4d00dcd37b5e01259bf3b2" -+checksum = "de9a9cec1733468a8c657e57fa2413d2ae2c0129b95e87c5b72b8ace4d13f31f" +-checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" ++checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" dependencies = [ "cfg-if 1.0.0", "js-sys", -@@ -5500,7 +5492,7 @@ version = "0.2.81" +@@ -5862,38 +5933,51 @@ dependencies = [ + + [[package]] + name = "wasm-bindgen-macro" +-version = "0.2.83" ++version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "c441e177922bc58f1e12c022624b6216378e5febc2f0533e41ba443d505b80aa" +-checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" ++checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" dependencies = [ -- "quote 1.0.18", -+ "quote 1.0.19", +- "quote 1.0.23", ++ "quote 1.0.33", "wasm-bindgen-macro-support", ] -@@ -5510,9 +5502,9 @@ version = "0.2.81" + [[package]] + name = "wasm-bindgen-macro-support" +-version = "0.2.83" ++version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "7d94ac45fcf608c1f45ef53e748d35660f168490c10b23704c7779ab8f5c3048" +-checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" ++checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ -- "proc-macro2 1.0.37", -- "quote 1.0.18", -- "syn 1.0.92", -+ "proc-macro2 1.0.39", -+ "quote 1.0.19", -+ "syn 1.0.98", +- "proc-macro2 1.0.49", +- "quote 1.0.23", +- "syn 1.0.107", ++ "proc-macro2 1.0.70", ++ "quote 1.0.33", ++ "syn 2.0.39", "wasm-bindgen-backend", "wasm-bindgen-shared", ] + + [[package]] + name = "wasm-bindgen-shared" +-version = "0.2.83" ++version = "0.2.89" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" ++checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" ++ ++[[package]] ++name = "wasm-streams" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" ++dependencies = [ ++ "futures-util", ++ "js-sys", ++ "wasm-bindgen", ++ "wasm-bindgen-futures", ++ "web-sys", ++] + + [[package]] + name = "web-sys" +-version = "0.3.60" ++version = "0.3.66" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" ++checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" + dependencies = [ + "js-sys", + "wasm-bindgen", +@@ -5906,15 +5990,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ec24b1b0700d4b466d280228ed0f62274eedeaa80206820f071fdc8ed787b664" + dependencies = [ + "reqwest 0.9.24", +- "serde 1.0.152", ++ "serde 1.0.193", + "serde_derive", + ] + + [[package]] + name = "whatlang" +-version = "0.16.2" ++version = "0.16.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9c531a2dc4c462b833788be2c07eef4e621d0e9edbd55bf280cc164c1c1aa043" ++checksum = "dcdcd0195a5b871e50926da8e881277f36a4621b3220d85092e7b91cc85f6bd9" + dependencies = [ + "hashbrown 0.12.3", + "once_cell", +@@ -5950,9 +6034,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + + [[package]] + name = "winapi-util" +-version = "0.1.5" ++version = "0.1.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" ++checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" + dependencies = [ + "winapi 0.3.9", + ] +@@ -5963,105 +6047,146 @@ version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + ++[[package]] ++name = "windows-core" ++version = "0.51.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" ++dependencies = [ ++ "windows-targets 0.48.5", ++] ++ + [[package]] + name = "windows-sys" +-version = "0.36.1" ++version = "0.48.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" ++checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" + dependencies = [ +- "windows_aarch64_msvc 0.36.1", +- "windows_i686_gnu 0.36.1", +- "windows_i686_msvc 0.36.1", +- "windows_x86_64_gnu 0.36.1", +- "windows_x86_64_msvc 0.36.1", ++ "windows-targets 0.48.5", + ] + + [[package]] + name = "windows-sys" +-version = "0.42.0" ++version = "0.52.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" ++dependencies = [ ++ "windows-targets 0.52.0", ++] ++ ++[[package]] ++name = "windows-targets" ++version = "0.48.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" ++checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" + dependencies = [ +- "windows_aarch64_gnullvm", +- "windows_aarch64_msvc 0.42.0", +- "windows_i686_gnu 0.42.0", +- "windows_i686_msvc 0.42.0", +- "windows_x86_64_gnu 0.42.0", +- "windows_x86_64_gnullvm", +- "windows_x86_64_msvc 0.42.0", ++ "windows_aarch64_gnullvm 0.48.5", ++ "windows_aarch64_msvc 0.48.5", ++ "windows_i686_gnu 0.48.5", ++ "windows_i686_msvc 0.48.5", ++ "windows_x86_64_gnu 0.48.5", ++ "windows_x86_64_gnullvm 0.48.5", ++ "windows_x86_64_msvc 0.48.5", ++] ++ ++[[package]] ++name = "windows-targets" ++version = "0.52.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" ++dependencies = [ ++ "windows_aarch64_gnullvm 0.52.0", ++ "windows_aarch64_msvc 0.52.0", ++ "windows_i686_gnu 0.52.0", ++ "windows_i686_msvc 0.52.0", ++ "windows_x86_64_gnu 0.52.0", ++ "windows_x86_64_gnullvm 0.52.0", ++ "windows_x86_64_msvc 0.52.0", + ] + + [[package]] + name = "windows_aarch64_gnullvm" +-version = "0.42.0" ++version = "0.48.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" ++checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" ++ ++[[package]] ++name = "windows_aarch64_gnullvm" ++version = "0.52.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + + [[package]] + name = "windows_aarch64_msvc" +-version = "0.36.1" ++version = "0.48.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" ++checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + + [[package]] + name = "windows_aarch64_msvc" +-version = "0.42.0" ++version = "0.52.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" ++checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + + [[package]] + name = "windows_i686_gnu" +-version = "0.36.1" ++version = "0.48.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" ++checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + + [[package]] + name = "windows_i686_gnu" +-version = "0.42.0" ++version = "0.52.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" ++checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + + [[package]] + name = "windows_i686_msvc" +-version = "0.36.1" ++version = "0.48.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" ++checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + + [[package]] + name = "windows_i686_msvc" +-version = "0.42.0" ++version = "0.52.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" ++checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + + [[package]] + name = "windows_x86_64_gnu" +-version = "0.36.1" ++version = "0.48.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" ++checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + + [[package]] + name = "windows_x86_64_gnu" +-version = "0.42.0" ++version = "0.52.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" ++ ++[[package]] ++name = "windows_x86_64_gnullvm" ++version = "0.48.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" ++checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + + [[package]] + name = "windows_x86_64_gnullvm" +-version = "0.42.0" ++version = "0.52.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" ++checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + + [[package]] + name = "windows_x86_64_msvc" +-version = "0.36.1" ++version = "0.48.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" ++checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + + [[package]] + name = "windows_x86_64_msvc" +-version = "0.42.0" ++version = "0.52.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" ++checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + + [[package]] + name = "winreg" +@@ -6083,11 +6208,12 @@ dependencies = [ + + [[package]] + name = "winreg" +-version = "0.10.1" ++version = "0.50.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" ++checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" + dependencies = [ +- "winapi 0.3.9", ++ "cfg-if 1.0.0", ++ "windows-sys 0.48.0", + ] + + [[package]] +@@ -6111,19 +6237,13 @@ dependencies = [ + + [[package]] + name = "xattr" +-version = "0.2.3" ++version = "1.0.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" ++checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" + dependencies = [ + "libc", + ] + +-[[package]] +-name = "xml-rs" +-version = "0.8.4" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" +- + [[package]] + name = "yada" + version = "0.4.1" +@@ -6147,6 +6267,6 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" + + [[package]] + name = "zeroize" +-version = "1.5.7" ++version = "1.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c394b5bd0c6f669e7275d9c20aa90ae064cb22e75a1cad54e1b34088034b149f" ++checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" diff --git a/Cargo.toml b/Cargo.toml -index 3632d47f..030b226e 100644 +index f5868e32..91d867ba 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -77,3 +77,6 @@ search-lindera = ["plume-models/search-lindera"] +@@ -78,3 +78,6 @@ s3 = ["plume-models/s3"] [workspace] members = ["plume-api", "plume-cli", "plume-models", "plume-common", "plume-front", "plume-macro"] + +[patch.crates-io] -+conv = { path = "rust-conv" } -diff --git a/plume-front/Cargo.toml b/plume-front/Cargo.toml -index 3ea82f17..b30b07c5 100644 ---- a/plume-front/Cargo.toml -+++ b/plume-front/Cargo.toml -@@ -14,7 +14,7 @@ gettext-utils = "0.1.0" - lazy_static = "1.3" - serde = "1.0" - serde_json = "1.0" --wasm-bindgen = "0.2.81" -+wasm-bindgen = "0.2.79" - js-sys = "0.3.58" - serde_derive = "1.0.123" - console_error_panic_hook = "0.1.6" ++conv = { git = "https://github.com/DanielKeep/rust-conv" } -- -2.36.0 +2.42.0 diff --git a/overlays/plume/0002-plume-front-fixup.patch b/overlays/plume/0002-plume-front-fixup.patch new file mode 100644 index 00000000..0402856d --- /dev/null +++ b/overlays/plume/0002-plume-front-fixup.patch @@ -0,0 +1,29 @@ +From 62e6eb13c0df3c0925420fa393eeafb3e211dc4e Mon Sep 17 00:00:00 2001 +From: Astro +Date: Mon, 4 Dec 2023 02:43:16 +0100 +Subject: [PATCH 2/2] plume-front: fixup + +--- + plume-front/src/editor.rs | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/plume-front/src/editor.rs b/plume-front/src/editor.rs +index 94bbbb59..1bef5004 100644 +--- a/plume-front/src/editor.rs ++++ b/plume-front/src/editor.rs +@@ -168,10 +168,11 @@ fn load_autosave() { + .get(&get_autosave_id()) + { + let autosave_info: AutosaveInformation = serde_json::from_str(&autosave_str).ok().unwrap(); ++ let last_saved = Date::new(&JsValue::from_f64(autosave_info.last_saved)).to_date_string().as_string().unwrap(); + let message = i18n!( + CATALOG, + "Do you want to load the local autosave last edited at {}?"; +- Date::new(&JsValue::from_f64(autosave_info.last_saved)).to_date_string().as_string().unwrap() ++ last_saved + ); + if let Ok(true) = window().unwrap().confirm_with_message(&message) { + set_value("editor-content", &autosave_info.contents); +-- +2.42.0 + diff --git a/overlays/plume/default.nix b/overlays/plume/default.nix index 70149ff7..fe7e789d 100644 --- a/overlays/plume/default.nix +++ b/overlays/plume/default.nix @@ -1,11 +1,11 @@ -{ naersk +{ callPackage +, system , fenix -, nodejs -, rustPlatform +, naersk +, wasm-bindgen-cli , stdenv , fetchFromGitHub , buildEnv -, fetchCrate , pkg-config , gettext , wasm-pack @@ -15,54 +15,31 @@ }: let - rust = fenix.complete.withComponents [ + wasm-bindgen-cli' = wasm-bindgen-cli.override { + version = "0.2.89"; + hash = "sha256-IPxP68xtNSpwJjV2yNMeepAS0anzGl02hYlSTvPocz8="; + cargoHash = "sha256-pBeQaG6i65uJrJptZQLuIaCb/WCQMhba1Z1OhYqA8Zc="; + }; + rust = fenix.packages.${system}.complete.withComponents [ "cargo" "rustc" ]; - naersk' = naersk.override { + naersk' = callPackage naersk { cargo = rust; rustc = rust; }; - rust-wasm = with fenix; + rust-wasm = with fenix.packages.${system}; combine [ minimal.rustc minimal.cargo targets.wasm32-unknown-unknown.latest.rust-std ]; - naersk-wasm = naersk.override { + naersk-wasm = callPackage naersk { cargo = rust-wasm; rustc = rust-wasm; }; - wasm-bindgen-cli = rustPlatform.buildRustPackage rec { - pname = "wasm-bindgen-cli"; - version = "0.2.81"; - - src = fetchCrate { - inherit pname version; - sha256 = "sha256-DUcY22b9+PD6RD53CwcoB+ynGulYTEYjkkonDNeLbGM="; - }; - - cargoSha256 = "sha256-mfVQ6rSzCgwYrN9WwydEpkm6k0E3302Kfs/LaGzRSHE="; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ openssl ]; - - checkInputs = [ nodejs ]; - - # other tests require it to be ran in the wasm-bindgen monorepo - cargoTestFlags = [ "--test=interface-types" ]; - }; - - conv = fetchFromGitHub { - owner = "DanielKeep"; - repo = "rust-conv"; - rev = "master"; - sha256 = "029xq9cabz3scbmd84b8qkrg0q7x6fm27ijq869lkpq8bwjxvcb6"; - }; - - version = "0.7.2-1"; + version = "0.7.2-2"; src = stdenv.mkDerivation { pname = "plume-src"; @@ -70,17 +47,14 @@ let src = fetchFromGitHub { owner = "Plume-org"; repo = "Plume"; - # rev = version; - rev = "620726cc2564ededb98af42c3c2e35407fcf1184"; - sha256 = "sha256-B8EAV61qdTBGn+vGQZlXjAaSkEPs8wr9ZH1Roq3CZZs="; + rev = "304fb740d8ba3aaae64b3eb67ecfe476841b87c4"; + sha256 = "sha256-nMiVMR0arhv4bwx8b5FGawjQyiOXDhRZV8ERdBtHCYM="; }; phases = [ "unpackPhase" "patchPhase" "installPhase" ]; patches = [ ./0001-cargo-update.patch + ./0002-plume-front-fixup.patch ]; - postPatch = '' - ln -s ${conv} rust-conv - ''; installPhase = "cp -ar . $out"; }; @@ -91,7 +65,7 @@ let nativeBuildInputs = [ pkg-config gettext - wasm-bindgen-cli + wasm-bindgen-cli' ]; buildInputs = [ openssl @@ -127,7 +101,7 @@ let nativeBuildInputs = [ gettext wasm-pack - wasm-bindgen-cli + wasm-bindgen-cli' binaryen ]; CARGO_BUILD_TARGET = "wasm32-unknown-unknown"; @@ -138,7 +112,7 @@ let copyLibs = true; overrideMain = _: { buildPhase = '' - wasm-pack build --mode no-install --target web --release plume-front + WASM_PACK_CACHE=.wasm-pack-cache wasm-pack build --mode no-install --target web --release plume-front ''; installPhase = '' mkdir -p $out/share/plume/static