diff --git a/overlay/plume/0001-cargo-update.patch b/overlay/plume/0001-cargo-update.patch index fbbb2915..dbe8d7f3 100644 --- a/overlay/plume/0001-cargo-update.patch +++ b/overlay/plume/0001-cargo-update.patch @@ -1,23 +1,24 @@ -From 209a28fd8c6808ae2789cd60179678f6c025c8de Mon Sep 17 00:00:00 2001 +From fe3d8a09010dd069066dad0b0646951a31738cfb Mon Sep 17 00:00:00 2001 From: Astro -Date: Wed, 15 Dec 2021 23:28:59 +0100 +Date: Wed, 23 Feb 2022 21:39:34 +0100 Subject: [PATCH] cargo update --- - Cargo.lock | 274 +++++++++++++++++++++++++++-------------------------- - Cargo.toml | 3 + - 2 files changed, 143 insertions(+), 134 deletions(-) + Cargo.lock | 583 +++++++++++++++++++++-------------------- + Cargo.toml | 3 + + plume-front/Cargo.toml | 2 +- + 3 files changed, 309 insertions(+), 279 deletions(-) diff --git a/Cargo.lock b/Cargo.lock -index 0bd4131..2680376 100644 +index 80a194d..f5270c2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -11,7 +11,7 @@ dependencies = [ "activitystreams-derive", "activitystreams-traits", "activitystreams-types", -- "serde 1.0.130", -+ "serde 1.0.131", +- "serde 1.0.133", ++ "serde 1.0.136", "serde_derive", "serde_json", ] @@ -25,8 +26,8 @@ index 0bd4131..2680376 100644 checksum = "670ef03168e704b0cae242e7a5d8b40506772b339687e01a3496fc4afe2e8542" dependencies = [ "failure", -- "serde 1.0.130", -+ "serde 1.0.131", +- "serde 1.0.133", ++ "serde 1.0.136", "serde_json", ] @@ -34,85 +35,156 @@ index 0bd4131..2680376 100644 "activitystreams-traits", "chrono", "mime 0.3.16", -- "serde 1.0.130", -+ "serde 1.0.131", +- "serde 1.0.133", ++ "serde 1.0.136", "serde_derive", "serde_json", ] -@@ -165,15 +165,6 @@ dependencies = [ - "url 1.7.2", +@@ -137,7 +137,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", + "once_cell", + "version_check 0.9.4", ] +@@ -153,15 +153,14 @@ dependencies = [ --[[package]] --name = "ansi_term" --version = "0.11.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" --dependencies = [ -- "winapi 0.3.9", --] -- [[package]] - name = "ansi_term" - version = "0.12.1" -@@ -215,11 +206,11 @@ checksum = "719b48039ffac1564f67d70162109ba9341125cee0096a540e478355b3c724a7" + 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" [[package]] name = "async-trait" --version = "0.1.51" -+version = "0.1.52" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "44318e776df68115a881de9a8fd1b9e53368d7a4a5ce4cc48517da3393233a5e" -+checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3" +@@ -212,8 +211,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3" dependencies = [ -- "proc-macro2 1.0.32", -+ "proc-macro2 1.0.34", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", +- "quote 1.0.14", +- "syn 1.0.85", ++ "quote 1.0.15", ++ "syn 1.0.86", ] -@@ -357,7 +348,7 @@ version = "1.3.3" + + [[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" + dependencies = [ + "base64 0.13.0", + "blowfish", +- "getrandom 0.2.3", ++ "getrandom 0.2.5", + ] + + [[package]] +@@ -349,7 +351,7 @@ version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" dependencies = [ -- "serde 1.0.130", -+ "serde 1.0.131", +- "serde 1.0.133", ++ "serde 1.0.136", ] [[package]] -@@ -521,7 +512,7 @@ dependencies = [ +@@ -470,9 +472,9 @@ checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" + + [[package]] + name = "cc" +-version = "1.0.72" ++version = "1.0.73" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee" ++checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" + + [[package]] + name = "census" +@@ -513,8 +515,8 @@ dependencies = [ "libc", "num-integer", "num-traits 0.2.14", -- "serde 1.0.130", -+ "serde 1.0.131", - "time 0.1.43", +- "serde 1.0.133", +- "time 0.1.43", ++ "serde 1.0.136", ++ "time 0.1.44", "winapi 0.3.9", ] -@@ -546,11 +537,11 @@ dependencies = [ + +@@ -562,9 +564,9 @@ dependencies = [ [[package]] - name = "clap" --version = "2.33.3" -+version = "2.34.0" + name = "combine" +-version = "4.6.2" ++version = "4.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" -+checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +-checksum = "b2b2f5d0ee456f3928812dfc8c6d9a1d592b98678f6d56db9b0cd2b7bc6c8db5" ++checksum = "50b727aacc797f9fc28e355d21f34709ac4fc9adecfe470ad07b8f4464f53062" dependencies = [ -- "ansi_term 0.11.0", -+ "ansi_term", - "atty", - "bitflags 1.3.2", - "strsim", -@@ -586,7 +577,7 @@ dependencies = [ + "memchr", + ] +@@ -578,7 +580,7 @@ dependencies = [ "lazy_static", "nom 5.1.2", "rust-ini", -- "serde 1.0.130", -+ "serde 1.0.131", +- "serde 1.0.133", ++ "serde 1.0.136", "serde-hjson", "serde_json", "toml 0.5.8", -@@ -627,9 +618,7 @@ dependencies = [ +@@ -611,7 +613,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", + "lazy_static", + "proc-macro-hack 0.5.19", + "tiny-keccak", +@@ -619,9 +621,7 @@ dependencies = [ [[package]] name = "conv" @@ -123,854 +195,1625 @@ index 0bd4131..2680376 100644 dependencies = [ "custom_derive", ] -@@ -671,7 +660,7 @@ dependencies = [ +@@ -637,9 +637,9 @@ dependencies = [ + "hkdf", + "hmac", + "percent-encoding 2.1.0", +- "rand 0.8.4", ++ "rand 0.8.5", + "sha2", +- "time 0.1.43", ++ "time 0.1.44", + ] + + [[package]] +@@ -648,7 +648,7 @@ version = "0.12.0" + 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", + ] + +@@ -663,18 +663,18 @@ dependencies = [ "idna 0.1.5", "log 0.4.14", "publicsuffix", -- "serde 1.0.130", -+ "serde 1.0.131", +- "serde 1.0.133", ++ "serde 1.0.136", "serde_json", - "time 0.1.43", +- "time 0.1.43", ++ "time 0.1.44", "try_from", -@@ -711,9 +700,9 @@ checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" + "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.2.2" -+version = "1.3.0" +-version = "1.3.0" ++version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3825b1e8580894917dc4468cb634a1b4e9745fddc854edad72d9c04644c0319f" -+checksum = "738c290dfaea84fc1ca15ad9c168d083b05a714e1efddd8edaab678dc28d2836" +-checksum = "738c290dfaea84fc1ca15ad9c168d083b05a714e1efddd8edaab678dc28d2836" ++checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ "cfg-if 1.0.0", ] -@@ -812,7 +801,7 @@ dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils 0.8.5", - "lazy_static", -- "memoffset 0.6.4", -+ "memoffset 0.6.5", - "scopeguard", - ] - -@@ -1027,7 +1016,7 @@ version = "1.4.1" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "45f5098f628d02a7a0f68ddba586fb61e80edec3bdc1be3b921f4ceec60858d3" +@@ -731,11 +731,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "4ae5588f6b3c3cb05239e90bd110f257254aecd01e4635400391aeae07497845" dependencies = [ -- "proc-macro2 1.0.32", -+ "proc-macro2 1.0.34", - "quote 1.0.10", - "syn 1.0.82", + "cfg-if 1.0.0", +- "crossbeam-channel 0.5.1", ++ "crossbeam-channel 0.5.2", + "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", ] -@@ -1173,9 +1162,9 @@ checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" [[package]] - name = "encoding_rs" --version = "0.8.29" -+version = "0.8.30" +@@ -750,12 +750,12 @@ dependencies = [ + + [[package]] + name = "crossbeam-channel" +-version = "0.5.1" ++version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a74ea89a0a1b98f6332de42c95baff457ada66d1cb4030f9ff151b2041a1c746" -+checksum = "7896dc8abb250ffdda33912550faa54c88ec8b998dec0b2c55ab224921ce11df" +-checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" ++checksum = "e54ea8bc3fb1ee042f5aace6e3c6e025d3874866da222930f70ce62aceba0bfa" dependencies = [ "cfg-if 1.0.0", +- "crossbeam-utils 0.8.5", ++ "crossbeam-utils 0.8.7", ] -@@ -1207,7 +1196,7 @@ version = "0.1.8" + + [[package]] +@@ -776,8 +776,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", + ] + + [[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 = [ + + [[package]] + name = "crossbeam-epoch" +-version = "0.9.5" ++version = "0.9.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" ++checksum = "c00d6d2ea26e8b151d99093005cb442fb9a37aeaca582a03ec70946f49ab5ed9" + dependencies = [ + "cfg-if 1.0.0", +- "crossbeam-utils 0.8.5", ++ "crossbeam-utils 0.8.7", + "lazy_static", + "memoffset 0.6.5", + "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" + dependencies = [ + "cfg-if 1.0.0", +- "crossbeam-utils 0.8.5", ++ "crossbeam-utils 0.8.7", + ] + + [[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", + ] + + [[package]] + name = "crossbeam-utils" +-version = "0.8.5" ++version = "0.8.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" ++checksum = "b5e5bed1f1c269533fa816a0a5492b3545209a205ca1a54842be180eb63a16a6" + 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", + ] + + [[package]] +@@ -1084,7 +1084,7 @@ dependencies = [ + "encoding", + "lazy_static", + "rand 0.4.6", +- "time 0.1.43", ++ "time 0.1.44", + "version_check 0.1.5", + ] + +@@ -1189,8 +1189,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" dependencies = [ -- "proc-macro2 1.0.32", -+ "proc-macro2 1.0.34", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", +- "quote 1.0.14", +- "syn 1.0.85", ++ "quote 1.0.15", ++ "syn 1.0.86", "synstructure", -@@ -1352,9 +1341,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" + ] + +@@ -1205,9 +1205,9 @@ dependencies = [ + + [[package]] + name = "fastrand" +-version = "1.6.0" ++version = "1.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "779d043b6a0b90cc4c0ed7ee380a6504394cee7efd7db050e3774eee387324b2" ++checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf" + dependencies = [ + "instant", + ] +@@ -1326,9 +1326,9 @@ checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" + + [[package]] + name = "futf" +-version = "0.1.4" ++version = "0.1.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7c9c1ce3fa9336301af935ab852c437817d14cd33690446569392e65170aac3b" ++checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" + dependencies = [ + "mac", + "new_debug_unreachable", +@@ -1342,9 +1342,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" --version = "0.3.18" -+version = "0.3.17" +-version = "0.3.19" ++version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8cd0210d8c325c245ff06fd95a3b13689a1a276ac8cfa8e8720cb840bfb84b9e" -+checksum = "a12aa0eb539080d55c3f2d45a67c3b58b6b0773c1a3ca2dfec66d58c97fd66ca" +-checksum = "28560757fe2bb34e79f907794bb6b22ae8b0e5c669b638a1132f2592b19035b4" ++checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" dependencies = [ "futures-channel", "futures-core", -@@ -1367,9 +1356,9 @@ dependencies = [ +@@ -1357,9 +1357,9 @@ dependencies = [ [[package]] name = "futures-channel" --version = "0.3.18" -+version = "0.3.17" +-version = "0.3.19" ++version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7fc8cd39e3dbf865f7340dce6a2d401d24fd37c6fe6c4f0ee0de8bfca2252d27" -+checksum = "5da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888" +-checksum = "ba3dda0b6588335f360afc675d0564c17a77a2bda81ca178a4b6081bd86c7f0b" ++checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" dependencies = [ "futures-core", "futures-sink", -@@ -1377,9 +1366,9 @@ dependencies = [ +@@ -1367,9 +1367,9 @@ dependencies = [ [[package]] name = "futures-core" --version = "0.3.18" -+version = "0.3.17" +-version = "0.3.19" ++version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "629316e42fe7c2a0b9a65b47d159ceaa5453ab14e8f0a3c5eedbb8cd55b4a445" -+checksum = "88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d" +-checksum = "d0c8ff0461b82559810cdccfde3215c3f373807f5e5232b71479bff7bb2583d7" ++checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" [[package]] name = "futures-cpupool" -@@ -1393,9 +1382,9 @@ dependencies = [ +@@ -1383,9 +1383,9 @@ dependencies = [ [[package]] name = "futures-executor" --version = "0.3.18" -+version = "0.3.17" +-version = "0.3.19" ++version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7b808bf53348a36cab739d7e04755909b9fcaaa69b7d7e588b37b6ec62704c97" -+checksum = "45025be030969d763025784f7f355043dc6bc74093e4ecc5000ca4dc50d8745c" +-checksum = "29d6d2ff5bb10fb95c85b8ce46538a2e5f5e7fdc755623a7d4529ab8a4ed9d2a" ++checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" dependencies = [ "futures-core", "futures-task", -@@ -1405,39 +1394,42 @@ dependencies = [ +@@ -1395,38 +1395,38 @@ dependencies = [ [[package]] name = "futures-io" --version = "0.3.18" -+version = "0.3.17" +-version = "0.3.19" ++version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e481354db6b5c353246ccf6a728b0c5511d752c08da7260546fc0933869daa11" -+checksum = "522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377" +-checksum = "b1f9d34af5a1aac6fb380f735fe510746c38067c5bf16c7fd250280503c971b2" ++checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" [[package]] name = "futures-macro" --version = "0.3.18" -+version = "0.3.17" +-version = "0.3.19" ++version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a89f17b21645bc4ed773c69af9c9a0effd4a3f1a3876eadd453469f8854e7fdd" -+checksum = "18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb" +-checksum = "6dbd947adfffb0efc70599b3ddcf7b5597bb5fa9e245eb99f62b3a5f7bb8bd3c" ++checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" dependencies = [ -- "proc-macro2 1.0.32", -+ "autocfg 1.0.1", -+ "proc-macro-hack 0.5.19", -+ "proc-macro2 1.0.34", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", +- "quote 1.0.14", +- "syn 1.0.85", ++ "quote 1.0.15", ++ "syn 1.0.86", ] [[package]] name = "futures-sink" --version = "0.3.18" -+version = "0.3.17" +-version = "0.3.19" ++version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "996c6442437b62d21a32cd9906f9c41e7dc1e19a9579843fad948696769305af" -+checksum = "36ea153c13024fe480590b3e3d4cad89a0cfacecc24577b68f86c6ced9c2bc11" +-checksum = "e3055baccb68d74ff6480350f8d6eb8fcfa3aa11bdc1a1ae3afdd0514617d508" ++checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" [[package]] name = "futures-task" --version = "0.3.18" -+version = "0.3.17" +-version = "0.3.19" ++version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "dabf1872aaab32c886832f2276d2f5399887e2bd613698a02359e4ea83f8de12" -+checksum = "1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99" +-checksum = "6ee7c6485c30167ce4dfb83ac568a849fe53274c831081476ee13e0dce1aad72" ++checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" [[package]] name = "futures-util" --version = "0.3.18" -+version = "0.3.17" +-version = "0.3.19" ++version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "41d22213122356472061ac0f1ab2cee28d2bac8491410fd68c2af53d1cedb83e" -+checksum = "36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481" +-checksum = "d9b5cf40b47a271f77a8b1bec03ca09044d99d2372c0de244e66430761127164" ++checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" dependencies = [ -+ "autocfg 1.0.1", "futures-channel", "futures-core", - "futures-io", -@@ -1447,6 +1439,8 @@ dependencies = [ - "memchr", - "pin-project-lite 0.2.7", - "pin-utils", -+ "proc-macro-hack 0.5.19", -+ "proc-macro-nested", - "slab", - ] +@@ -1463,13 +1463,13 @@ dependencies = [ -@@ -1718,7 +1712,7 @@ checksum = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0" + [[package]] + name = "getrandom" +-version = "0.2.3" ++version = "0.2.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" ++checksum = "d39cd93900197114fa1fcb7ae84ca742095eed9442088988ae74fa744e930e77" dependencies = [ - "bytes 0.4.12", - "fnv", -- "itoa", -+ "itoa 0.4.8", + "cfg-if 1.0.0", + "libc", +- "wasi 0.10.2+wasi-snapshot-preview1", ++ "wasi 0.10.0+wasi-snapshot-preview1", ] [[package]] -@@ -1729,7 +1723,7 @@ checksum = "1323096b05d41827dadeaee54c9981958c0f94e670bc94ed80037d1a7b8b186b" +@@ -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" dependencies = [ - "bytes 1.1.0", - "fnv", -- "itoa", -+ "itoa 0.4.8", + "ahash 0.3.8", +- "autocfg 1.0.1", ++ "autocfg 1.1.0", ] [[package]] -@@ -1799,7 +1793,7 @@ dependencies = [ - "http-body 0.1.0", - "httparse", - "iovec", -- "itoa", -+ "itoa 0.4.8", +@@ -1687,8 +1687,8 @@ dependencies = [ + "mac", + "markup5ever", + "proc-macro2 1.0.36", +- "quote 1.0.14", +- "syn 1.0.85", ++ "quote 1.0.15", ++ "syn 1.0.86", + ] + + [[package]] +@@ -1743,9 +1743,9 @@ dependencies = [ + + [[package]] + name = "httparse" +-version = "1.5.1" ++version = "1.6.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503" ++checksum = "9100414882e15fb7feccb4897e5f0ff0ff1ca7d1a86a23208ada4d7a18e6c6c4" + + [[package]] + name = "httpdate" +@@ -1765,7 +1765,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", +@@ -1790,7 +1790,7 @@ dependencies = [ "log 0.4.14", "net2", "rustc_version", -@@ -1830,7 +1824,7 @@ dependencies = [ - "http-body 0.3.1", - "httparse", +- "time 0.1.43", ++ "time 0.1.44", + "tokio 0.1.22", + "tokio-buf", + "tokio-executor", +@@ -1819,7 +1819,7 @@ dependencies = [ "httpdate", -- "itoa", -+ "itoa 0.4.8", + "itoa 0.4.8", "pin-project", - "socket2", +- "socket2", ++ "socket2 0.3.19", "tokio 0.2.25", -@@ -1958,9 +1952,9 @@ dependencies = [ + "tower-service", + "tracing", +@@ -1882,11 +1882,11 @@ checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" [[package]] - name = "itertools" --version = "0.10.1" -+version = "0.10.3" + name = "indexmap" +-version = "1.7.0" ++version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf" -+checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" +-checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" ++checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223" dependencies = [ - "either 1.6.1", +- "autocfg 1.0.1", ++ "autocfg 1.1.0", + "hashbrown 0.11.2", ] -@@ -1971,6 +1965,12 @@ version = "0.4.8" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" -+[[package]] -+name = "itoa" -+version = "1.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" -+ - [[package]] - name = "js-sys" - version = "0.3.55" -@@ -2027,7 +2027,7 @@ checksum = "915f14e5fbd72f2f0816dcdbb98b56e7fe6d04dae6ed2c0395133b627aafda9e" +@@ -2020,7 +2020,7 @@ checksum = "b2bdad98cd197646a9fd7be985cb711cffaded69d8dc0d87d83f8d88bcbc1691" dependencies = [ "async-trait", - "bytes 0.5.6", -- "futures 0.3.18", -+ "futures 0.3.17", + "bytes 1.1.0", +- "futures 0.3.19", ++ "futures 0.3.21", "futures-util", "lazy_static", "lber", -@@ -2056,7 +2056,7 @@ dependencies = [ +@@ -2030,7 +2030,7 @@ dependencies = [ + "nom 2.2.1", + "percent-encoding 2.1.0", + "thiserror", +- "tokio 1.15.0", ++ "tokio 1.17.0", + "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.130", -+ "serde 1.0.131", +- "serde 1.0.133", ++ "serde 1.0.136", "serde_derive", "serde_json", ] -@@ -2096,9 +2096,9 @@ dependencies = [ +@@ -2065,7 +2065,7 @@ dependencies = [ + "email", + "lettre", + "mime 0.3.16", +- "time 0.1.43", ++ "time 0.1.44", + "uuid 0.7.4", + ] + +@@ -2090,9 +2090,9 @@ dependencies = [ [[package]] name = "libc" --version = "0.2.108" -+version = "0.2.112" +-version = "0.2.112" ++version = "0.2.119" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8521a1b57e76b1ec69af7599e75e38e7b7fad6610f037db8c79b127201b5d119" -+checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125" +-checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125" ++checksum = "1bf2e165bb3457c8e098ea76f3e3bc9db55f87aa90d52d0e6be741470916aaa4" [[package]] name = "libsqlite3-sys" -@@ -2123,7 +2123,7 @@ dependencies = [ +@@ -2117,7 +2117,7 @@ dependencies = [ "lindera-dictionary", "lindera-ipadic", "lindera-ipadic-builder", -- "serde 1.0.130", -+ "serde 1.0.131", +- "serde 1.0.133", ++ "serde 1.0.136", "serde_json", ] -@@ -2136,7 +2136,7 @@ dependencies = [ +@@ -2130,7 +2130,7 @@ dependencies = [ "bincode", "byteorder 1.4.3", "encoding", -- "serde 1.0.130", -+ "serde 1.0.131", +- "serde 1.0.133", ++ "serde 1.0.136", "yada", ] -@@ -2284,7 +2284,7 @@ dependencies = [ - "log 0.4.14", - "phf", - "phf_codegen", -- "serde 1.0.130", -+ "serde 1.0.131", - "serde_derive", - "serde_json", - "string_cache", -@@ -2346,9 +2346,9 @@ dependencies = [ +@@ -2223,9 +2223,9 @@ dependencies = [ [[package]] - name = "memoffset" --version = "0.6.4" -+version = "0.6.5" + name = "lock_api" +-version = "0.4.5" ++version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" -+checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +-checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109" ++checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b" dependencies = [ - "autocfg 1.0.1", + "scopeguard", ] -@@ -2369,7 +2369,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "9753f12909fd8d923f75ae5c3258cae1ed3c8ec052e1b38c93c21a6d157f789c" +@@ -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" dependencies = [ "migrations_internals", -- "proc-macro2 1.0.32", -+ "proc-macro2 1.0.34", - "quote 1.0.10", - "syn 1.0.82", - ] -@@ -2581,7 +2581,7 @@ dependencies = [ - "cc", - "cfg-if 1.0.0", - "libc", -- "memoffset 0.6.4", -+ "memoffset 0.6.5", + "proc-macro2 1.0.36", +- "quote 1.0.14", +- "syn 1.0.85", ++ "quote 1.0.15", ++ "syn 1.0.86", ] [[package]] -@@ -2699,9 +2699,9 @@ checksum = "1a5b3dd1c072ee7963717671d1ca129f1048fda25edea6b752bfc71ac8854170" +@@ -2385,9 +2385,9 @@ checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" [[package]] - name = "once_cell" --version = "1.8.0" -+version = "1.9.0" + name = "mime_guess" +-version = "2.0.3" ++version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" -+checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5" +-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" + dependencies = [ + "adler", +- "autocfg 1.0.1", ++ "autocfg 1.1.0", + ] [[package]] - name = "onig" -@@ -2753,9 +2753,9 @@ checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" +@@ -2430,9 +2430,9 @@ dependencies = [ + + [[package]] + name = "mio" +-version = "0.7.14" ++version = "0.8.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" ++checksum = "ba272f85fa0b41fc91872be579b3bbe0f56b792aa361a380eb669469f68dafb2" + 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 = [ + + [[package]] + name = "ntapi" +-version = "0.3.6" ++version = "0.3.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" ++checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" + dependencies = [ + "winapi 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" --version = "0.9.71" -+version = "0.9.72" +@@ -2800,7 +2809,7 @@ version = "0.9.72" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7df13d165e607909b363a4757a6f133f8a818a74e9d3a98d09c6128e15fa4c73" -+checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb" + checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb" dependencies = [ - "autocfg 1.0.1", +- "autocfg 1.0.1", ++ "autocfg 1.1.0", "cc", -@@ -2921,7 +2921,7 @@ version = "1.0.8" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389" + "libc", + "pkg-config", +@@ -2843,7 +2852,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ -- "proc-macro2 1.0.32", -+ "proc-macro2 1.0.34", - "quote 1.0.10", - "syn 1.0.82", + "instant", +- "lock_api 0.4.5", ++ "lock_api 0.4.6", + "parking_lot_core 0.8.5", ] -@@ -2946,9 +2946,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - [[package]] - name = "pkg-config" --version = "0.3.22" -+version = "0.3.24" +@@ -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 = "12295df4f294471248581bc09bef3c38a5e46f1e36d6a37353621a0c6c357e1f" -+checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe" + checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" + dependencies = [ +- "phf_shared", ++ "phf_shared 0.8.0", + ] [[package]] - name = "plist" -@@ -2959,7 +2959,7 @@ dependencies = [ +@@ -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.130", -+ "serde 1.0.131", - "time 0.3.5", +- "serde 1.0.133", +- "time 0.3.5", ++ "serde 1.0.136", ++ "time 0.3.7", "xml-rs", ] -@@ -2996,7 +2996,7 @@ dependencies = [ + +@@ -3035,7 +3053,7 @@ dependencies = [ "rsass", "ructe", "scheduled-thread-pool", -- "serde 1.0.130", -+ "serde 1.0.131", +- "serde 1.0.133", ++ "serde 1.0.136", "serde_json", - "shrinkwraprs 0.2.3", + "shrinkwraprs", "tracing", -@@ -3010,7 +3010,7 @@ dependencies = [ +@@ -3048,7 +3066,7 @@ dependencies = [ name = "plume-api" - version = "0.6.1-dev" + version = "0.7.1" dependencies = [ -- "serde 1.0.130", -+ "serde 1.0.131", +- "serde 1.0.133", ++ "serde 1.0.136", "serde_derive", ] -@@ -3044,7 +3044,7 @@ dependencies = [ +@@ -3082,7 +3100,7 @@ dependencies = [ "regex-syntax 0.6.25", "reqwest 0.9.24", "rocket", -- "serde 1.0.130", -+ "serde 1.0.131", +- "serde 1.0.133", ++ "serde 1.0.136", "serde_derive", "serde_json", - "shrinkwraprs 0.3.0", -@@ -3063,7 +3063,7 @@ dependencies = [ + "shrinkwraprs", +@@ -3101,7 +3119,7 @@ dependencies = [ "gettext-utils", "js-sys", "lazy_static", -- "serde 1.0.130", -+ "serde 1.0.131", +- "serde 1.0.133", ++ "serde 1.0.136", "serde_derive", "serde_json", "wasm-bindgen", -@@ -3108,7 +3108,7 @@ dependencies = [ +@@ -3147,7 +3165,7 @@ dependencies = [ "rocket", "rocket_i18n", "scheduled-thread-pool", -- "serde 1.0.130", -+ "serde 1.0.131", +- "serde 1.0.133", ++ "serde 1.0.136", "serde_derive", "serde_json", - "shrinkwraprs 0.2.3", -@@ -3173,6 +3173,12 @@ version = "0.4.3" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "7be55bf0ae1635f4d7c7ddd6efc05c631e98a82104a73d35550bbc52db960027" - -+[[package]] -+name = "proc-macro-nested" -+version = "0.1.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" -+ - [[package]] - name = "proc-macro2" - version = "0.2.3" -@@ -3202,9 +3208,9 @@ dependencies = [ - - [[package]] - name = "proc-macro2" --version = "1.0.32" -+version = "1.0.34" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ba508cc11742c0dc5c1659771673afbab7a0efab23aa17e854cbab0837ed0b43" -+checksum = "2f84e92c0f7c9d58328b85a78557813e4bd845130db68d7184635344399423b1" + "shrinkwraprs", +@@ -3199,8 +3217,8 @@ checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ - "unicode-xid 0.2.2", + "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", ] -@@ -3286,7 +3292,7 @@ version = "1.0.10" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05" + +@@ -3211,7 +3229,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ -- "proc-macro2 1.0.32", -+ "proc-macro2 1.0.34", + "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]] -@@ -3629,7 +3635,7 @@ dependencies = [ +@@ -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" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" +-dependencies = [ +- "rand_core 0.6.3", +-] +- + [[package]] + name = "rand_isaac" + version = "0.1.1" +@@ -3557,7 +3565,7 @@ version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" + dependencies = [ +- "autocfg 0.1.7", ++ "autocfg 0.1.8", + "rand_core 0.4.2", + ] + +@@ -3585,7 +3593,7 @@ version = "1.5.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" + 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" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" + dependencies = [ +- "crossbeam-channel 0.5.1", ++ "crossbeam-channel 0.5.2", + "crossbeam-deque 0.8.1", +- "crossbeam-utils 0.8.5", ++ "crossbeam-utils 0.8.7", + "lazy_static", + "num_cpus", + ] +@@ -3680,11 +3688,11 @@ dependencies = [ "mime 0.3.16", - "mime_guess 2.0.3", + "mime_guess", "native-tls", -- "serde 1.0.130", -+ "serde 1.0.131", +- "serde 1.0.133", ++ "serde 1.0.136", "serde_json", "serde_urlencoded 0.5.5", "socks", -@@ -3668,7 +3674,7 @@ dependencies = [ +- "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.7", -- "serde 1.0.130", -+ "serde 1.0.131", - "serde_urlencoded 0.7.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", -@@ -3688,7 +3694,7 @@ dependencies = [ + "url 2.2.2", +@@ -3739,7 +3747,7 @@ dependencies = [ "chrono", "config", "dashmap", -- "futures 0.3.18", -+ "futures 0.3.17", +- "futures 0.3.19", ++ "futures 0.3.21", "num_cpus", "pin-utils", "rand 0.7.3", -@@ -3768,7 +3774,7 @@ dependencies = [ +@@ -3789,7 +3797,7 @@ dependencies = [ + "rocket_codegen", + "rocket_http", + "state", +- "time 0.1.43", ++ "time 0.1.44", + "toml 0.4.10", + "version_check 0.9.4", + "yansi", +@@ -3819,7 +3827,7 @@ dependencies = [ "log 0.4.14", "notify", "rocket", -- "serde 1.0.130", -+ "serde 1.0.131", +- "serde 1.0.133", ++ "serde 1.0.136", "serde_json", ] -@@ -3780,7 +3786,7 @@ dependencies = [ +@@ -3831,8 +3839,8 @@ dependencies = [ "data-encoding", "ring", "rocket", -- "serde 1.0.130", -+ "serde 1.0.131", - "time 0.1.43", +- "serde 1.0.133", +- "time 0.1.43", ++ "serde 1.0.136", ++ "time 0.1.44", ] -@@ -3851,7 +3857,7 @@ checksum = "c6fd2f3b927021cc8586d365c36d16d82d91fdae0a3839819c12c8e86e0f929e" - dependencies = [ - "base64 0.13.0", - "bytecount", -- "itertools 0.10.1", -+ "itertools 0.10.3", - "md5", - "nom 6.2.1", + [[package]] +@@ -3846,9 +3854,9 @@ dependencies = [ + "indexmap", + "pear", + "percent-encoding 1.0.1", +- "smallvec 1.7.0", ++ "smallvec 1.8.0", + "state", +- "time 0.1.43", ++ "time 0.1.44", + "unicode-xid 0.1.0", ] -@@ -3868,7 +3874,7 @@ version = "1.2.0" + +@@ -3873,9 +3881,9 @@ dependencies = [ + + [[package]] + name = "rsass" +-version = "0.23.0" ++version = "0.23.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8da5895d80d89e1b59f12ac5433919a32a1495267d5e09189923420eec89b01c" ++checksum = "92bfc58e02cd215730b021f9e6f0f46e0a7e1f75aa558ca7a7492763fbe88df2" + dependencies = [ + "fastrand", + "lazy_static", +@@ -3912,7 +3920,7 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e46a2036019fdb888131db7a4c847a1063a7493f971ed94ea82c67eada63ca54" dependencies = [ -- "serde 1.0.130", -+ "serde 1.0.131", +- "serde 1.0.133", ++ "serde 1.0.136", "serde_derive", ] -@@ -3889,9 +3895,9 @@ dependencies = [ +@@ -3979,9 +3987,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] - name = "ryu" --version = "1.0.5" -+version = "1.0.9" + name = "security-framework" +-version = "2.4.2" ++version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" -+checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" +-checksum = "525bc1abfda2e1998d152c45cf13e696f76d0a4972310b22fac1658b05df7c87" ++checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc" + dependencies = [ + "bitflags 1.3.2", + "core-foundation", +@@ -3992,9 +4000,9 @@ dependencies = [ [[package]] - name = "safemem" -@@ -3979,9 +3985,9 @@ checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8" + 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.130" -+version = "1.0.131" +-version = "1.0.133" ++version = "1.0.136" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" -+checksum = "b4ad69dfbd3e45369132cc64e6748c2d65cdfb001a2b1c232d128b4ad60561c1" +-checksum = "97565067517b60e2d1ea8b268e59ce036de907ac523ad83a0475da04e818989a" ++checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" dependencies = [ "serde_derive", ] -@@ -4001,24 +4007,24 @@ dependencies = [ +@@ -4045,24 +4053,24 @@ dependencies = [ [[package]] name = "serde_derive" --version = "1.0.130" -+version = "1.0.131" +-version = "1.0.133" ++version = "1.0.136" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" -+checksum = "b710a83c4e0dff6a3d511946b95274ad9ca9e5d3ae497b63fda866ac955358d2" +-checksum = "ed201699328568d8d08208fdd080e3ff594e6c422e438b6705905da01005d537" ++checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" dependencies = [ -- "proc-macro2 1.0.32", -+ "proc-macro2 1.0.34", - "quote 1.0.10", - "syn 1.0.82", + "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.72" -+version = "1.0.73" +-version = "1.0.74" ++version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d0ffa0837f2dfa6fb90868c2b5468cad482e175f7dad97e7421951e663f2b527" -+checksum = "bcbd0344bc6533bc7ec56df11d42fb70f1b912351c0825ccb7211b59d8af7cf5" +-checksum = "ee2bb9cd061c5865d345bb02ca49fcef1391741b672b54a0bf7b679badec3142" ++checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95" dependencies = [ -- "itoa", -+ "itoa 1.0.1", + "itoa 1.0.1", "ryu", -- "serde 1.0.130", -+ "serde 1.0.131", +- "serde 1.0.133", ++ "serde 1.0.136", ] [[package]] -@@ -4037,8 +4043,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a" +@@ -4082,20 +4090,20 @@ checksum = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a" dependencies = [ "dtoa", -- "itoa", -- "serde 1.0.130", -+ "itoa 0.4.8", -+ "serde 1.0.131", + "itoa 0.4.8", +- "serde 1.0.133", ++ "serde 1.0.136", "url 1.7.2", ] -@@ -4049,9 +4055,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9" + [[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", -+ "itoa 0.4.8", +- "itoa 0.4.8", ++ "itoa 1.0.1", "ryu", -- "serde 1.0.130", -+ "serde 1.0.131", +- "serde 1.0.133", ++ "serde 1.0.136", ] [[package]] -@@ -4084,7 +4090,7 @@ checksum = "83695fde96cbe9e08f0e4eb96b1b56fdbd44f2098ee27462dda964c7745fddc7" - dependencies = [ +@@ -4129,8 +4137,8 @@ dependencies = [ "bitflags 1.3.2", "itertools 0.8.2", -- "proc-macro2 1.0.32", -+ "proc-macro2 1.0.34", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", +- "quote 1.0.14", +- "syn 1.0.85", ++ "quote 1.0.15", ++ "syn 1.0.86", ] -@@ -4097,7 +4103,7 @@ checksum = "e63e6744142336dfb606fe2b068afa2e1cca1ee6a5d8377277a92945d81fa331" + + [[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 = [ - "bitflags 1.3.2", - "itertools 0.8.2", -- "proc-macro2 1.0.32", -+ "proc-macro2 1.0.34", - "quote 1.0.10", - "syn 1.0.82", + "byteorder 1.4.3", + "libc", +- "winapi 0.2.8", +- "ws2_32-sys", ++ "winapi 0.3.9", ] -@@ -4232,7 +4238,7 @@ dependencies = [ + + [[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" + dependencies = [ + "lazy_static", "new_debug_unreachable", - "phf_shared", + "parking_lot 0.11.2", +- "phf_shared", ++ "phf_shared 0.10.0", "precomputed-hash", -- "serde 1.0.130", -+ "serde 1.0.131", - "string_cache_codegen", - "string_cache_shared", +- "serde 1.0.133", ++ "serde 1.0.136", ] -@@ -4245,7 +4251,7 @@ checksum = "f0f45ed1b65bf9a4bf2f7b7dc59212d1926e9eaf00fa998988e420fd124467c6" + + [[package]] +@@ -4274,9 +4291,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "f24c8e5e19d22a726626f1a5e16fe15b132dcf21d10177fa5a45ce7962996b97" dependencies = [ "phf_generator", - "phf_shared", -- "proc-macro2 1.0.32", -+ "proc-macro2 1.0.34", - "quote 1.0.10", - "string_cache_shared", +- "phf_shared", ++ "phf_shared 0.8.0", + "proc-macro2 1.0.36", +- "quote 1.0.14", ++ "quote 1.0.15", ] -@@ -4329,7 +4335,7 @@ version = "1.0.82" + + [[package]] +@@ -4348,12 +4365,12 @@ dependencies = [ + + [[package]] + name = "syn" +-version = "1.0.85" ++version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "8daf5dd0bb60cbd4137b1b587d2fc0ae729bc07cf01cd70b36a1ed5ade3b9d59" +-checksum = "a684ac3dcd8913827e18cd09a68384ee66c1de24157e3c556c9ab16d85695fb7" ++checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b" dependencies = [ -- "proc-macro2 1.0.32", -+ "proc-macro2 1.0.34", - "quote 1.0.10", + "proc-macro2 1.0.36", +- "quote 1.0.14", ++ "quote 1.0.15", "unicode-xid 0.2.2", ] -@@ -4349,7 +4355,7 @@ version = "0.12.6" - source = "registry+https://github.com/rust-lang/crates.io-index" + +@@ -4373,8 +4390,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ -- "proc-macro2 1.0.32", -+ "proc-macro2 1.0.34", - "quote 1.0.10", - "syn 1.0.82", + "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", -@@ -4370,7 +4376,7 @@ dependencies = [ + ] + +@@ -4393,7 +4410,7 @@ dependencies = [ "onig", "plist", "regex-syntax 0.6.25", -- "serde 1.0.130", -+ "serde 1.0.131", +- "serde 1.0.133", ++ "serde 1.0.136", "serde_derive", "serde_json", "walkdir", -@@ -4396,7 +4402,7 @@ dependencies = [ +@@ -4419,7 +4436,7 @@ dependencies = [ "failure", "fnv", "fs2", -- "futures 0.3.18", -+ "futures 0.3.17", +- "futures 0.3.19", ++ "futures 0.3.21", "htmlescape", "levenshtein_automata", "log 0.4.14", -@@ -4410,7 +4416,7 @@ dependencies = [ +@@ -4433,9 +4450,9 @@ dependencies = [ "rayon", "regex", "rust-stemmers", -- "serde 1.0.130", -+ "serde 1.0.131", +- "serde 1.0.133", ++ "serde 1.0.136", "serde_json", - "smallvec 1.7.0", +- "smallvec 1.7.0", ++ "smallvec 1.8.0", "snap", -@@ -4439,7 +4445,7 @@ dependencies = [ + "stable_deref_trait", + "tantivy-fst", +@@ -4462,7 +4479,7 @@ dependencies = [ "fail", "fnv", "fs2", -- "futures 0.3.18", -+ "futures 0.3.17", +- "futures 0.3.19", ++ "futures 0.3.21", "htmlescape", "levenshtein_automata", "log 0.4.14", -@@ -4451,7 +4457,7 @@ dependencies = [ +@@ -4474,9 +4491,9 @@ dependencies = [ "rayon", "regex", "rust-stemmers", -- "serde 1.0.130", -+ "serde 1.0.131", +- "serde 1.0.133", ++ "serde 1.0.136", "serde_json", - "smallvec 1.7.0", +- "smallvec 1.7.0", ++ "smallvec 1.8.0", "snap", -@@ -4501,9 +4507,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + "stable_deref_trait", + "tantivy-fst", +@@ -4545,13 +4562,13 @@ dependencies = [ [[package]] - name = "tar" --version = "0.4.37" -+version = "0.4.38" + name = "tempfile" +-version = "3.2.0" ++version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d6f5515d3add52e0bbdcad7b83c388bb36ba7b754dda3b5f5bc2d38640cdba5c" -+checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" +-checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" ++checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" dependencies = [ - "filetime", + "cfg-if 1.0.0", ++ "fastrand", "libc", -@@ -4569,7 +4575,7 @@ version = "1.0.30" - source = "registry+https://github.com/rust-lang/crates.io-index" +- "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.32", -+ "proc-macro2 1.0.34", - "quote 1.0.10", - "syn 1.0.82", - ] -@@ -4599,7 +4605,7 @@ version = "0.3.5" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "41effe7cfa8af36f439fac33861b66b049edc6f9a32331e2312660529c1c24ad" - dependencies = [ -- "itoa", -+ "itoa 0.4.8", - "libc", + "proc-macro2 1.0.36", +- "quote 1.0.14", +- "syn 1.0.85", ++ "quote 1.0.15", ++ "syn 1.0.86", ] -@@ -4745,7 +4751,7 @@ version = "0.2.6" + [[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", + ] + + [[package]] + name = "time" +-version = "0.1.43" ++version = "0.1.44" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" ++checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" + dependencies = [ + "libc", ++ "wasi 0.10.0+wasi-snapshot-preview1", + "winapi 0.3.9", + ] + + [[package]] + name = "time" +-version = "0.3.5" ++version = "0.3.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "41effe7cfa8af36f439fac33861b66b049edc6f9a32331e2312660529c1c24ad" ++checksum = "004cbc98f30fa233c61a38bc77e96a9106e65c88f2d3bef182ae952027e5753d" + dependencies = [ +- "itoa 0.4.8", ++ "itoa 1.0.1", + "libc", ++ "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 = [ + "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", + "winapi 0.3.9", + ] +@@ -4784,8 +4804,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" dependencies = [ -- "proc-macro2 1.0.32", -+ "proc-macro2 1.0.34", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", +- "quote 1.0.14", +- "syn 1.0.85", ++ "quote 1.0.15", ++ "syn 1.0.86", ] -@@ -4895,7 +4901,7 @@ version = "0.4.10" + + [[package]] +@@ -4795,8 +4815,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" + dependencies = [ + "proc-macro2 1.0.36", +- "quote 1.0.14", +- "syn 1.0.85", ++ "quote 1.0.15", ++ "syn 1.0.86", + ] + + [[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", + ] + + [[package]] +@@ -4836,7 +4856,7 @@ checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3" + dependencies = [ + "futures-core", + "pin-project-lite 0.2.8", +- "tokio 1.15.0", ++ "tokio 1.17.0", + ] + + [[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" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" dependencies = [ -- "serde 1.0.130", -+ "serde 1.0.131", +- "serde 1.0.133", ++ "serde 1.0.136", ] [[package]] -@@ -4904,7 +4910,7 @@ version = "0.5.8" +@@ -4978,7 +4998,7 @@ version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" dependencies = [ -- "serde 1.0.130", -+ "serde 1.0.131", +- "serde 1.0.133", ++ "serde 1.0.136", ] [[package]] -@@ -4932,7 +4938,7 @@ version = "0.1.18" +@@ -4989,9 +5009,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" + + [[package]] + name = "tracing" +-version = "0.1.29" ++version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e" +-checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105" ++checksum = "f6c650a8ef0cd2dd93736f033d21cbd1224c5a967aa0c258d00fcf7dafef9b9f" dependencies = [ -- "proc-macro2 1.0.32", -+ "proc-macro2 1.0.34", - "quote 1.0.10", - "syn 1.0.82", - ] -@@ -4973,7 +4979,7 @@ version = "0.1.2" + "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 = "fb65ea441fbb84f9f6748fd496cf7f63ec9af5bca94dd86456978d055e8eb28b" +-checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e" ++checksum = "8276d9a4a3a558d7b7ad5303ad50b53d58264641b82914b7ada36bd762e7a716" dependencies = [ -- "serde 1.0.130", -+ "serde 1.0.131", - "tracing-core", + "proc-macro2 1.0.36", +- "quote 1.0.14", +- "syn 1.0.85", ++ "quote 1.0.15", ++ "syn 1.0.86", ] -@@ -4983,12 +4989,12 @@ version = "0.2.25" + [[package]] + name = "tracing-core" +-version = "0.1.21" ++version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71" +-checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4" ++checksum = "03cfcb51380632a72d3111cb8d3447a8d908e577d31beeac006f836383d29a23" dependencies = [ -- "ansi_term 0.12.1", -+ "ansi_term", - "chrono", "lazy_static", - "matchers", - "regex", -- "serde 1.0.130", -+ "serde 1.0.131", - "serde_json", ++ "valuable", + ] + + [[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", -@@ -5171,7 +5177,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" +- "smallvec 1.7.0", ++ "smallvec 1.8.0", + "thread_local", + "tracing-core", + "tracing-log", +@@ -5220,8 +5241,8 @@ version = "0.8.2" + source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ - "getrandom 0.2.3", -- "serde 1.0.130", -+ "serde 1.0.131", +- "getrandom 0.2.3", +- "serde 1.0.133", ++ "getrandom 0.2.5", ++ "serde 1.0.136", ] [[package]] -@@ -5183,7 +5189,7 @@ dependencies = [ - "idna 0.1.5", +@@ -5233,7 +5254,7 @@ dependencies = [ + "idna 0.2.3", "lazy_static", "regex", -- "serde 1.0.130", -+ "serde 1.0.131", +- "serde 1.0.133", ++ "serde 1.0.136", "serde_derive", "serde_json", - "url 1.7.2", -@@ -5285,7 +5291,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + "url 2.2.2", +@@ -5251,9 +5272,9 @@ dependencies = [ + "lazy_static", + "proc-macro-error", + "proc-macro2 1.0.36", +- "quote 1.0.14", ++ "quote 1.0.15", + "regex", +- "syn 1.0.85", ++ "syn 1.0.86", + "validator_types", + ] + +@@ -5264,9 +5285,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ded9d97e1d42327632f5f3bae6403c04886e2de3036261ef42deebd931a6a291" + dependencies = [ + "proc-macro2 1.0.36", +- "syn 1.0.85", ++ "syn 1.0.86", + ] + ++[[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" + + [[package]] + name = "wasi" +-version = "0.10.2+wasi-snapshot-preview1" ++version = "0.10.0+wasi-snapshot-preview1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" ++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.130", -+ "serde 1.0.131", +- "serde 1.0.133", ++ "serde 1.0.136", "serde_json", "wasm-bindgen-macro", ] -@@ -5299,7 +5305,7 @@ dependencies = [ - "bumpalo", +@@ -5363,8 +5390,8 @@ dependencies = [ "lazy_static", "log 0.4.14", -- "proc-macro2 1.0.32", -+ "proc-macro2 1.0.34", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", +- "quote 1.0.14", +- "syn 1.0.85", ++ "quote 1.0.15", ++ "syn 1.0.86", "wasm-bindgen-shared", -@@ -5333,7 +5339,7 @@ version = "0.2.78" + ] + +@@ -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.32", -+ "proc-macro2 1.0.34", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.36", +- "quote 1.0.14", +- "syn 1.0.85", ++ "quote 1.0.15", ++ "syn 1.0.86", "wasm-bindgen-backend", -@@ -5363,7 +5369,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + "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.130", -+ "serde 1.0.131", +- "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]] diff --git a/Cargo.toml b/Cargo.toml -index 41d6d16..e3cab1d 100644 +index 3b969ea..fdb422d 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -81,3 +81,6 @@ search-lindera = ["plume-models/search-lindera"] +@@ -77,3 +77,6 @@ search-lindera = ["plume-models/search-lindera"] [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 40a7f8b..28e4855 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 + 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" + serde_derive = "1.0.123" + console_error_panic_hook = "0.1.6" -- -2.34.0 +2.35.1 diff --git a/overlay/plume/default.nix b/overlay/plume/default.nix index 9988ddfc..30d943de 100644 --- a/overlay/plume/default.nix +++ b/overlay/plume/default.nix @@ -1,6 +1,6 @@ { naersk, fenix , stdenv, fetchFromGitHub, buildEnv -, pkg-config, gettext, wasm-pack, wasm-bindgen-cli +, pkg-config, gettext, wasm-pack, wasm-bindgen-cli, binaryen , openssl, postgresql }: @@ -31,7 +31,7 @@ let sha256 = "029xq9cabz3scbmd84b8qkrg0q7x6fm27ijq869lkpq8bwjxvcb6"; }; - version = "0.7.0"; + version = "0.7.1"; src = stdenv.mkDerivation { pname = "plume-src"; @@ -40,7 +40,7 @@ let owner = "Plume-org"; repo = "Plume"; rev = version; - sha256 = "00hl81dvcybbybwfha7x2y8mz4qlmqip76610va73j6xcjsvj4fq"; + sha256 = "01mgg9ngpjinlwbgm2s287namilm3ddlwpn0hjs6267608vjgi04"; }; phases = [ "unpackPhase" "patchPhase" "installPhase" ]; patches = [ @@ -91,7 +91,7 @@ let pname = "plume-front"; root = src; nativeBuildInputs = [ - gettext wasm-pack wasm-bindgen-cli + gettext wasm-pack wasm-bindgen-cli binaryen ]; CARGO_BUILD_TARGET = "wasm32-unknown-unknown"; cargoBuildOptions = x: @@ -101,20 +101,9 @@ let copyLibs = true; overrideMain = oa: { buildPhase = '' - substituteInPlace plume-front/Cargo.toml \ - --replace '"cdylib"' '"cdylib", "rlib"' - - cat >>plume-front/Cargo.toml <