From b963cc5281f2190ffa7a3d1edc8c757799fedd56 Mon Sep 17 00:00:00 2001 From: Astro Date: Mon, 13 Jun 2022 18:01:38 +0200 Subject: [PATCH] overlay/plume: 0.7.1 -> 0.7.2-1 --- overlay/plume/0001-cargo-update.patch | 2251 ++++++++++--------------- overlay/plume/default.nix | 36 +- 2 files changed, 886 insertions(+), 1401 deletions(-) diff --git a/overlay/plume/0001-cargo-update.patch b/overlay/plume/0001-cargo-update.patch index dbe8d7f3..9ca9af43 100644 --- a/overlay/plume/0001-cargo-update.patch +++ b/overlay/plume/0001-cargo-update.patch @@ -1,190 +1,94 @@ -From fe3d8a09010dd069066dad0b0646951a31738cfb Mon Sep 17 00:00:00 2001 +From 4543edd52c5ff7e369c11a79aecdf9a99ef3d0e8 Mon Sep 17 00:00:00 2001 From: Astro -Date: Wed, 23 Feb 2022 21:39:34 +0100 +Date: Sun, 19 Jun 2022 23:15:30 +0200 Subject: [PATCH] cargo update --- - Cargo.lock | 583 +++++++++++++++++++++-------------------- + Cargo.lock | 450 ++++++++++++++++++++--------------------- Cargo.toml | 3 + plume-front/Cargo.toml | 2 +- - 3 files changed, 309 insertions(+), 279 deletions(-) + 3 files changed, 225 insertions(+), 230 deletions(-) diff --git a/Cargo.lock b/Cargo.lock -index 80a194d..f5270c2 100644 +index fd91e109..be2aa1f8 100644 --- a/Cargo.lock +++ b/Cargo.lock -@@ -11,7 +11,7 @@ dependencies = [ - "activitystreams-derive", - "activitystreams-traits", - "activitystreams-types", -- "serde 1.0.133", -+ "serde 1.0.136", - "serde_derive", - "serde_json", - ] -@@ -34,7 +34,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "670ef03168e704b0cae242e7a5d8b40506772b339687e01a3496fc4afe2e8542" - dependencies = [ - "failure", -- "serde 1.0.133", -+ "serde 1.0.136", - "serde_json", - ] - -@@ -48,7 +48,7 @@ dependencies = [ - "activitystreams-traits", - "chrono", - "mime 0.3.16", -- "serde 1.0.133", -+ "serde 1.0.136", - "serde_derive", - "serde_json", - ] -@@ -137,7 +137,7 @@ version = "0.7.6" +@@ -121,7 +121,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ -- "getrandom 0.2.3", -+ "getrandom 0.2.5", +- "getrandom 0.2.6", ++ "getrandom 0.2.7", "once_cell", "version_check 0.9.4", ] -@@ -153,15 +153,14 @@ dependencies = [ - - [[package]] - name = "ammonia" --version = "3.1.2" -+version = "3.1.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2e445c26125ff80316eaea16e812d717b147b82a68682bd4730f74d4845c8b35" -+checksum = "ea9f21d23d82bae9d33c21080572af1fa749788e68234b5d8fa5e39d3e0783ed" - dependencies = [ - "html5ever", - "lazy_static", - "maplit", - "markup5ever_rcdom", -- "matches", - "tendril", - "url 2.2.2", - ] -@@ -201,9 +200,9 @@ checksum = "71938f30533e4d95a6d17aa530939da3842c2ab6f4f84b9dae68447e4129f74a" - - [[package]] - name = "askama_escape" --version = "0.10.2" -+version = "0.10.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9a1bb320f97e6edf9f756bf015900038e43c7700e059688e5724a928c8f3b8d5" -+checksum = "619743e34b5ba4e9703bba34deac3427c72507c7159f5fd030aea8cac0cfe341" +@@ -199,13 +199,13 @@ dependencies = [ [[package]] name = "async-trait" -@@ -212,8 +211,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3" +-version = "0.1.53" ++version = "0.1.56" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600" ++checksum = "96cf8829f67d2eab0b2dfa42c5d0ef737e0724e4a82b01b3e292456202b19716" dependencies = [ - "proc-macro2 1.0.36", -- "quote 1.0.14", -- "syn 1.0.85", -+ "quote 1.0.15", -+ "syn 1.0.86", +- "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]] -@@ -251,15 +250,18 @@ dependencies = [ - - [[package]] - name = "autocfg" --version = "0.1.7" -+version = "0.1.8" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" -+checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" -+dependencies = [ -+ "autocfg 1.1.0", -+] - - [[package]] - name = "autocfg" --version = "1.0.1" -+version = "1.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" -+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - - [[package]] - name = "backtrace" -@@ -340,7 +342,7 @@ checksum = "f691e63585950d8c1c43644d11bab9073e40f5060dd2822734ae7c3dc69a3a80" +@@ -337,7 +337,7 @@ checksum = "6fe4fef31efb0f76133ae8e3576a88e58edb7cfc5584c81c758c349ba46b43fc" dependencies = [ "base64 0.13.0", "blowfish", -- "getrandom 0.2.3", -+ "getrandom 0.2.5", +- "getrandom 0.2.6", ++ "getrandom 0.2.7", + "zeroize", ] +@@ -408,15 +408,15 @@ checksum = "40e38929add23cdf8a366df9b0e088953150724bcbe5fc330b0d8eb3b328eec8" + [[package]] -@@ -349,7 +351,7 @@ version = "1.3.3" + name = "bumpalo" +-version = "3.9.1" ++version = "3.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" - dependencies = [ -- "serde 1.0.133", -+ "serde 1.0.136", - ] +-checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899" ++checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3" [[package]] -@@ -470,9 +472,9 @@ checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" - - [[package]] - name = "cc" --version = "1.0.72" -+version = "1.0.73" + name = "bytecount" +-version = "0.6.2" ++version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee" -+checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +-checksum = "72feb31ffc86498dacdbd0fcebb56138e7177a8cc5cea4516031d15ae85a742e" ++checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" [[package]] - name = "census" -@@ -513,8 +515,8 @@ dependencies = [ - "libc", + name = "byteorder" +@@ -493,7 +493,7 @@ dependencies = [ "num-integer", - "num-traits 0.2.14", -- "serde 1.0.133", + "num-traits 0.2.15", + "serde 1.0.137", - "time 0.1.43", -+ "serde 1.0.136", + "time 0.1.44", "winapi 0.3.9", ] -@@ -562,9 +564,9 @@ dependencies = [ - - [[package]] - name = "combine" --version = "4.6.2" -+version = "4.6.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b2b2f5d0ee456f3928812dfc8c6d9a1d592b98678f6d56db9b0cd2b7bc6c8db5" -+checksum = "50b727aacc797f9fc28e355d21f34709ac4fc9adecfe470ad07b8f4464f53062" - dependencies = [ - "memchr", - ] -@@ -578,7 +580,7 @@ dependencies = [ - "lazy_static", - "nom 5.1.2", - "rust-ini", -- "serde 1.0.133", -+ "serde 1.0.136", - "serde-hjson", - "serde_json", - "toml 0.5.8", -@@ -611,7 +613,7 @@ version = "0.1.13" +@@ -591,7 +591,7 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "615f6e27d000a2bffbc7f2f6a8669179378fa27ee4d0a509e985dfc0a7defb40" dependencies = [ -- "getrandom 0.2.3", -+ "getrandom 0.2.5", +- "getrandom 0.2.6", ++ "getrandom 0.2.7", "lazy_static", "proc-macro-hack 0.5.19", "tiny-keccak", -@@ -619,9 +621,7 @@ dependencies = [ +@@ -599,9 +599,7 @@ dependencies = [ [[package]] name = "conv" @@ -195,19 +99,16 @@ index 80a194d..f5270c2 100644 dependencies = [ "custom_derive", ] -@@ -637,9 +637,9 @@ dependencies = [ - "hkdf", - "hmac", +@@ -619,7 +617,7 @@ dependencies = [ "percent-encoding 2.1.0", -- "rand 0.8.4", -+ "rand 0.8.5", + "rand 0.8.5", "sha2", - "time 0.1.43", + "time 0.1.44", ] [[package]] -@@ -648,7 +648,7 @@ version = "0.12.0" +@@ -628,7 +626,7 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "888604f00b3db336d2af898ec3c1d5d0ddf5e6d462220f2ededc33a87ac4bbd5" dependencies = [ @@ -216,157 +117,163 @@ index 80a194d..f5270c2 100644 "url 1.7.2", ] -@@ -663,18 +663,18 @@ dependencies = [ - "idna 0.1.5", - "log 0.4.14", +@@ -645,7 +643,7 @@ dependencies = [ "publicsuffix", -- "serde 1.0.133", -+ "serde 1.0.136", + "serde 1.0.137", "serde_json", - "time 0.1.43", + "time 0.1.44", "try_from", "url 1.7.2", ] - - [[package]] - name = "core-foundation" --version = "0.9.2" -+version = "0.9.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6888e10551bb93e424d8df1d07f1a8b4fceb0001a3a4b048bfc47554946f47b3" -+checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" - dependencies = [ - "core-foundation-sys", - "libc", -@@ -703,9 +703,9 @@ checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" - - [[package]] - name = "crc32fast" --version = "1.3.0" -+version = "1.3.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "738c290dfaea84fc1ca15ad9c168d083b05a714e1efddd8edaab678dc28d2836" -+checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" - dependencies = [ - "cfg-if 1.0.0", - ] -@@ -731,11 +731,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -711,11 +709,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ae5588f6b3c3cb05239e90bd110f257254aecd01e4635400391aeae07497845" dependencies = [ "cfg-if 1.0.0", -- "crossbeam-channel 0.5.1", -+ "crossbeam-channel 0.5.2", +- "crossbeam-channel 0.5.4", ++ "crossbeam-channel 0.5.5", "crossbeam-deque 0.8.1", -- "crossbeam-epoch 0.9.5", -- "crossbeam-queue 0.3.2", -- "crossbeam-utils 0.8.5", -+ "crossbeam-epoch 0.9.7", -+ "crossbeam-queue 0.3.4", -+ "crossbeam-utils 0.8.7", +- "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", ] [[package]] -@@ -750,12 +750,12 @@ dependencies = [ +@@ -730,12 +728,12 @@ dependencies = [ [[package]] name = "crossbeam-channel" --version = "0.5.1" -+version = "0.5.2" +-version = "0.5.4" ++version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" -+checksum = "e54ea8bc3fb1ee042f5aace6e3c6e025d3874866da222930f70ce62aceba0bfa" +-checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53" ++checksum = "4c02a4d71819009c192cf4872265391563fd6a84c81ff2c0f2a7026ca4c1d85c" dependencies = [ "cfg-if 1.0.0", -- "crossbeam-utils 0.8.5", -+ "crossbeam-utils 0.8.7", +- "crossbeam-utils 0.8.8", ++ "crossbeam-utils 0.8.9", ] [[package]] -@@ -776,8 +776,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -756,8 +754,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" dependencies = [ "cfg-if 1.0.0", -- "crossbeam-epoch 0.9.5", -- "crossbeam-utils 0.8.5", -+ "crossbeam-epoch 0.9.7", -+ "crossbeam-utils 0.8.7", +- "crossbeam-epoch 0.9.8", +- "crossbeam-utils 0.8.8", ++ "crossbeam-epoch 0.9.9", ++ "crossbeam-utils 0.8.9", ] [[package]] -@@ -786,7 +786,7 @@ version = "0.8.2" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" - dependencies = [ -- "autocfg 1.0.1", -+ "autocfg 1.1.0", - "cfg-if 0.1.10", - "crossbeam-utils 0.7.2", - "lazy_static", -@@ -797,12 +797,12 @@ dependencies = [ +@@ -777,15 +775,15 @@ dependencies = [ [[package]] name = "crossbeam-epoch" --version = "0.9.5" -+version = "0.9.7" +-version = "0.9.8" ++version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" -+checksum = "c00d6d2ea26e8b151d99093005cb442fb9a37aeaca582a03ec70946f49ab5ed9" +-checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c" ++checksum = "07db9d94cbd326813772c968ccd25999e5f8ae22f4f8d1b11effa37ef6ce281d" dependencies = [ + "autocfg 1.1.0", "cfg-if 1.0.0", -- "crossbeam-utils 0.8.5", -+ "crossbeam-utils 0.8.7", - "lazy_static", +- "crossbeam-utils 0.8.8", +- "lazy_static", ++ "crossbeam-utils 0.8.9", "memoffset 0.6.5", ++ "once_cell", "scopeguard", -@@ -821,12 +821,12 @@ dependencies = [ + ] - [[package]] - name = "crossbeam-queue" --version = "0.3.2" -+version = "0.3.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9b10ddc024425c88c2ad148c1b0fd53f4c6d38db9697c9f1588381212fa657c9" -+checksum = "4dd435b205a4842da59efd07628f921c096bc1cc0a156835b4fa0bcb9a19bcce" +@@ -807,7 +805,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "1f25d8400f4a7a5778f0e4e52384a48cbd9b5c495d110786187fc750075277a2" dependencies = [ "cfg-if 1.0.0", -- "crossbeam-utils 0.8.5", -+ "crossbeam-utils 0.8.7", +- "crossbeam-utils 0.8.8", ++ "crossbeam-utils 0.8.9", ] [[package]] -@@ -835,16 +835,16 @@ version = "0.7.2" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" - dependencies = [ -- "autocfg 1.0.1", -+ "autocfg 1.1.0", - "cfg-if 0.1.10", - "lazy_static", - ] +@@ -823,12 +821,12 @@ dependencies = [ [[package]] name = "crossbeam-utils" --version = "0.8.5" -+version = "0.8.7" +-version = "0.8.8" ++version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" -+checksum = "b5e5bed1f1c269533fa816a0a5492b3545209a205ca1a54842be180eb63a16a6" +-checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" ++checksum = "8ff1f980957787286a554052d03c7aee98d99cc32e09f6d45f0a814133c87978" dependencies = [ "cfg-if 1.0.0", - "lazy_static", -@@ -1020,8 +1020,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "45f5098f628d02a7a0f68ddba586fb61e80edec3bdc1be3b921f4ceec60858d3" - dependencies = [ - "proc-macro2 1.0.36", -- "quote 1.0.14", -- "syn 1.0.85", -+ "quote 1.0.15", -+ "syn 1.0.86", +- "lazy_static", ++ "once_cell", ] [[package]] -@@ -1084,7 +1084,7 @@ dependencies = [ +@@ -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" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "45f5098f628d02a7a0f68ddba586fb61e80edec3bdc1be3b921f4ceec60858d3" + 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]] +@@ -1128,7 +1126,7 @@ dependencies = [ "encoding", "lazy_static", "rand 0.4.6", @@ -375,199 +282,155 @@ index 80a194d..f5270c2 100644 "version_check 0.1.5", ] -@@ -1189,8 +1189,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -1232,9 +1230,9 @@ version = "0.1.8" + source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" dependencies = [ - "proc-macro2 1.0.36", -- "quote 1.0.14", -- "syn 1.0.85", -+ "quote 1.0.15", -+ "syn 1.0.86", +- "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", ] -@@ -1205,9 +1205,9 @@ dependencies = [ +@@ -1270,13 +1268,11 @@ dependencies = [ [[package]] - name = "fastrand" --version = "1.6.0" -+version = "1.7.0" + name = "flate2" +-version = "1.0.23" ++version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "779d043b6a0b90cc4c0ed7ee380a6504394cee7efd7db050e3774eee387324b2" -+checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf" +-checksum = "b39522e96686d38f4bc984b9198e3a0613264abaebaff2c5c918bfa6b6da09af" ++checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" dependencies = [ - "instant", +- "cfg-if 1.0.0", + "crc32fast", +- "libc", + "miniz_oxide", ] -@@ -1326,9 +1326,9 @@ checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" - [[package]] - name = "futf" --version = "0.1.4" -+version = "0.1.5" +@@ -1456,9 +1452,9 @@ version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7c9c1ce3fa9336301af935ab852c437817d14cd33690446569392e65170aac3b" -+checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" + checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" dependencies = [ - "mac", - "new_debug_unreachable", -@@ -1342,9 +1342,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" - - [[package]] - name = "futures" --version = "0.3.19" -+version = "0.3.21" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "28560757fe2bb34e79f907794bb6b22ae8b0e5c669b638a1132f2592b19035b4" -+checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" - dependencies = [ - "futures-channel", - "futures-core", -@@ -1357,9 +1357,9 @@ dependencies = [ - - [[package]] - name = "futures-channel" --version = "0.3.19" -+version = "0.3.21" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ba3dda0b6588335f360afc675d0564c17a77a2bda81ca178a4b6081bd86c7f0b" -+checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" - dependencies = [ - "futures-core", - "futures-sink", -@@ -1367,9 +1367,9 @@ dependencies = [ - - [[package]] - name = "futures-core" --version = "0.3.19" -+version = "0.3.21" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d0c8ff0461b82559810cdccfde3215c3f373807f5e5232b71479bff7bb2583d7" -+checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" - - [[package]] - name = "futures-cpupool" -@@ -1383,9 +1383,9 @@ dependencies = [ - - [[package]] - name = "futures-executor" --version = "0.3.19" -+version = "0.3.21" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "29d6d2ff5bb10fb95c85b8ce46538a2e5f5e7fdc755623a7d4529ab8a4ed9d2a" -+checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" - dependencies = [ - "futures-core", - "futures-task", -@@ -1395,38 +1395,38 @@ dependencies = [ - - [[package]] - name = "futures-io" --version = "0.3.19" -+version = "0.3.21" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b1f9d34af5a1aac6fb380f735fe510746c38067c5bf16c7fd250280503c971b2" -+checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" - - [[package]] - name = "futures-macro" --version = "0.3.19" -+version = "0.3.21" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6dbd947adfffb0efc70599b3ddcf7b5597bb5fa9e245eb99f62b3a5f7bb8bd3c" -+checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" - dependencies = [ - "proc-macro2 1.0.36", -- "quote 1.0.14", -- "syn 1.0.85", -+ "quote 1.0.15", -+ "syn 1.0.86", +- "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]] - name = "futures-sink" --version = "0.3.19" -+version = "0.3.21" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e3055baccb68d74ff6480350f8d6eb8fcfa3aa11bdc1a1ae3afdd0514617d508" -+checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" - - [[package]] - name = "futures-task" --version = "0.3.19" -+version = "0.3.21" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6ee7c6485c30167ce4dfb83ac568a849fe53274c831081476ee13e0dce1aad72" -+checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" - - [[package]] - name = "futures-util" --version = "0.3.19" -+version = "0.3.21" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d9b5cf40b47a271f77a8b1bec03ca09044d99d2372c0de244e66430761127164" -+checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" - dependencies = [ - "futures-channel", - "futures-core", -@@ -1463,13 +1463,13 @@ dependencies = [ +@@ -1514,14 +1510,14 @@ dependencies = [ [[package]] name = "getrandom" --version = "0.2.3" -+version = "0.2.5" +-version = "0.2.6" ++version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" -+checksum = "d39cd93900197114fa1fcb7ae84ca742095eed9442088988ae74fa744e930e77" +-checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" ++checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" dependencies = [ "cfg-if 1.0.0", + "js-sys", "libc", - "wasi 0.10.2+wasi-snapshot-preview1", -+ "wasi 0.10.0+wasi-snapshot-preview1", ++ "wasi 0.11.0+wasi-snapshot-preview1", + "wasm-bindgen", ] - [[package]] -@@ -1542,7 +1542,7 @@ dependencies = [ - "chomp", - "guid", - "guid-parser", -- "rand 0.8.4", -+ "rand 0.8.5", - "winapi 0.3.9", - ] - -@@ -1614,7 +1614,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "96282e96bfcd3da0d3aa9938bedf1e50df3269b6db08b4876d2da0bb1a0841cf" +@@ -1543,9 +1539,9 @@ checksum = "649db3b5cda06091ea6aacb9f66f7002dfe885505b324b8ed795261253ffc2b3" dependencies = [ - "ahash 0.3.8", -- "autocfg 1.0.1", -+ "autocfg 1.1.0", + "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]] -@@ -1687,8 +1687,8 @@ dependencies = [ +@@ -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.36", -- "quote 1.0.14", -- "syn 1.0.85", -+ "quote 1.0.15", -+ "syn 1.0.86", +- "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]] -@@ -1743,9 +1743,9 @@ dependencies = [ +@@ -1781,13 +1777,13 @@ dependencies = [ [[package]] - name = "httparse" --version = "1.5.1" -+version = "1.6.0" + name = "http" +-version = "0.2.7" ++version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503" -+checksum = "9100414882e15fb7feccb4897e5f0ff0ff1ca7d1a86a23208ada4d7a18e6c6c4" +-checksum = "ff8670570af52249509a86f5e3e18a08c60b177071826898fde8997cf5f6bfbb" ++checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" + dependencies = [ + "bytes 1.1.0", + "fnv", +- "itoa 1.0.1", ++ "itoa 1.0.2", + ] [[package]] - name = "httpdate" -@@ -1765,7 +1765,7 @@ dependencies = [ +@@ -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", @@ -576,8 +439,8 @@ index 80a194d..f5270c2 100644 "traitobject", "typeable", "unicase 1.4.2", -@@ -1790,7 +1790,7 @@ dependencies = [ - "log 0.4.14", +@@ -1878,7 +1874,7 @@ dependencies = [ + "log 0.4.17", "net2", "rustc_version", - "time 0.1.43", @@ -585,58 +448,100 @@ index 80a194d..f5270c2 100644 "tokio 0.1.22", "tokio-buf", "tokio-executor", -@@ -1819,7 +1819,7 @@ dependencies = [ - "httpdate", - "itoa 0.4.8", - "pin-project", -- "socket2", -+ "socket2 0.3.19", - "tokio 0.2.25", - "tower-service", - "tracing", -@@ -1882,11 +1882,11 @@ checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" +@@ -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.7.0" -+version = "1.8.0" +-version = "1.8.1" ++version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" -+checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223" +-checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee" ++checksum = "6c6392766afd7964e2531940894cffe4bd8d7d17dbc3c1c4857040fd4b33bdb3" dependencies = [ -- "autocfg 1.0.1", -+ "autocfg 1.1.0", - "hashbrown 0.11.2", + "autocfg 1.1.0", +- "hashbrown 0.11.2", ++ "hashbrown 0.12.1", ] -@@ -2020,7 +2020,7 @@ checksum = "b2bdad98cd197646a9fd7be985cb711cffaded69d8dc0d87d83f8d88bcbc1691" + [[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 = [ - "async-trait", - "bytes 1.1.0", -- "futures 0.3.19", -+ "futures 0.3.21", - "futures-util", - "lazy_static", - "lber", -@@ -2030,7 +2030,7 @@ dependencies = [ - "nom 2.2.1", - "percent-encoding 2.1.0", - "thiserror", -- "tokio 1.15.0", -+ "tokio 1.17.0", + "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.6.9", -@@ -2050,7 +2050,7 @@ dependencies = [ - "log 0.4.14", - "native-tls", - "nom 4.2.3", -- "serde 1.0.133", -+ "serde 1.0.136", - "serde_derive", - "serde_json", +- "tokio-util 0.7.1", ++ "tokio-util 0.7.3", + "url 2.2.2", ] -@@ -2065,7 +2065,7 @@ dependencies = [ + +@@ -2213,7 +2209,7 @@ dependencies = [ "email", "lettre", "mime 0.3.16", @@ -645,489 +550,299 @@ index 80a194d..f5270c2 100644 "uuid 0.7.4", ] -@@ -2090,9 +2090,9 @@ dependencies = [ +@@ -2238,9 +2234,9 @@ dependencies = [ [[package]] name = "libc" --version = "0.2.112" -+version = "0.2.119" +-version = "0.2.125" ++version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125" -+checksum = "1bf2e165bb3457c8e098ea76f3e3bc9db55f87aa90d52d0e6be741470916aaa4" +-checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b" ++checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" [[package]] name = "libsqlite3-sys" -@@ -2117,7 +2117,7 @@ dependencies = [ - "lindera-dictionary", - "lindera-ipadic", - "lindera-ipadic-builder", -- "serde 1.0.133", -+ "serde 1.0.136", - "serde_json", - ] - -@@ -2130,7 +2130,7 @@ dependencies = [ - "bincode", - "byteorder 1.4.3", - "encoding", -- "serde 1.0.133", -+ "serde 1.0.136", - "yada", - ] - -@@ -2223,9 +2223,9 @@ dependencies = [ - - [[package]] - name = "lock_api" --version = "0.4.5" -+version = "0.4.6" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109" -+checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b" - dependencies = [ - "scopeguard", - ] -@@ -2335,7 +2335,7 @@ version = "0.5.6" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" - dependencies = [ -- "autocfg 1.0.1", -+ "autocfg 1.1.0", - ] - - [[package]] -@@ -2344,7 +2344,7 @@ version = "0.6.5" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" - dependencies = [ -- "autocfg 1.0.1", -+ "autocfg 1.1.0", - ] - - [[package]] -@@ -2364,8 +2364,8 @@ checksum = "9753f12909fd8d923f75ae5c3258cae1ed3c8ec052e1b38c93c21a6d157f789c" +@@ -2500,9 +2496,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "9753f12909fd8d923f75ae5c3258cae1ed3c8ec052e1b38c93c21a6d157f789c" dependencies = [ "migrations_internals", - "proc-macro2 1.0.36", -- "quote 1.0.14", -- "syn 1.0.85", -+ "quote 1.0.15", -+ "syn 1.0.86", +- "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]] -@@ -2385,9 +2385,9 @@ checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +@@ -2538,9 +2534,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] - name = "mime_guess" --version = "2.0.3" -+version = "2.0.4" + name = "miniz_oxide" +-version = "0.5.1" ++version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212" -+checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" - dependencies = [ - "mime 0.3.16", - "unicase 2.6.0", -@@ -2406,7 +2406,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" +-checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082" ++checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc" dependencies = [ "adler", -- "autocfg 1.0.1", -+ "autocfg 1.1.0", ] - - [[package]] -@@ -2430,9 +2430,9 @@ dependencies = [ +@@ -2566,16 +2562,14 @@ dependencies = [ [[package]] name = "mio" --version = "0.7.14" -+version = "0.8.0" +-version = "0.8.2" ++version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" -+checksum = "ba272f85fa0b41fc91872be579b3bbe0f56b792aa361a380eb669469f68dafb2" +-checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9" ++checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" dependencies = [ "libc", - "log 0.4.14", -@@ -2509,7 +2509,7 @@ dependencies = [ - "mime 0.3.16", - "mime_guess", - "quick-error", -- "rand 0.8.4", -+ "rand 0.8.5", - "safemem", - "tempfile", - "twoway", -@@ -2667,9 +2667,9 @@ dependencies = [ + "log 0.4.17", +- "miow 0.3.7", +- "ntapi", + "wasi 0.11.0+wasi-snapshot-preview1", +- "winapi 0.3.9", ++ "windows-sys", + ] [[package]] - name = "ntapi" --version = "0.3.6" -+version = "0.3.7" +@@ -2667,7 +2661,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" -+checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" + checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" dependencies = [ +- "getrandom 0.2.6", ++ "getrandom 0.2.7", + ] + + [[package]] +@@ -2801,15 +2795,6 @@ dependencies = [ "winapi 0.3.9", ] -@@ -2680,7 +2680,7 @@ version = "0.4.3" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" - dependencies = [ -- "autocfg 1.0.1", -+ "autocfg 1.1.0", - "num-integer", - "num-traits 0.2.14", - ] -@@ -2691,7 +2691,7 @@ version = "0.1.44" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" - dependencies = [ -- "autocfg 1.0.1", -+ "autocfg 1.1.0", - "num-traits 0.2.14", - ] - -@@ -2701,7 +2701,7 @@ version = "0.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a" - dependencies = [ -- "autocfg 1.0.1", -+ "autocfg 1.1.0", - "num-integer", - "num-traits 0.2.14", - ] -@@ -2721,7 +2721,7 @@ version = "0.2.14" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" - dependencies = [ -- "autocfg 1.0.1", -+ "autocfg 1.1.0", - ] - - [[package]] -@@ -2734,6 +2734,15 @@ dependencies = [ - "libc", - ] - -+[[package]] -+name = "num_threads" -+version = "0.1.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "97ba99ba6393e2c3734791401b66902d981cb03bf190af674ca69949b6d5fb15" -+dependencies = [ -+ "libc", -+] -+ - [[package]] - name = "object" - version = "0.24.0" -@@ -2790,9 +2799,9 @@ dependencies = [ - - [[package]] - name = "openssl-probe" --version = "0.1.4" -+version = "0.1.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" -+checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - - [[package]] - name = "openssl-sys" -@@ -2800,7 +2809,7 @@ version = "0.9.72" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb" - dependencies = [ -- "autocfg 1.0.1", -+ "autocfg 1.1.0", - "cc", - "libc", - "pkg-config", -@@ -2843,7 +2852,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" - dependencies = [ - "instant", -- "lock_api 0.4.5", -+ "lock_api 0.4.6", - "parking_lot_core 0.8.5", - ] - -@@ -2872,7 +2881,7 @@ dependencies = [ - "instant", - "libc", - "redox_syscall 0.2.10", -- "smallvec 1.7.0", -+ "smallvec 1.8.0", - "winapi 0.3.9", - ] - -@@ -2916,7 +2925,7 @@ version = "0.8.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" - dependencies = [ -- "phf_shared", -+ "phf_shared 0.8.0", - ] - - [[package]] -@@ -2926,7 +2935,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" - dependencies = [ - "phf_generator", -- "phf_shared", -+ "phf_shared 0.8.0", - ] - - [[package]] -@@ -2935,7 +2944,7 @@ version = "0.8.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" - dependencies = [ -- "phf_shared", -+ "phf_shared 0.8.0", - "rand 0.7.3", - ] - -@@ -2948,6 +2957,15 @@ dependencies = [ - "siphasher", - ] - -+[[package]] -+name = "phf_shared" -+version = "0.10.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -+dependencies = [ -+ "siphasher", -+] -+ - [[package]] - name = "pin-project" - version = "1.0.10" -@@ -2964,8 +2982,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb" - dependencies = [ - "proc-macro2 1.0.36", -- "quote 1.0.14", -- "syn 1.0.85", -+ "quote 1.0.15", -+ "syn 1.0.86", - ] - - [[package]] -@@ -3001,8 +3019,8 @@ dependencies = [ - "base64 0.13.0", - "indexmap", - "line-wrap", -- "serde 1.0.133", -- "time 0.3.5", -+ "serde 1.0.136", -+ "time 0.3.7", - "xml-rs", - ] - -@@ -3035,7 +3053,7 @@ dependencies = [ - "rsass", - "ructe", - "scheduled-thread-pool", -- "serde 1.0.133", -+ "serde 1.0.136", - "serde_json", - "shrinkwraprs", - "tracing", -@@ -3048,7 +3066,7 @@ dependencies = [ - name = "plume-api" - version = "0.7.1" - dependencies = [ -- "serde 1.0.133", -+ "serde 1.0.136", - "serde_derive", - ] - -@@ -3082,7 +3100,7 @@ dependencies = [ - "regex-syntax 0.6.25", - "reqwest 0.9.24", - "rocket", -- "serde 1.0.133", -+ "serde 1.0.136", - "serde_derive", - "serde_json", - "shrinkwraprs", -@@ -3101,7 +3119,7 @@ dependencies = [ - "gettext-utils", - "js-sys", - "lazy_static", -- "serde 1.0.133", -+ "serde 1.0.136", - "serde_derive", - "serde_json", - "wasm-bindgen", -@@ -3147,7 +3165,7 @@ dependencies = [ - "rocket", - "rocket_i18n", - "scheduled-thread-pool", -- "serde 1.0.133", -+ "serde 1.0.136", - "serde_derive", - "serde_json", - "shrinkwraprs", -@@ -3199,8 +3217,8 @@ checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" - dependencies = [ - "proc-macro-error-attr", - "proc-macro2 1.0.36", -- "quote 1.0.14", -- "syn 1.0.85", -+ "quote 1.0.15", -+ "syn 1.0.86", - "version_check 0.9.4", - ] - -@@ -3211,7 +3229,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" - dependencies = [ - "proc-macro2 1.0.36", -- "quote 1.0.14", -+ "quote 1.0.15", - "version_check 0.9.4", - ] - -@@ -3345,9 +3363,9 @@ dependencies = [ - - [[package]] - name = "quote" --version = "1.0.14" -+version = "1.0.15" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "47aa80447ce4daf1717500037052af176af5d38cc3e571d9ec1c7353fc10c87d" -+checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145" - dependencies = [ - "proc-macro2 1.0.36", - ] -@@ -3388,7 +3406,7 @@ version = "0.6.5" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" - dependencies = [ -- "autocfg 0.1.7", -+ "autocfg 0.1.8", - "libc", - "rand_chacha 0.1.1", - "rand_core 0.4.2", -@@ -3417,14 +3435,13 @@ dependencies = [ - - [[package]] - name = "rand" --version = "0.8.4" -+version = "0.8.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" -+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" - dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.3", -- "rand_hc 0.3.1", - ] - - [[package]] -@@ -3433,7 +3450,7 @@ version = "0.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" - dependencies = [ -- "autocfg 0.1.7", -+ "autocfg 0.1.8", - "rand_core 0.3.1", - ] - -@@ -3487,7 +3504,7 @@ version = "0.6.3" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" - dependencies = [ -- "getrandom 0.2.3", -+ "getrandom 0.2.5", - ] - - [[package]] -@@ -3508,15 +3525,6 @@ dependencies = [ - "rand_core 0.5.1", - ] -[[package]] --name = "rand_hc" --version = "0.3.1" +-name = "ntapi" +-version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" +-checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" -dependencies = [ -- "rand_core 0.6.3", +- "winapi 0.3.9", -] - [[package]] - name = "rand_isaac" - version = "0.1.1" -@@ -3557,7 +3565,7 @@ version = "0.1.2" + name = "num-bigint" + version = "0.4.3" +@@ -2881,9 +2866,9 @@ dependencies = [ + + [[package]] + name = "object" +-version = "0.28.3" ++version = "0.28.4" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" +-checksum = "40bec70ba014595f99f7aa110b84331ffe1ee9aece7fe6f387cc7e3ecda4d456" ++checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424" dependencies = [ -- "autocfg 0.1.7", -+ "autocfg 0.1.8", - "rand_core 0.4.2", + "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", ] -@@ -3585,7 +3593,7 @@ version = "1.5.1" + [[package]] +@@ -2956,9 +2941,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + + [[package]] + name = "openssl-sys" +-version = "0.9.73" ++version = "0.9.74" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" +-checksum = "9d5fd19fb3e0a8191c1e34935718976a3e70c112ab9a24af6d7cadccd9d90bc0" ++checksum = "835363342df5fba8354c5b453325b110ffd54044e588c539cf2f20a8014e4cb1" dependencies = [ -- "autocfg 1.0.1", -+ "autocfg 1.1.0", - "crossbeam-deque 0.8.1", - "either 1.6.1", - "rayon-core", -@@ -3597,9 +3605,9 @@ version = "1.9.1" + "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 = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" +-checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" ++checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ -- "crossbeam-channel 0.5.1", -+ "crossbeam-channel 0.5.2", + "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", + "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 = [ + + [[package]] + name = "proc-macro2" +-version = "1.0.37" ++version = "1.0.39" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1" ++checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f" + dependencies = [ +- "unicode-xid 0.2.3", ++ "unicode-ident", + ] + + [[package]] +@@ -3505,11 +3490,11 @@ dependencies = [ + + [[package]] + name = "quote" +-version = "1.0.18" ++version = "1.0.19" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" ++checksum = "f53dc8cf16a769a6f677e09e7ff2cd4be1ea0f48754aac39520536962011de0d" + dependencies = [ +- "proc-macro2 1.0.37", ++ "proc-macro2 1.0.39", + ] + + [[package]] +@@ -3639,7 +3624,7 @@ version = "0.6.3" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" + dependencies = [ +- "getrandom 0.2.6", ++ "getrandom 0.2.7", + ] + + [[package]] +@@ -3715,9 +3700,9 @@ dependencies = [ + + [[package]] + name = "rayon" +-version = "1.5.2" ++version = "1.5.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fd249e82c21598a9a426a4e00dd7adc1d640b22445ec8545feef801d1a74c221" ++checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" + dependencies = [ + "autocfg 1.1.0", "crossbeam-deque 0.8.1", -- "crossbeam-utils 0.8.5", -+ "crossbeam-utils 0.8.7", - "lazy_static", +@@ -3727,13 +3712,13 @@ dependencies = [ + + [[package]] + name = "rayon-core" +-version = "1.9.2" ++version = "1.9.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9f51245e1e62e1f1629cbfec37b5793bbabcaeb90f30e94d2ba03564687353e4" ++checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" + 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", ] -@@ -3680,11 +3688,11 @@ dependencies = [ - "mime 0.3.16", - "mime_guess", - "native-tls", -- "serde 1.0.133", -+ "serde 1.0.136", + +@@ -3763,9 +3748,9 @@ dependencies = [ + + [[package]] + name = "regex" +-version = "1.5.5" ++version = "1.5.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" ++checksum = "d83f127d94bdbcda4c8cc2e50f6f84f4b611f69c902699ca385a39c3a75f9ff1" + dependencies = [ + "aho-corasick", + "memchr", +@@ -3816,7 +3801,7 @@ dependencies = [ + "serde 1.0.137", "serde_json", "serde_urlencoded 0.5.5", - "socks", - "time 0.1.43", + "time 0.1.44", "tokio 0.1.22", "tokio-executor", "tokio-io", -@@ -3719,8 +3727,8 @@ dependencies = [ - "native-tls", - "percent-encoding 2.1.0", - "pin-project-lite 0.2.8", -- "serde 1.0.133", -- "serde_urlencoded 0.7.0", -+ "serde 1.0.136", -+ "serde_urlencoded 0.7.1", - "tokio 0.2.25", - "tokio-tls", - "url 2.2.2", -@@ -3739,7 +3747,7 @@ dependencies = [ - "chrono", - "config", - "dashmap", -- "futures 0.3.19", -+ "futures 0.3.21", - "num_cpus", - "pin-utils", - "rand 0.7.3", -@@ -3789,7 +3797,7 @@ dependencies = [ +@@ -3838,7 +3823,7 @@ dependencies = [ + "encoding_rs", + "futures-core", + "futures-util", +- "http 0.2.7", ++ "http 0.2.8", + "http-body 0.3.1", + "hyper 0.13.10", + "hyper-tls 0.4.3", +@@ -3874,9 +3859,9 @@ dependencies = [ + "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", + "hyper-tls 0.5.0", + "ipnet", + "js-sys", +@@ -3959,7 +3944,7 @@ dependencies = [ "rocket_codegen", "rocket_http", "state", @@ -1136,366 +851,183 @@ index 80a194d..f5270c2 100644 "toml 0.4.10", "version_check 0.9.4", "yansi", -@@ -3819,7 +3827,7 @@ dependencies = [ - "log 0.4.14", - "notify", - "rocket", -- "serde 1.0.133", -+ "serde 1.0.136", - "serde_json", - ] - -@@ -3831,8 +3839,8 @@ dependencies = [ - "data-encoding", +@@ -4002,7 +3987,7 @@ dependencies = [ "ring", "rocket", -- "serde 1.0.133", + "serde 1.0.137", - "time 0.1.43", -+ "serde 1.0.136", + "time 0.1.44", ] [[package]] -@@ -3846,9 +3854,9 @@ dependencies = [ - "indexmap", - "pear", +@@ -4018,7 +4003,7 @@ dependencies = [ "percent-encoding 1.0.1", -- "smallvec 1.7.0", -+ "smallvec 1.8.0", + "smallvec 1.8.0", "state", - "time 0.1.43", + "time 0.1.44", "unicode-xid 0.1.0", ] -@@ -3873,9 +3881,9 @@ dependencies = [ +@@ -4046,9 +4031,9 @@ dependencies = [ [[package]] name = "rsass" --version = "0.23.0" -+version = "0.23.4" +-version = "0.25.0" ++version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8da5895d80d89e1b59f12ac5433919a32a1495267d5e09189923420eec89b01c" -+checksum = "92bfc58e02cd215730b021f9e6f0f46e0a7e1f75aa558ca7a7492763fbe88df2" +-checksum = "c0a591e01b92182a881aa6d89df6e56c6923a6589662c0194921466024d7d78b" ++checksum = "0ab003a9ff922b4d7b1f5f383bc54645887ad278f534dfc65e071096fcb30023" dependencies = [ "fastrand", "lazy_static", -@@ -3912,7 +3920,7 @@ version = "1.2.0" +@@ -4107,9 +4092,9 @@ dependencies = [ + + [[package]] + name = "ryu" +-version = "1.0.9" ++version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "e46a2036019fdb888131db7a4c847a1063a7493f971ed94ea82c67eada63ca54" - dependencies = [ -- "serde 1.0.133", -+ "serde 1.0.136", - "serde_derive", - ] - -@@ -3979,9 +3987,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +-checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" ++checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695" [[package]] - name = "security-framework" --version = "2.4.2" -+version = "2.6.1" + name = "safemem" +@@ -4128,12 +4113,12 @@ dependencies = [ + + [[package]] + name = "schannel" +-version = "0.1.19" ++version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "525bc1abfda2e1998d152c45cf13e696f76d0a4972310b22fac1658b05df7c87" -+checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc" - dependencies = [ - "bitflags 1.3.2", - "core-foundation", -@@ -3992,9 +4000,9 @@ dependencies = [ - - [[package]] - name = "security-framework-sys" --version = "2.4.2" -+version = "2.6.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a9dd14d83160b528b7bfd66439110573efcfbe281b17fc2ca9f39f550d619c7e" -+checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" - dependencies = [ - "core-foundation-sys", - "libc", -@@ -4023,9 +4031,9 @@ checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8" - - [[package]] - name = "serde" --version = "1.0.133" -+version = "1.0.136" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "97565067517b60e2d1ea8b268e59ce036de907ac523ad83a0475da04e818989a" -+checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" - dependencies = [ - "serde_derive", - ] -@@ -4045,24 +4053,24 @@ dependencies = [ - - [[package]] - name = "serde_derive" --version = "1.0.133" -+version = "1.0.136" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ed201699328568d8d08208fdd080e3ff594e6c422e438b6705905da01005d537" -+checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" - dependencies = [ - "proc-macro2 1.0.36", -- "quote 1.0.14", -- "syn 1.0.85", -+ "quote 1.0.15", -+ "syn 1.0.86", - ] - - [[package]] - name = "serde_json" --version = "1.0.74" -+version = "1.0.79" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ee2bb9cd061c5865d345bb02ca49fcef1391741b672b54a0bf7b679badec3142" -+checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95" - dependencies = [ - "itoa 1.0.1", - "ryu", -- "serde 1.0.133", -+ "serde 1.0.136", - ] - - [[package]] -@@ -4082,20 +4090,20 @@ checksum = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a" - dependencies = [ - "dtoa", - "itoa 0.4.8", -- "serde 1.0.133", -+ "serde 1.0.136", - "url 1.7.2", - ] - - [[package]] - name = "serde_urlencoded" --version = "0.7.0" -+version = "0.7.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9" -+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" - dependencies = [ - "form_urlencoded", -- "itoa 0.4.8", -+ "itoa 1.0.1", - "ryu", -- "serde 1.0.133", -+ "serde 1.0.136", - ] - - [[package]] -@@ -4129,8 +4137,8 @@ dependencies = [ - "bitflags 1.3.2", - "itertools 0.8.2", - "proc-macro2 1.0.36", -- "quote 1.0.14", -- "syn 1.0.85", -+ "quote 1.0.15", -+ "syn 1.0.86", - ] - - [[package]] -@@ -4144,9 +4152,9 @@ dependencies = [ - - [[package]] - name = "siphasher" --version = "0.3.7" -+version = "0.3.9" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "533494a8f9b724d33625ab53c6c4800f7cc445895924a8ef649222dcb76e938b" -+checksum = "a86232ab60fa71287d7f2ddae4a7073f6b7aac33631c3015abb556f08c6d0a3e" - - [[package]] - name = "slab" -@@ -4193,9 +4201,9 @@ dependencies = [ - - [[package]] - name = "smallvec" --version = "1.7.0" -+version = "1.8.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309" -+checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" - - [[package]] - name = "snap" -@@ -4214,16 +4222,25 @@ dependencies = [ - "winapi 0.3.9", - ] - -+[[package]] -+name = "socket2" -+version = "0.4.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" -+dependencies = [ -+ "libc", -+ "winapi 0.3.9", -+] -+ - [[package]] - name = "socks" --version = "0.3.3" -+version = "0.3.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "30f86c7635fadf2814201a4f67efefb0007588ae7422ce299f354ab5c97f61ae" -+checksum = "f0c3dbbd9ae980613c6dd8e28a9407b50509d3803b57624d5dfe8315218cd58b" - dependencies = [ - "byteorder 1.4.3", - "libc", -- "winapi 0.2.8", -- "ws2_32-sys", -+ "winapi 0.3.9", - ] - - [[package]] -@@ -4255,16 +4272,16 @@ dependencies = [ - - [[package]] - name = "string_cache" --version = "0.8.2" -+version = "0.8.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "923f0f39b6267d37d23ce71ae7235602134b250ace715dd2c90421998ddac0c6" -+checksum = "33994d0838dc2d152d17a62adf608a869b5e846b65b389af7f3dbc1de45c5b26" +-checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" ++checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" dependencies = [ "lazy_static", - "new_debug_unreachable", - "parking_lot 0.11.2", -- "phf_shared", -+ "phf_shared 0.10.0", - "precomputed-hash", -- "serde 1.0.133", -+ "serde 1.0.136", +- "winapi 0.3.9", ++ "windows-sys", ] [[package]] -@@ -4274,9 +4291,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "f24c8e5e19d22a726626f1a5e16fe15b132dcf21d10177fa5a45ce7962996b97" +@@ -4142,7 +4127,7 @@ version = "0.2.6" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "977a7519bff143a44f842fd07e80ad1329295bd71686457f18e496736f4bf9bf" + dependencies = [ +- "parking_lot 0.12.0", ++ "parking_lot 0.12.1", + ] + + [[package]] +@@ -4223,9 +4208,9 @@ version = "1.0.137" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be" + 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]] +@@ -4234,7 +4219,7 @@ version = "1.0.81" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c" + dependencies = [ +- "itoa 1.0.1", ++ "itoa 1.0.2", + "ryu", + "serde 1.0.137", + ] +@@ -4267,7 +4252,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" + dependencies = [ + "form_urlencoded", +- "itoa 1.0.1", ++ "itoa 1.0.2", + "ryu", + "serde 1.0.137", + ] +@@ -4302,9 +4287,9 @@ 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", + ] + + [[package]] +@@ -4442,7 +4427,7 @@ checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08" + dependencies = [ + "new_debug_unreachable", + "once_cell", +- "parking_lot 0.12.0", ++ "parking_lot 0.12.1", + "phf_shared", + "precomputed-hash", + "serde 1.0.137", +@@ -4456,8 +4441,8 @@ checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" dependencies = [ "phf_generator", -- "phf_shared", -+ "phf_shared 0.8.0", - "proc-macro2 1.0.36", -- "quote 1.0.14", -+ "quote 1.0.15", + "phf_shared", +- "proc-macro2 1.0.37", +- "quote 1.0.18", ++ "proc-macro2 1.0.39", ++ "quote 1.0.19", ] [[package]] -@@ -4348,12 +4365,12 @@ dependencies = [ +@@ -4513,13 +4498,13 @@ dependencies = [ [[package]] name = "syn" --version = "1.0.85" -+version = "1.0.86" +-version = "1.0.92" ++version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a684ac3dcd8913827e18cd09a68384ee66c1de24157e3c556c9ab16d85695fb7" -+checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b" +-checksum = "7ff7c592601f11445996a06f8ad0c27f094a58857c2f89e97974ab9235b92c52" ++checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" dependencies = [ - "proc-macro2 1.0.36", -- "quote 1.0.14", -+ "quote 1.0.15", - "unicode-xid 0.2.2", +- "proc-macro2 1.0.37", +- "quote 1.0.18", +- "unicode-xid 0.2.3", ++ "proc-macro2 1.0.39", ++ "quote 1.0.19", ++ "unicode-ident", ] -@@ -4373,8 +4390,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] +@@ -4528,9 +4513,9 @@ version = "0.12.6" + source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ - "proc-macro2 1.0.36", -- "quote 1.0.14", -- "syn 1.0.85", -+ "quote 1.0.15", -+ "syn 1.0.86", - "unicode-xid 0.2.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", + "unicode-xid 0.2.3", ] -@@ -4393,7 +4410,7 @@ dependencies = [ - "onig", - "plist", - "regex-syntax 0.6.25", -- "serde 1.0.133", -+ "serde 1.0.136", - "serde_derive", - "serde_json", - "walkdir", -@@ -4419,7 +4436,7 @@ dependencies = [ - "failure", - "fnv", - "fs2", -- "futures 0.3.19", -+ "futures 0.3.21", - "htmlescape", - "levenshtein_automata", - "log 0.4.14", -@@ -4433,9 +4450,9 @@ dependencies = [ - "rayon", - "regex", - "rust-stemmers", -- "serde 1.0.133", -+ "serde 1.0.136", - "serde_json", -- "smallvec 1.7.0", -+ "smallvec 1.8.0", - "snap", - "stable_deref_trait", - "tantivy-fst", -@@ -4462,7 +4479,7 @@ dependencies = [ - "fail", - "fnv", - "fs2", -- "futures 0.3.19", -+ "futures 0.3.21", - "htmlescape", - "levenshtein_automata", - "log 0.4.14", -@@ -4474,9 +4491,9 @@ dependencies = [ - "rayon", - "regex", - "rust-stemmers", -- "serde 1.0.133", -+ "serde 1.0.136", - "serde_json", -- "smallvec 1.7.0", -+ "smallvec 1.8.0", - "snap", - "stable_deref_trait", - "tantivy-fst", -@@ -4545,13 +4562,13 @@ dependencies = [ - - [[package]] - name = "tempfile" --version = "3.2.0" -+version = "3.3.0" +@@ -4742,9 +4727,9 @@ version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" -+checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" + checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" dependencies = [ - "cfg-if 1.0.0", -+ "fastrand", - "libc", -- "rand 0.8.4", - "redox_syscall 0.2.10", - "remove_dir_all", - "winapi 0.3.9", -@@ -4593,37 +4610,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" - dependencies = [ - "proc-macro2 1.0.36", -- "quote 1.0.14", -- "syn 1.0.85", -+ "quote 1.0.15", -+ "syn 1.0.86", +- "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]] - name = "thread_local" --version = "1.1.3" -+version = "1.1.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd" -+checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" - dependencies = [ - "once_cell", - ] +@@ -4758,11 +4743,12 @@ dependencies = [ [[package]] name = "time" @@ -1510,217 +1042,159 @@ index 80a194d..f5270c2 100644 "winapi 0.3.9", ] - [[package]] - name = "time" --version = "0.3.5" -+version = "0.3.7" +@@ -4772,7 +4758,7 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "41effe7cfa8af36f439fac33861b66b049edc6f9a32331e2312660529c1c24ad" -+checksum = "004cbc98f30fa233c61a38bc77e96a9106e65c88f2d3bef182ae952027e5753d" + checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd" dependencies = [ -- "itoa 0.4.8", -+ "itoa 1.0.1", +- "itoa 1.0.1", ++ "itoa 1.0.2", "libc", -+ "num_threads", + "num_threads", ] - - [[package]] -@@ -4700,15 +4719,16 @@ dependencies = [ - - [[package]] - name = "tokio" --version = "1.15.0" -+version = "1.17.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fbbf1c778ec206785635ce8ad57fe52b3009ae9e0c9f574a728f3049d3e55838" -+checksum = "2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee" - dependencies = [ +@@ -4853,14 +4839,14 @@ dependencies = [ "bytes 1.1.0", "libc", "memchr", -- "mio 0.7.14", -+ "mio 0.8.0", - "pin-project-lite 0.2.8", -+ "socket2 0.4.4", - "tokio-macros 1.7.0", +- "mio 0.8.2", ++ "mio 0.8.4", + "num_cpus", + "once_cell", +- "parking_lot 0.12.0", ++ "parking_lot 0.12.1", + "pin-project-lite 0.2.9", + "signal-hook-registry", + "socket2 0.4.4", +- "tokio-macros 1.7.0", ++ "tokio-macros 1.8.0", "winapi 0.3.9", ] -@@ -4784,8 +4804,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + +@@ -4912,20 +4898,20 @@ version = "0.2.6" + source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" dependencies = [ - "proc-macro2 1.0.36", -- "quote 1.0.14", -- "syn 1.0.85", -+ "quote 1.0.15", -+ "syn 1.0.86", +- "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]] -@@ -4795,8 +4815,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" + name = "tokio-macros" +-version = "1.7.0" ++version = "1.8.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" ++checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" dependencies = [ - "proc-macro2 1.0.36", -- "quote 1.0.14", -- "syn 1.0.85", -+ "quote 1.0.15", -+ "syn 1.0.86", +- "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]] -@@ -4806,7 +4826,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" - dependencies = [ - "native-tls", -- "tokio 1.15.0", -+ "tokio 1.17.0", - ] +@@ -4971,9 +4957,9 @@ dependencies = [ [[package]] -@@ -4836,7 +4856,7 @@ checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3" + name = "tokio-stream" +-version = "0.1.8" ++version = "0.1.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3" ++checksum = "df54d54117d6fdc4e4fea40fe1e4e566b3505700e148a6827e59b34b0d2600d9" dependencies = [ "futures-core", - "pin-project-lite 0.2.8", -- "tokio 1.15.0", -+ "tokio 1.17.0", - ] + "pin-project-lite 0.2.9", +@@ -5059,9 +5045,9 @@ dependencies = [ [[package]] -@@ -4960,7 +4980,7 @@ dependencies = [ - "futures-sink", - "log 0.4.14", - "pin-project-lite 0.2.8", -- "tokio 1.15.0", -+ "tokio 1.17.0", - ] - - [[package]] -@@ -4969,7 +4989,7 @@ version = "0.4.10" + name = "tokio-util" +-version = "0.7.1" ++version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" +-checksum = "0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764" ++checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45" dependencies = [ -- "serde 1.0.133", -+ "serde 1.0.136", - ] + "bytes 1.1.0", + "futures-core", +@@ -5091,9 +5077,9 @@ dependencies = [ [[package]] -@@ -4978,7 +4998,7 @@ version = "0.5.8" + name = "tower-service" +-version = "0.3.1" ++version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" - dependencies = [ -- "serde 1.0.133", -+ "serde 1.0.136", - ] - - [[package]] -@@ -4989,9 +5009,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" +-checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" ++checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" --version = "0.1.29" -+version = "0.1.31" +@@ -5114,9 +5100,9 @@ version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105" -+checksum = "f6c650a8ef0cd2dd93736f033d21cbd1224c5a967aa0c258d00fcf7dafef9b9f" + checksum = "cc6b8ad3567499f98a1db7a752b07a7c8c7c7c34c332ec00effb2b0027974b7c" dependencies = [ - "cfg-if 1.0.0", - "log 0.4.14", -@@ -5002,22 +5022,23 @@ dependencies = [ - - [[package]] - name = "tracing-attributes" --version = "0.1.18" -+version = "0.1.19" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e" -+checksum = "8276d9a4a3a558d7b7ad5303ad50b53d58264641b82914b7ada36bd762e7a716" - dependencies = [ - "proc-macro2 1.0.36", -- "quote 1.0.14", -- "syn 1.0.85", -+ "quote 1.0.15", -+ "syn 1.0.86", +- "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]] - name = "tracing-core" --version = "0.1.21" -+version = "0.1.22" +@@ -5230,6 +5216,12 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4" -+checksum = "03cfcb51380632a72d3111cb8d3447a8d908e577d31beeac006f836383d29a23" - dependencies = [ - "lazy_static", -+ "valuable", - ] + checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" ++[[package]] ++name = "unicode-ident" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c" ++ [[package]] -@@ -5043,13 +5064,13 @@ dependencies = [ - - [[package]] - name = "tracing-subscriber" --version = "0.3.5" -+version = "0.3.9" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5d81bfa81424cc98cb034b837c985b7a290f592e5b4322f353f94a0ab0f9f594" -+checksum = "9e0ab7bdc962035a87fba73f3acca9b8a8d0034c2e6f60b84aeaaddddc155dce" - dependencies = [ - "ansi_term", - "sharded-slab", -- "smallvec 1.7.0", -+ "smallvec 1.8.0", - "thread_local", - "tracing-core", - "tracing-log", -@@ -5220,8 +5241,8 @@ version = "0.8.2" + name = "unicode-normalization" + version = "0.1.19" +@@ -5323,7 +5315,7 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ -- "getrandom 0.2.3", -- "serde 1.0.133", -+ "getrandom 0.2.5", -+ "serde 1.0.136", +- "getrandom 0.2.6", ++ "getrandom 0.2.7", + "serde 1.0.137", ] - [[package]] -@@ -5233,7 +5254,7 @@ dependencies = [ - "idna 0.2.3", - "lazy_static", - "regex", -- "serde 1.0.133", -+ "serde 1.0.136", - "serde_derive", - "serde_json", - "url 2.2.2", -@@ -5251,9 +5272,9 @@ dependencies = [ +@@ -5352,10 +5344,10 @@ dependencies = [ + "if_chain", "lazy_static", "proc-macro-error", - "proc-macro2 1.0.36", -- "quote 1.0.14", -+ "quote 1.0.15", +- "proc-macro2 1.0.37", +- "quote 1.0.18", ++ "proc-macro2 1.0.39", ++ "quote 1.0.19", "regex", -- "syn 1.0.85", -+ "syn 1.0.86", +- "syn 1.0.92", ++ "syn 1.0.98", "validator_types", ] -@@ -5264,9 +5285,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "ded9d97e1d42327632f5f3bae6403c04886e2de3036261ef42deebd931a6a291" +@@ -5365,8 +5357,8 @@ version = "0.15.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "d2ddf34293296847abfc1493b15c6e2f5d3cd19f57ad7d22673bf4c6278da329" dependencies = [ - "proc-macro2 1.0.36", -- "syn 1.0.85", -+ "syn 1.0.86", +- "proc-macro2 1.0.37", +- "syn 1.0.92", ++ "proc-macro2 1.0.39", ++ "syn 1.0.98", ] -+[[package]] -+name = "valuable" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" -+ [[package]] - name = "vcpkg" - version = "0.2.15" -@@ -5337,9 +5364,9 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" +@@ -5445,9 +5437,9 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "wasi" @@ -1731,67 +1205,54 @@ index 80a194d..f5270c2 100644 +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" [[package]] - name = "wasm-bindgen" -@@ -5348,7 +5375,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce" - dependencies = [ - "cfg-if 1.0.0", -- "serde 1.0.133", -+ "serde 1.0.136", - "serde_json", - "wasm-bindgen-macro", - ] -@@ -5363,8 +5390,8 @@ dependencies = [ + name = "wasi" +@@ -5476,17 +5468,17 @@ dependencies = [ + "bumpalo", "lazy_static", - "log 0.4.14", - "proc-macro2 1.0.36", -- "quote 1.0.14", -- "syn 1.0.85", -+ "quote 1.0.15", -+ "syn 1.0.86", + "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", "wasm-bindgen-shared", ] -@@ -5386,7 +5413,7 @@ version = "0.2.78" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9" - dependencies = [ -- "quote 1.0.14", -+ "quote 1.0.15", - "wasm-bindgen-macro-support", - ] - -@@ -5397,8 +5424,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab" - dependencies = [ - "proc-macro2 1.0.36", -- "quote 1.0.14", -- "syn 1.0.85", -+ "quote 1.0.15", -+ "syn 1.0.86", - "wasm-bindgen-backend", - "wasm-bindgen-shared", - ] -@@ -5426,7 +5453,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "ec24b1b0700d4b466d280228ed0f62274eedeaa80206820f071fdc8ed787b664" - dependencies = [ - "reqwest 0.9.24", -- "serde 1.0.133", -+ "serde 1.0.136", - "serde_derive", - ] - -@@ -5549,7 +5576,7 @@ dependencies = [ - "log 0.4.14", - "mac", - "markup5ever", -- "time 0.1.43", -+ "time 0.1.44", - ] - [[package]] + name = "wasm-bindgen-futures" +-version = "0.4.30" ++version = "0.4.31" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6f741de44b75e14c35df886aff5f1eb73aa114fa5d4d00dcd37b5e01259bf3b2" ++checksum = "de9a9cec1733468a8c657e57fa2413d2ae2c0129b95e87c5b72b8ace4d13f31f" + dependencies = [ + "cfg-if 1.0.0", + "js-sys", +@@ -5500,7 +5492,7 @@ version = "0.2.81" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "c441e177922bc58f1e12c022624b6216378e5febc2f0533e41ba443d505b80aa" + dependencies = [ +- "quote 1.0.18", ++ "quote 1.0.19", + "wasm-bindgen-macro-support", + ] + +@@ -5510,9 +5502,9 @@ version = "0.2.81" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "7d94ac45fcf608c1f45ef53e748d35660f168490c10b23704c7779ab8f5c3048" + 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", + "wasm-bindgen-backend", + "wasm-bindgen-shared", + ] diff --git a/Cargo.toml b/Cargo.toml -index 3b969ea..fdb422d 100644 +index 3632d47f..030b226e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -77,3 +77,6 @@ search-lindera = ["plume-models/search-lindera"] @@ -1802,18 +1263,18 @@ index 3b969ea..fdb422d 100644 +[patch.crates-io] +conv = { path = "rust-conv" } diff --git a/plume-front/Cargo.toml b/plume-front/Cargo.toml -index 40a7f8b..28e4855 100644 +index 3ea82f17..b30b07c5 100644 --- a/plume-front/Cargo.toml +++ b/plume-front/Cargo.toml -@@ -14,7 +14,7 @@ gettext-utils = { git = "https://github.com/Plume-org/gettext-macros/", rev = "a +@@ -14,7 +14,7 @@ gettext-utils = "0.1.0" lazy_static = "1.3" serde = "1.0" serde_json = "1.0" --wasm-bindgen = "0.2.70" -+wasm-bindgen = "=0.2.78" - js-sys = "0.3.47" +-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" -- -2.35.1 +2.36.0 diff --git a/overlay/plume/default.nix b/overlay/plume/default.nix index 30d943de..0aa03866 100644 --- a/overlay/plume/default.nix +++ b/overlay/plume/default.nix @@ -1,6 +1,7 @@ { naersk, fenix -, stdenv, fetchFromGitHub, buildEnv -, pkg-config, gettext, wasm-pack, wasm-bindgen-cli, binaryen +, curl, nodejs, rustPlatform +, stdenv, fetchFromGitHub, buildEnv, fetchCrate +, pkg-config, gettext, wasm-pack, binaryen , openssl, postgresql }: @@ -24,14 +25,35 @@ let 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 = "90a1e85edcc6d63616436a6049b08ba87c76d703"; + rev = "90a1e85edcc6d63616438a6049b08ba87c76d703"; sha256 = "029xq9cabz3scbmd84b8qkrg0q7x6fm27ijq869lkpq8bwjxvcb6"; }; - version = "0.7.1"; + version = "0.7.2-1"; src = stdenv.mkDerivation { pname = "plume-src"; @@ -39,8 +61,9 @@ let src = fetchFromGitHub { owner = "Plume-org"; repo = "Plume"; - rev = version; - sha256 = "01mgg9ngpjinlwbgm2s287namilm3ddlwpn0hjs6267608vjgi04"; + # rev = version; + rev = "620726cc2564ededb98af42c3c2e35407fcf1184"; + sha256 = "sha256-B8EAV61qdTBGn+vGQZlXjAaSkEPs8wr9ZH1Roq3CZZs="; }; phases = [ "unpackPhase" "patchPhase" "installPhase" ]; patches = [ @@ -58,6 +81,7 @@ let nativeBuildInputs = [ pkg-config gettext + wasm-bindgen-cli ]; buildInputs = [ openssl