From 2ba158df67e72d84086c5c61cbb92e121659a4d4 Mon Sep 17 00:00:00 2001
From: Kitaiti Makoto <KitaitiMakoto@gmail.com>
Date: Fri, 7 Jan 2022 01:41:22 +0900
Subject: [PATCH 01/24] Update crates

---
 Cargo.lock | 409 ++++++++++++++++++++++++++---------------------------
 1 file changed, 203 insertions(+), 206 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fcc8ed30..774b43b9 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.133",
  "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.130",
+ "serde 1.0.133",
  "serde_json",
 ]
 
@@ -48,7 +48,7 @@ dependencies = [
  "activitystreams-traits",
  "chrono",
  "mime 0.3.16",
- "serde 1.0.130",
+ "serde 1.0.133",
  "serde_derive",
  "serde_json",
 ]
@@ -139,7 +139,7 @@ checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
 dependencies = [
  "getrandom 0.2.3",
  "once_cell",
- "version_check 0.9.3",
+ "version_check 0.9.4",
 ]
 
 [[package]]
@@ -165,15 +165,6 @@ dependencies = [
  "url 1.7.2",
 ]
 
-[[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,13 +206,13 @@ checksum = "719b48039ffac1564f67d70162109ba9341125cee0096a540e478355b3c724a7"
 
 [[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"
 dependencies = [
- "proc-macro2 1.0.32",
- "quote 1.0.10",
- "syn 1.0.82",
+ "proc-macro2 1.0.36",
+ "quote 1.0.14",
+ "syn 1.0.85",
 ]
 
 [[package]]
@@ -357,7 +348,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.133",
 ]
 
 [[package]]
@@ -431,9 +422,9 @@ checksum = "40e38929add23cdf8a366df9b0e088953150724bcbe5fc330b0d8eb3b328eec8"
 
 [[package]]
 name = "bumpalo"
-version = "3.8.0"
+version = "3.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f1e260c3a9040a7c19a12468758f4c16f31a81a1fe087482be9570ec864bb6c"
+checksum = "fe438c9d2f2b0fb88a112154ed81e30b0a491c29322afe1db3b6eec5811f5ba0"
 
 [[package]]
 name = "bytecount"
@@ -521,7 +512,7 @@ dependencies = [
  "libc",
  "num-integer",
  "num-traits 0.2.14",
- "serde 1.0.130",
+ "serde 1.0.133",
  "time 0.1.43",
  "winapi 0.3.9",
 ]
@@ -546,11 +537,11 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "2.33.3"
+version = "2.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
+checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
 dependencies = [
- "ansi_term 0.11.0",
+ "ansi_term",
  "atty",
  "bitflags 1.3.2",
  "strsim",
@@ -586,7 +577,7 @@ dependencies = [
  "lazy_static",
  "nom 5.1.2",
  "rust-ini",
- "serde 1.0.130",
+ "serde 1.0.133",
  "serde-hjson",
  "serde_json",
  "toml 0.5.8",
@@ -671,7 +662,7 @@ dependencies = [
  "idna 0.1.5",
  "log 0.4.14",
  "publicsuffix",
- "serde 1.0.130",
+ "serde 1.0.133",
  "serde_json",
  "time 0.1.43",
  "try_from",
@@ -711,9 +702,9 @@ checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba"
 
 [[package]]
 name = "crc32fast"
-version = "1.2.2"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3825b1e8580894917dc4468cb634a1b4e9745fddc854edad72d9c04644c0319f"
+checksum = "738c290dfaea84fc1ca15ad9c168d083b05a714e1efddd8edaab678dc28d2836"
 dependencies = [
  "cfg-if 1.0.0",
 ]
@@ -812,7 +803,7 @@ dependencies = [
  "cfg-if 1.0.0",
  "crossbeam-utils 0.8.5",
  "lazy_static",
- "memoffset 0.6.4",
+ "memoffset 0.6.5",
  "scopeguard",
 ]
 
@@ -889,7 +880,7 @@ version = "3.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a19c6cedffdc8c03a3346d723eb20bd85a13362bb96dc2ac000842c6381ec7bf"
 dependencies = [
- "nix 0.23.0",
+ "nix 0.23.1",
  "winapi 0.3.9",
 ]
 
@@ -1027,9 +1018,9 @@ version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "45f5098f628d02a7a0f68ddba586fb61e80edec3bdc1be3b921f4ceec60858d3"
 dependencies = [
- "proc-macro2 1.0.32",
- "quote 1.0.10",
- "syn 1.0.82",
+ "proc-macro2 1.0.36",
+ "quote 1.0.14",
+ "syn 1.0.85",
 ]
 
 [[package]]
@@ -1173,9 +1164,9 @@ checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569"
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.29"
+version = "0.8.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a74ea89a0a1b98f6332de42c95baff457ada66d1cb4030f9ff151b2041a1c746"
+checksum = "7896dc8abb250ffdda33912550faa54c88ec8b998dec0b2c55ab224921ce11df"
 dependencies = [
  "cfg-if 1.0.0",
 ]
@@ -1207,9 +1198,9 @@ version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
 dependencies = [
- "proc-macro2 1.0.32",
- "quote 1.0.10",
- "syn 1.0.82",
+ "proc-macro2 1.0.36",
+ "quote 1.0.14",
+ "syn 1.0.85",
  "synstructure",
 ]
 
@@ -1352,9 +1343,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678"
 
 [[package]]
 name = "futures"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cd0210d8c325c245ff06fd95a3b13689a1a276ac8cfa8e8720cb840bfb84b9e"
+checksum = "28560757fe2bb34e79f907794bb6b22ae8b0e5c669b638a1132f2592b19035b4"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1367,9 +1358,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fc8cd39e3dbf865f7340dce6a2d401d24fd37c6fe6c4f0ee0de8bfca2252d27"
+checksum = "ba3dda0b6588335f360afc675d0564c17a77a2bda81ca178a4b6081bd86c7f0b"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -1377,9 +1368,9 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "629316e42fe7c2a0b9a65b47d159ceaa5453ab14e8f0a3c5eedbb8cd55b4a445"
+checksum = "d0c8ff0461b82559810cdccfde3215c3f373807f5e5232b71479bff7bb2583d7"
 
 [[package]]
 name = "futures-cpupool"
@@ -1393,9 +1384,9 @@ dependencies = [
 
 [[package]]
 name = "futures-executor"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b808bf53348a36cab739d7e04755909b9fcaaa69b7d7e588b37b6ec62704c97"
+checksum = "29d6d2ff5bb10fb95c85b8ce46538a2e5f5e7fdc755623a7d4529ab8a4ed9d2a"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -1405,38 +1396,38 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e481354db6b5c353246ccf6a728b0c5511d752c08da7260546fc0933869daa11"
+checksum = "b1f9d34af5a1aac6fb380f735fe510746c38067c5bf16c7fd250280503c971b2"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a89f17b21645bc4ed773c69af9c9a0effd4a3f1a3876eadd453469f8854e7fdd"
+checksum = "6dbd947adfffb0efc70599b3ddcf7b5597bb5fa9e245eb99f62b3a5f7bb8bd3c"
 dependencies = [
- "proc-macro2 1.0.32",
- "quote 1.0.10",
- "syn 1.0.82",
+ "proc-macro2 1.0.36",
+ "quote 1.0.14",
+ "syn 1.0.85",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "996c6442437b62d21a32cd9906f9c41e7dc1e19a9579843fad948696769305af"
+checksum = "e3055baccb68d74ff6480350f8d6eb8fcfa3aa11bdc1a1ae3afdd0514617d508"
 
 [[package]]
 name = "futures-task"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dabf1872aaab32c886832f2276d2f5399887e2bd613698a02359e4ea83f8de12"
+checksum = "6ee7c6485c30167ce4dfb83ac568a849fe53274c831081476ee13e0dce1aad72"
 
 [[package]]
 name = "futures-util"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41d22213122356472061ac0f1ab2cee28d2bac8491410fd68c2af53d1cedb83e"
+checksum = "d9b5cf40b47a271f77a8b1bec03ca09044d99d2372c0de244e66430761127164"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1445,19 +1436,19 @@ dependencies = [
  "futures-sink",
  "futures-task",
  "memchr",
- "pin-project-lite 0.2.7",
+ "pin-project-lite 0.2.8",
  "pin-utils",
  "slab",
 ]
 
 [[package]]
 name = "generic-array"
-version = "0.14.4"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817"
+checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803"
 dependencies = [
  "typenum",
- "version_check 0.9.3",
+ "version_check 0.9.4",
 ]
 
 [[package]]
@@ -1608,7 +1599,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "futures-util",
- "http 0.2.5",
+ "http 0.2.6",
  "indexmap",
  "slab",
  "tokio 0.2.25",
@@ -1718,18 +1709,18 @@ checksum = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0"
 dependencies = [
  "bytes 0.4.12",
  "fnv",
- "itoa",
+ "itoa 0.4.8",
 ]
 
 [[package]]
 name = "http"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1323096b05d41827dadeaee54c9981958c0f94e670bc94ed80037d1a7b8b186b"
+checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03"
 dependencies = [
  "bytes 1.1.0",
  "fnv",
- "itoa",
+ "itoa 1.0.1",
 ]
 
 [[package]]
@@ -1751,7 +1742,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b"
 dependencies = [
  "bytes 0.5.6",
- "http 0.2.5",
+ "http 0.2.6",
 ]
 
 [[package]]
@@ -1799,7 +1790,7 @@ dependencies = [
  "http-body 0.1.0",
  "httparse",
  "iovec",
- "itoa",
+ "itoa 0.4.8",
  "log 0.4.14",
  "net2",
  "rustc_version",
@@ -1826,11 +1817,11 @@ dependencies = [
  "futures-core",
  "futures-util",
  "h2 0.2.7",
- "http 0.2.5",
+ "http 0.2.6",
  "http-body 0.3.1",
  "httparse",
  "httpdate",
- "itoa",
+ "itoa 0.4.8",
  "pin-project",
  "socket2",
  "tokio 0.2.25",
@@ -1958,9 +1949,9 @@ dependencies = [
 
 [[package]]
 name = "itertools"
-version = "0.10.1"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf"
+checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3"
 dependencies = [
  "either 1.6.1",
 ]
@@ -1971,6 +1962,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 +2024,7 @@ checksum = "915f14e5fbd72f2f0816dcdbb98b56e7fe6d04dae6ed2c0395133b627aafda9e"
 dependencies = [
  "async-trait",
  "bytes 0.5.6",
- "futures 0.3.18",
+ "futures 0.3.19",
  "futures-util",
  "lazy_static",
  "lber",
@@ -2056,7 +2053,7 @@ dependencies = [
  "log 0.4.14",
  "native-tls",
  "nom 4.2.3",
- "serde 1.0.130",
+ "serde 1.0.133",
  "serde_derive",
  "serde_json",
 ]
@@ -2096,9 +2093,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.108"
+version = "0.2.112"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8521a1b57e76b1ec69af7599e75e38e7b7fad6610f037db8c79b127201b5d119"
+checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125"
 
 [[package]]
 name = "libsqlite3-sys"
@@ -2123,7 +2120,7 @@ dependencies = [
  "lindera-dictionary",
  "lindera-ipadic",
  "lindera-ipadic-builder",
- "serde 1.0.130",
+ "serde 1.0.133",
  "serde_json",
 ]
 
@@ -2136,7 +2133,7 @@ dependencies = [
  "bincode",
  "byteorder 1.4.3",
  "encoding",
- "serde 1.0.130",
+ "serde 1.0.133",
  "yada",
 ]
 
@@ -2284,7 +2281,7 @@ dependencies = [
  "log 0.4.14",
  "phf",
  "phf_codegen",
- "serde 1.0.130",
+ "serde 1.0.133",
  "serde_derive",
  "serde_json",
  "string_cache",
@@ -2346,9 +2343,9 @@ dependencies = [
 
 [[package]]
 name = "memoffset"
-version = "0.6.4"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"
+checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
 dependencies = [
  "autocfg 1.0.1",
 ]
@@ -2369,9 +2366,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9753f12909fd8d923f75ae5c3258cae1ed3c8ec052e1b38c93c21a6d157f789c"
 dependencies = [
  "migrations_internals",
- "proc-macro2 1.0.32",
- "quote 1.0.10",
- "syn 1.0.82",
+ "proc-macro2 1.0.36",
+ "quote 1.0.14",
+ "syn 1.0.85",
 ]
 
 [[package]]
@@ -2573,15 +2570,15 @@ dependencies = [
 
 [[package]]
 name = "nix"
-version = "0.23.0"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f305c2c2e4c39a82f7bf0bf65fb557f9070ce06781d4f2454295cc34b1c43188"
+checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6"
 dependencies = [
  "bitflags 1.3.2",
  "cc",
  "cfg-if 1.0.0",
  "libc",
- "memoffset 0.6.4",
+ "memoffset 0.6.5",
 ]
 
 [[package]]
@@ -2608,7 +2605,7 @@ checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af"
 dependencies = [
  "lexical-core",
  "memchr",
- "version_check 0.9.3",
+ "version_check 0.9.4",
 ]
 
 [[package]]
@@ -2621,7 +2618,7 @@ dependencies = [
  "funty",
  "lexical-core",
  "memchr",
- "version_check 0.9.3",
+ "version_check 0.9.4",
 ]
 
 [[package]]
@@ -2683,9 +2680,9 @@ dependencies = [
 
 [[package]]
 name = "num_cpus"
-version = "1.13.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
+checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
 dependencies = [
  "hermit-abi",
  "libc",
@@ -2699,9 +2696,9 @@ checksum = "1a5b3dd1c072ee7963717671d1ca129f1048fda25edea6b752bfc71ac8854170"
 
 [[package]]
 name = "once_cell"
-version = "1.8.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"
+checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5"
 
 [[package]]
 name = "onig"
@@ -2753,9 +2750,9 @@ checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.71"
+version = "0.9.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7df13d165e607909b363a4757a6f133f8a818a74e9d3a98d09c6128e15fa4c73"
+checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb"
 dependencies = [
  "autocfg 1.0.1",
  "cc",
@@ -2851,7 +2848,7 @@ dependencies = [
  "proc-macro2 0.4.30",
  "quote 0.6.13",
  "syn 0.15.44",
- "version_check 0.9.3",
+ "version_check 0.9.4",
  "yansi",
 ]
 
@@ -2908,22 +2905,22 @@ dependencies = [
 
 [[package]]
 name = "pin-project"
-version = "1.0.8"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08"
+checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.0.8"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389"
+checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb"
 dependencies = [
- "proc-macro2 1.0.32",
- "quote 1.0.10",
- "syn 1.0.82",
+ "proc-macro2 1.0.36",
+ "quote 1.0.14",
+ "syn 1.0.85",
 ]
 
 [[package]]
@@ -2934,9 +2931,9 @@ checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777"
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.7"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443"
+checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c"
 
 [[package]]
 name = "pin-utils"
@@ -2946,9 +2943,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.22"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12295df4f294471248581bc09bef3c38a5e46f1e36d6a37353621a0c6c357e1f"
+checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe"
 
 [[package]]
 name = "plist"
@@ -2959,7 +2956,7 @@ dependencies = [
  "base64 0.13.0",
  "indexmap",
  "line-wrap",
- "serde 1.0.130",
+ "serde 1.0.133",
  "time 0.3.5",
  "xml-rs",
 ]
@@ -2995,7 +2992,7 @@ dependencies = [
  "rsass",
  "ructe",
  "scheduled-thread-pool",
- "serde 1.0.130",
+ "serde 1.0.133",
  "serde_json",
  "shrinkwraprs 0.2.3",
  "tracing",
@@ -3009,7 +3006,7 @@ dependencies = [
 name = "plume-api"
 version = "0.7.1-dev"
 dependencies = [
- "serde 1.0.130",
+ "serde 1.0.133",
  "serde_derive",
 ]
 
@@ -3043,7 +3040,7 @@ dependencies = [
  "regex-syntax 0.6.25",
  "reqwest 0.9.24",
  "rocket",
- "serde 1.0.130",
+ "serde 1.0.133",
  "serde_derive",
  "serde_json",
  "shrinkwraprs 0.3.0",
@@ -3062,7 +3059,7 @@ dependencies = [
  "gettext-utils",
  "js-sys",
  "lazy_static",
- "serde 1.0.130",
+ "serde 1.0.133",
  "serde_derive",
  "serde_json",
  "wasm-bindgen",
@@ -3109,7 +3106,7 @@ dependencies = [
  "rocket",
  "rocket_i18n",
  "scheduled-thread-pool",
- "serde 1.0.130",
+ "serde 1.0.133",
  "serde_derive",
  "serde_json",
  "shrinkwraprs 0.2.3",
@@ -3134,9 +3131,9 @@ dependencies = [
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba"
+checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
 
 [[package]]
 name = "pq-sys"
@@ -3203,9 +3200,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.32"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba508cc11742c0dc5c1659771673afbab7a0efab23aa17e854cbab0837ed0b43"
+checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
 dependencies = [
  "unicode-xid 0.2.2",
 ]
@@ -3283,11 +3280,11 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.10"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05"
+checksum = "47aa80447ce4daf1717500037052af176af5d38cc3e571d9ec1c7353fc10c87d"
 dependencies = [
- "proc-macro2 1.0.32",
+ "proc-macro2 1.0.36",
 ]
 
 [[package]]
@@ -3630,7 +3627,7 @@ dependencies = [
  "mime 0.3.16",
  "mime_guess 2.0.3",
  "native-tls",
- "serde 1.0.130",
+ "serde 1.0.133",
  "serde_json",
  "serde_urlencoded 0.5.5",
  "socks",
@@ -3656,7 +3653,7 @@ dependencies = [
  "encoding_rs",
  "futures-core",
  "futures-util",
- "http 0.2.5",
+ "http 0.2.6",
  "http-body 0.3.1",
  "hyper 0.13.10",
  "hyper-tls 0.4.3",
@@ -3668,8 +3665,8 @@ dependencies = [
  "mime_guess 2.0.3",
  "native-tls",
  "percent-encoding 2.1.0",
- "pin-project-lite 0.2.7",
- "serde 1.0.130",
+ "pin-project-lite 0.2.8",
+ "serde 1.0.133",
  "serde_urlencoded 0.7.0",
  "tokio 0.2.25",
  "tokio-tls",
@@ -3689,7 +3686,7 @@ dependencies = [
  "chrono",
  "config",
  "dashmap",
- "futures 0.3.18",
+ "futures 0.3.19",
  "num_cpus",
  "pin-utils",
  "rand 0.7.3",
@@ -3741,7 +3738,7 @@ dependencies = [
  "state",
  "time 0.1.43",
  "toml 0.4.10",
- "version_check 0.9.3",
+ "version_check 0.9.4",
  "yansi",
 ]
 
@@ -3756,7 +3753,7 @@ dependencies = [
  "indexmap",
  "quote 0.6.13",
  "rocket_http",
- "version_check 0.9.3",
+ "version_check 0.9.4",
  "yansi",
 ]
 
@@ -3769,7 +3766,7 @@ dependencies = [
  "log 0.4.14",
  "notify",
  "rocket",
- "serde 1.0.130",
+ "serde 1.0.133",
  "serde_json",
 ]
 
@@ -3781,7 +3778,7 @@ dependencies = [
  "data-encoding",
  "ring",
  "rocket",
- "serde 1.0.130",
+ "serde 1.0.133",
  "time 0.1.43",
 ]
 
@@ -3852,7 +3849,7 @@ checksum = "c6fd2f3b927021cc8586d365c36d16d82d91fdae0a3839819c12c8e86e0f929e"
 dependencies = [
  "base64 0.13.0",
  "bytecount",
- "itertools 0.10.1",
+ "itertools 0.10.3",
  "md5",
  "nom 6.2.1",
 ]
@@ -3869,7 +3866,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.133",
  "serde_derive",
 ]
 
@@ -3890,9 +3887,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.5"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
+checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f"
 
 [[package]]
 name = "safemem"
@@ -3980,9 +3977,9 @@ checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8"
 
 [[package]]
 name = "serde"
-version = "1.0.130"
+version = "1.0.133"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913"
+checksum = "97565067517b60e2d1ea8b268e59ce036de907ac523ad83a0475da04e818989a"
 dependencies = [
  "serde_derive",
 ]
@@ -4002,24 +3999,24 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.130"
+version = "1.0.133"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b"
+checksum = "ed201699328568d8d08208fdd080e3ff594e6c422e438b6705905da01005d537"
 dependencies = [
- "proc-macro2 1.0.32",
- "quote 1.0.10",
- "syn 1.0.82",
+ "proc-macro2 1.0.36",
+ "quote 1.0.14",
+ "syn 1.0.85",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.72"
+version = "1.0.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0ffa0837f2dfa6fb90868c2b5468cad482e175f7dad97e7421951e663f2b527"
+checksum = "ee2bb9cd061c5865d345bb02ca49fcef1391741b672b54a0bf7b679badec3142"
 dependencies = [
- "itoa",
+ "itoa 1.0.1",
  "ryu",
- "serde 1.0.130",
+ "serde 1.0.133",
 ]
 
 [[package]]
@@ -4038,8 +4035,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a"
 dependencies = [
  "dtoa",
- "itoa",
- "serde 1.0.130",
+ "itoa 0.4.8",
+ "serde 1.0.133",
  "url 1.7.2",
 ]
 
@@ -4050,9 +4047,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9"
 dependencies = [
  "form_urlencoded",
- "itoa",
+ "itoa 0.4.8",
  "ryu",
- "serde 1.0.130",
+ "serde 1.0.133",
 ]
 
 [[package]]
@@ -4085,9 +4082,9 @@ checksum = "83695fde96cbe9e08f0e4eb96b1b56fdbd44f2098ee27462dda964c7745fddc7"
 dependencies = [
  "bitflags 1.3.2",
  "itertools 0.8.2",
- "proc-macro2 1.0.32",
- "quote 1.0.10",
- "syn 1.0.82",
+ "proc-macro2 1.0.36",
+ "quote 1.0.14",
+ "syn 1.0.85",
 ]
 
 [[package]]
@@ -4098,9 +4095,9 @@ checksum = "e63e6744142336dfb606fe2b068afa2e1cca1ee6a5d8377277a92945d81fa331"
 dependencies = [
  "bitflags 1.3.2",
  "itertools 0.8.2",
- "proc-macro2 1.0.32",
- "quote 1.0.10",
- "syn 1.0.82",
+ "proc-macro2 1.0.36",
+ "quote 1.0.14",
+ "syn 1.0.85",
 ]
 
 [[package]]
@@ -4233,7 +4230,7 @@ dependencies = [
  "new_debug_unreachable",
  "phf_shared",
  "precomputed-hash",
- "serde 1.0.130",
+ "serde 1.0.133",
  "string_cache_codegen",
  "string_cache_shared",
 ]
@@ -4246,8 +4243,8 @@ checksum = "f0f45ed1b65bf9a4bf2f7b7dc59212d1926e9eaf00fa998988e420fd124467c6"
 dependencies = [
  "phf_generator",
  "phf_shared",
- "proc-macro2 1.0.32",
- "quote 1.0.10",
+ "proc-macro2 1.0.36",
+ "quote 1.0.14",
  "string_cache_shared",
 ]
 
@@ -4326,12 +4323,12 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.82"
+version = "1.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8daf5dd0bb60cbd4137b1b587d2fc0ae729bc07cf01cd70b36a1ed5ade3b9d59"
+checksum = "a684ac3dcd8913827e18cd09a68384ee66c1de24157e3c556c9ab16d85695fb7"
 dependencies = [
- "proc-macro2 1.0.32",
- "quote 1.0.10",
+ "proc-macro2 1.0.36",
+ "quote 1.0.14",
  "unicode-xid 0.2.2",
 ]
 
@@ -4350,9 +4347,9 @@ version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
 dependencies = [
- "proc-macro2 1.0.32",
- "quote 1.0.10",
- "syn 1.0.82",
+ "proc-macro2 1.0.36",
+ "quote 1.0.14",
+ "syn 1.0.85",
  "unicode-xid 0.2.2",
 ]
 
@@ -4371,7 +4368,7 @@ dependencies = [
  "onig",
  "plist",
  "regex-syntax 0.6.25",
- "serde 1.0.130",
+ "serde 1.0.133",
  "serde_derive",
  "serde_json",
  "walkdir",
@@ -4397,7 +4394,7 @@ dependencies = [
  "failure",
  "fnv",
  "fs2",
- "futures 0.3.18",
+ "futures 0.3.19",
  "htmlescape",
  "levenshtein_automata",
  "log 0.4.14",
@@ -4411,7 +4408,7 @@ dependencies = [
  "rayon",
  "regex",
  "rust-stemmers",
- "serde 1.0.130",
+ "serde 1.0.133",
  "serde_json",
  "smallvec 1.7.0",
  "snap",
@@ -4440,7 +4437,7 @@ dependencies = [
  "fail",
  "fnv",
  "fs2",
- "futures 0.3.18",
+ "futures 0.3.19",
  "htmlescape",
  "levenshtein_automata",
  "log 0.4.14",
@@ -4452,7 +4449,7 @@ dependencies = [
  "rayon",
  "regex",
  "rust-stemmers",
- "serde 1.0.130",
+ "serde 1.0.133",
  "serde_json",
  "smallvec 1.7.0",
  "snap",
@@ -4502,9 +4499,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "tar"
-version = "0.4.37"
+version = "0.4.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6f5515d3add52e0bbdcad7b83c388bb36ba7b754dda3b5f5bc2d38640cdba5c"
+checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6"
 dependencies = [
  "filetime",
  "libc",
@@ -4570,9 +4567,9 @@ version = "1.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b"
 dependencies = [
- "proc-macro2 1.0.32",
- "quote 1.0.10",
- "syn 1.0.82",
+ "proc-macro2 1.0.36",
+ "quote 1.0.14",
+ "syn 1.0.85",
 ]
 
 [[package]]
@@ -4600,7 +4597,7 @@ version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41effe7cfa8af36f439fac33861b66b049edc6f9a32331e2312660529c1c24ad"
 dependencies = [
- "itoa",
+ "itoa 0.4.8",
  "libc",
 ]
 
@@ -4746,9 +4743,9 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a"
 dependencies = [
- "proc-macro2 1.0.32",
- "quote 1.0.10",
- "syn 1.0.82",
+ "proc-macro2 1.0.36",
+ "quote 1.0.14",
+ "syn 1.0.85",
 ]
 
 [[package]]
@@ -4896,7 +4893,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.133",
 ]
 
 [[package]]
@@ -4905,7 +4902,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.133",
 ]
 
 [[package]]
@@ -4922,7 +4919,7 @@ checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105"
 dependencies = [
  "cfg-if 1.0.0",
  "log 0.4.14",
- "pin-project-lite 0.2.7",
+ "pin-project-lite 0.2.8",
  "tracing-attributes",
  "tracing-core",
 ]
@@ -4933,9 +4930,9 @@ version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e"
 dependencies = [
- "proc-macro2 1.0.32",
- "quote 1.0.10",
- "syn 1.0.82",
+ "proc-macro2 1.0.36",
+ "quote 1.0.14",
+ "syn 1.0.85",
 ]
 
 [[package]]
@@ -4974,7 +4971,7 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fb65ea441fbb84f9f6748fd496cf7f63ec9af5bca94dd86456978d055e8eb28b"
 dependencies = [
- "serde 1.0.130",
+ "serde 1.0.133",
  "tracing-core",
 ]
 
@@ -4984,12 +4981,12 @@ version = "0.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71"
 dependencies = [
- "ansi_term 0.12.1",
+ "ansi_term",
  "chrono",
  "lazy_static",
  "matchers",
  "regex",
- "serde 1.0.130",
+ "serde 1.0.133",
  "serde_json",
  "sharded-slab",
  "smallvec 1.7.0",
@@ -5038,9 +5035,9 @@ checksum = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887"
 
 [[package]]
 name = "typenum"
-version = "1.14.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec"
+checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
 
 [[package]]
 name = "unicase"
@@ -5057,7 +5054,7 @@ version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
 dependencies = [
- "version_check 0.9.3",
+ "version_check 0.9.4",
 ]
 
 [[package]]
@@ -5172,7 +5169,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
 dependencies = [
  "getrandom 0.2.3",
- "serde 1.0.130",
+ "serde 1.0.133",
 ]
 
 [[package]]
@@ -5184,7 +5181,7 @@ dependencies = [
  "idna 0.1.5",
  "lazy_static",
  "regex",
- "serde 1.0.130",
+ "serde 1.0.133",
  "serde_derive",
  "serde_json",
  "url 1.7.2",
@@ -5225,9 +5222,9 @@ checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
 
 [[package]]
 name = "version_check"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "void"
@@ -5286,7 +5283,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.133",
  "serde_json",
  "wasm-bindgen-macro",
 ]
@@ -5300,9 +5297,9 @@ dependencies = [
  "bumpalo",
  "lazy_static",
  "log 0.4.14",
- "proc-macro2 1.0.32",
- "quote 1.0.10",
- "syn 1.0.82",
+ "proc-macro2 1.0.36",
+ "quote 1.0.14",
+ "syn 1.0.85",
  "wasm-bindgen-shared",
 ]
 
@@ -5324,7 +5321,7 @@ version = "0.2.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9"
 dependencies = [
- "quote 1.0.10",
+ "quote 1.0.14",
  "wasm-bindgen-macro-support",
 ]
 
@@ -5334,9 +5331,9 @@ version = "0.2.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab"
 dependencies = [
- "proc-macro2 1.0.32",
- "quote 1.0.10",
- "syn 1.0.82",
+ "proc-macro2 1.0.36",
+ "quote 1.0.14",
+ "syn 1.0.85",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -5364,7 +5361,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.133",
  "serde_derive",
 ]
 

From a537db559b5a660746c70f63006e6d0f963976d9 Mon Sep 17 00:00:00 2001
From: Kitaiti Makoto <KitaitiMakoto@gmail.com>
Date: Fri, 7 Jan 2022 04:41:11 +0900
Subject: [PATCH 02/24] Upgrade rsass

---
 Cargo.lock | 63 ++++++++++++++++++++++++++++++++++++++++++++++++------
 Cargo.toml |  2 +-
 2 files changed, 58 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 774b43b9..b57317d4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1213,6 +1213,15 @@ dependencies = [
  "ascii_utils",
 ]
 
+[[package]]
+name = "fastrand"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "779d043b6a0b90cc4c0ed7ee380a6504394cee7efd7db050e3774eee387324b2"
+dependencies = [
+ "instant",
+]
+
 [[package]]
 name = "filetime"
 version = "0.2.15"
@@ -2408,6 +2417,12 @@ dependencies = [
  "unicase 2.6.0",
 ]
 
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
 [[package]]
 name = "miniz_oxide"
 version = "0.4.4"
@@ -2621,6 +2636,28 @@ dependencies = [
  "version_check 0.9.4",
 ]
 
+[[package]]
+name = "nom"
+version = "7.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b1d11e1ef389c76fe5b81bcaf2ea32cf88b62bc494e19f493d0b30e7a930109"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+ "version_check 0.9.4",
+]
+
+[[package]]
+name = "nom_locate"
+version = "4.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37794436ca3029a3089e0b95d42da1f0b565ad271e4d3bb4bad0c7bb70b10605"
+dependencies = [
+ "bytecount",
+ "memchr",
+ "nom 7.1.0",
+]
+
 [[package]]
 name = "notify"
 version = "4.0.17"
@@ -2639,6 +2676,17 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "num-bigint"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f"
+dependencies = [
+ "autocfg 1.0.1",
+ "num-integer",
+ "num-traits 0.2.14",
+]
+
 [[package]]
 name = "num-integer"
 version = "0.1.44"
@@ -2651,9 +2699,9 @@ dependencies = [
 
 [[package]]
 name = "num-rational"
-version = "0.2.4"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef"
+checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a"
 dependencies = [
  "autocfg 1.0.1",
  "num-integer",
@@ -3830,15 +3878,18 @@ dependencies = [
 
 [[package]]
 name = "rsass"
-version = "0.9.8"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f4534cc03040beacd2668621815f26fe57e5b7cfe085790f98e5e87c1612316"
+checksum = "8da5895d80d89e1b59f12ac5433919a32a1495267d5e09189923420eec89b01c"
 dependencies = [
+ "fastrand",
  "lazy_static",
- "nom 4.2.3",
+ "nom 7.1.0",
+ "nom_locate",
+ "num-bigint",
+ "num-integer",
  "num-rational",
  "num-traits 0.2.14",
- "rand 0.6.5",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 36cb68e9..5eb651c4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -68,7 +68,7 @@ rev = "29910f2829e7e590a540da3804336577b48c7b31"
 
 [build-dependencies]
 ructe = "0.13.0"
-rsass = "0.9"
+rsass = "0.23"
 
 [features]
 default = ["postgres"]

From ec12539fd0b0763ba691d380ae158b05687842c2 Mon Sep 17 00:00:00 2001
From: Kitaiti Makoto <KitaitiMakoto@gmail.com>
Date: Fri, 7 Jan 2022 04:41:20 +0900
Subject: [PATCH 03/24] Follow rsass API change

---
 build.rs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/build.rs b/build.rs
index 98ca35de..0cc50b5b 100644
--- a/build.rs
+++ b/build.rs
@@ -120,8 +120,14 @@ fn compile_theme(path: &Path, out_dir: &Path) -> std::io::Result<()> {
     // compile the .scss/.sass file
     let mut out = File::create(out.join("theme.css"))?;
     out.write_all(
-        &rsass::compile_scss_file(path, rsass::OutputStyle::Compressed)
-            .expect("SCSS compilation error"),
+        &rsass::compile_scss_path(
+            path,
+            rsass::output::Format {
+                style: rsass::output::Style::Compressed,
+                ..rsass::output::Format::default()
+            },
+        )
+        .expect("SCSS compilation error"),
     )?;
 
     Ok(())

From 237da47950eff458a997d5eb8d898ae296eef596 Mon Sep 17 00:00:00 2001
From: Kitaiti Makoto <KitaitiMakoto@gmail.com>
Date: Fri, 7 Jan 2022 04:55:41 +0900
Subject: [PATCH 04/24] Upgrade validator

---
 Cargo.lock | 62 ++++++++++++++++++++++++++++++++++++++++++------------
 Cargo.toml |  3 +--
 2 files changed, 50 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b57317d4..a1a49339 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1889,9 +1889,9 @@ dependencies = [
 
 [[package]]
 name = "if_chain"
-version = "0.1.3"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bac95d9aa0624e7b78187d6fb8ab012b41d9f6f54b1bcb61e61c4845f8357ec"
+checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed"
 
 [[package]]
 name = "indexmap"
@@ -3046,7 +3046,6 @@ dependencies = [
  "tracing",
  "tracing-subscriber",
  "validator",
- "validator_derive",
  "webfinger",
 ]
 
@@ -3198,6 +3197,30 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
 
+[[package]]
+name = "proc-macro-error"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2 1.0.36",
+ "quote 1.0.14",
+ "syn 1.0.85",
+ "version_check 0.9.4",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+dependencies = [
+ "proc-macro2 1.0.36",
+ "quote 1.0.14",
+ "version_check 0.9.4",
+]
+
 [[package]]
 name = "proc-macro-hack"
 version = "0.4.3"
@@ -5225,32 +5248,45 @@ dependencies = [
 
 [[package]]
 name = "validator"
-version = "0.8.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "236a5eda3df2c877872e98dbc55d497d943792e6405d8fc65bd4f8a5e3b53c99"
+checksum = "6d0f08911ab0fee2c5009580f04615fa868898ee57de10692a45da0c3bcc3e5e"
 dependencies = [
- "idna 0.1.5",
+ "idna 0.2.3",
  "lazy_static",
  "regex",
  "serde 1.0.133",
  "serde_derive",
  "serde_json",
- "url 1.7.2",
+ "url 2.2.2",
+ "validator_derive",
+ "validator_types",
 ]
 
 [[package]]
 name = "validator_derive"
-version = "0.8.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d360d6f5754972c0c1da14fb3d5580daa31aee566e1e45e2f8d3bf5950ecd3e9"
+checksum = "d85135714dba11a1bd0b3eb1744169266f1a38977bf4e3ff5e2e1acb8c2b7eee"
 dependencies = [
  "if_chain",
  "lazy_static",
- "proc-macro2 0.4.30",
- "quote 0.6.13",
+ "proc-macro-error",
+ "proc-macro2 1.0.36",
+ "quote 1.0.14",
  "regex",
- "syn 0.15.44",
- "validator",
+ "syn 1.0.85",
+ "validator_types",
+]
+
+[[package]]
+name = "validator_types"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ded9d97e1d42327632f5f3bae6403c04886e2de3036261ef42deebd931a6a291"
+dependencies = [
+ "proc-macro2 1.0.36",
+ "syn 1.0.85",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 5eb651c4..698d3ee6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,8 +25,7 @@ scheduled-thread-pool = "0.2.2"
 serde = "1.0"
 serde_json = "1.0.70"
 shrinkwraprs = "0.2.1"
-validator = "0.8"
-validator_derive = "0.8"
+validator = { version = "0.14", features = ["derive"] }
 webfinger = "0.4.1"
 tracing = "0.1.22"
 tracing-subscriber = "0.2.15"

From 800e74da679a43e0479bfbe0aeb4aed6eb9a059d Mon Sep 17 00:00:00 2001
From: Kitaiti Makoto <KitaitiMakoto@gmail.com>
Date: Fri, 7 Jan 2022 04:55:49 +0900
Subject: [PATCH 05/24] Follow API change of validator

---
 src/main.rs                 |  2 --
 src/routes/comments.rs      |  2 +-
 src/routes/email_signups.rs | 10 +++++-----
 src/routes/instance.rs      |  4 ++--
 src/routes/session.rs       |  6 +++---
 src/routes/user.rs          |  8 ++++----
 6 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 854ba825..4d236661 100755
--- a/src/main.rs
+++ b/src/main.rs
@@ -7,8 +7,6 @@ extern crate gettext_macros;
 extern crate rocket;
 #[macro_use]
 extern crate serde_json;
-#[macro_use]
-extern crate validator_derive;
 
 use clap::App;
 use diesel::r2d2::ConnectionManager;
diff --git a/src/routes/comments.rs b/src/routes/comments.rs
index c8618f99..5585afff 100644
--- a/src/routes/comments.rs
+++ b/src/routes/comments.rs
@@ -23,7 +23,7 @@ use plume_models::{
 #[derive(Default, FromForm, Debug, Validate)]
 pub struct NewCommentForm {
     pub responding_to: Option<i32>,
-    #[validate(length(min = "1", message = "Your comment can't be empty"))]
+    #[validate(length(min = 1, message = "Your comment can't be empty"))]
     pub content: String,
     pub warning: String,
 }
diff --git a/src/routes/email_signups.rs b/src/routes/email_signups.rs
index 15a30db3..c874ec6c 100644
--- a/src/routes/email_signups.rs
+++ b/src/routes/email_signups.rs
@@ -20,7 +20,7 @@ use validator::{Validate, ValidationError, ValidationErrors};
 #[derive(Default, FromForm, Validate)]
 #[validate(schema(
     function = "emails_match",
-    skip_on_field_errors = "false",
+    skip_on_field_errors = false,
     message = "Emails are not matching"
 ))]
 pub struct EmailSignupForm {
@@ -41,15 +41,15 @@ fn emails_match(form: &EmailSignupForm) -> Result<(), ValidationError> {
 #[derive(Default, FromForm, Validate)]
 #[validate(schema(
     function = "passwords_match",
-    skip_on_field_errors = "false",
+    skip_on_field_errors = false,
     message = "Passwords are not matching"
 ))]
 pub struct NewUserForm {
-    #[validate(length(min = "1", message = "Username should be at least 1 characters long"))]
+    #[validate(length(min = 1, message = "Username should be at least 1 characters long"))]
     pub username: String,
-    #[validate(length(min = "8", message = "Password should be at least 8 characters long"))]
+    #[validate(length(min = 8, message = "Password should be at least 8 characters long"))]
     pub password: String,
-    #[validate(length(min = "8", message = "Password should be at least 8 characters long"))]
+    #[validate(length(min = 8, message = "Password should be at least 8 characters long"))]
     pub password_confirmation: String,
     pub email: String,
     pub token: String,
diff --git a/src/routes/instance.rs b/src/routes/instance.rs
index ae7acd5c..cedaa900 100644
--- a/src/routes/instance.rs
+++ b/src/routes/instance.rs
@@ -73,12 +73,12 @@ pub fn admin_mod(_mod: Moderator, conn: DbConn, rockets: PlumeRocket) -> Ructe {
 
 #[derive(Clone, FromForm, Validate)]
 pub struct InstanceSettingsForm {
-    #[validate(length(min = "1"))]
+    #[validate(length(min = 1))]
     pub name: String,
     pub open_registrations: bool,
     pub short_description: SafeString,
     pub long_description: SafeString,
-    #[validate(length(min = "1"))]
+    #[validate(length(min = 1))]
     pub default_license: String,
 }
 
diff --git a/src/routes/session.rs b/src/routes/session.rs
index 3264868b..1eab9693 100644
--- a/src/routes/session.rs
+++ b/src/routes/session.rs
@@ -37,9 +37,9 @@ pub fn new(m: Option<String>, conn: DbConn, rockets: PlumeRocket) -> Ructe {
 
 #[derive(Default, FromForm, Validate)]
 pub struct LoginForm {
-    #[validate(length(min = "1", message = "We need an email, or a username to identify you"))]
+    #[validate(length(min = 1, message = "We need an email, or a username to identify you"))]
     pub email_or_name: String,
-    #[validate(length(min = "1", message = "Your password can't be empty"))]
+    #[validate(length(min = 1, message = "Your password can't be empty"))]
     pub password: String,
 }
 
@@ -193,7 +193,7 @@ pub fn password_reset_form(
 #[derive(FromForm, Default, Validate)]
 #[validate(schema(
     function = "passwords_match",
-    skip_on_field_errors = "false",
+    skip_on_field_errors = false,
     message = "Passwords are not matching"
 ))]
 pub struct NewPasswordForm {
diff --git a/src/routes/user.rs b/src/routes/user.rs
index 487d28d3..e7d66de1 100644
--- a/src/routes/user.rs
+++ b/src/routes/user.rs
@@ -399,12 +399,12 @@ pub fn delete(
 #[derive(Default, FromForm, Validate)]
 #[validate(schema(
     function = "passwords_match",
-    skip_on_field_errors = "false",
+    skip_on_field_errors = false,
     message = "Passwords are not matching"
 ))]
 pub struct NewUserForm {
     #[validate(
-        length(min = "1", message = "Username can't be empty"),
+        length(min = 1, message = "Username can't be empty"),
         custom(
             function = "validate_username",
             message = "User name is not allowed to contain any of < > & @ ' or \""
@@ -413,9 +413,9 @@ pub struct NewUserForm {
     pub username: String,
     #[validate(email(message = "Invalid email"))]
     pub email: String,
-    #[validate(length(min = "8", message = "Password should be at least 8 characters long"))]
+    #[validate(length(min = 8, message = "Password should be at least 8 characters long"))]
     pub password: String,
-    #[validate(length(min = "8", message = "Password should be at least 8 characters long"))]
+    #[validate(length(min = 8, message = "Password should be at least 8 characters long"))]
     pub password_confirmation: String,
 }
 

From 191cd1174148ede8d6ce68cc4b97f6ecfd6fed7b Mon Sep 17 00:00:00 2001
From: Kitaiti Makoto <KitaitiMakoto@gmail.com>
Date: Fri, 7 Jan 2022 04:59:03 +0900
Subject: [PATCH 06/24] Upgrade dotenv

---
 Cargo.lock           | 15 ++-------------
 plume-cli/Cargo.toml |  2 +-
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a1a49339..35d65179 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1042,17 +1042,6 @@ dependencies = [
  "generic-array",
 ]
 
-[[package]]
-name = "dotenv"
-version = "0.14.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4424bad868b0ffe6ae351ee463526ba625bbca817978293bbe6bb7dc1804a175"
-dependencies = [
- "failure",
- "lazy_static",
- "regex",
-]
-
 [[package]]
 name = "dotenv"
 version = "0.15.0"
@@ -3020,7 +3009,7 @@ dependencies = [
  "clap",
  "ctrlc",
  "diesel",
- "dotenv 0.15.0",
+ "dotenv",
  "gettext",
  "gettext-macros",
  "gettext-utils",
@@ -3063,7 +3052,7 @@ version = "0.7.1-dev"
 dependencies = [
  "clap",
  "diesel",
- "dotenv 0.14.1",
+ "dotenv",
  "plume-models",
  "rpassword 5.0.1",
 ]
diff --git a/plume-cli/Cargo.toml b/plume-cli/Cargo.toml
index 575bffea..7b6b3cfd 100644
--- a/plume-cli/Cargo.toml
+++ b/plume-cli/Cargo.toml
@@ -10,7 +10,7 @@ path = "src/main.rs"
 
 [dependencies]
 clap = "2.33"
-dotenv = "0.14"
+dotenv = "0.15"
 rpassword = "5.0.0"
 
 [dependencies.diesel]

From 4056a54d44765cdec01a0684bfb9b6b341684c91 Mon Sep 17 00:00:00 2001
From: Kitaiti Makoto <KitaitiMakoto@gmail.com>
Date: Fri, 7 Jan 2022 05:03:07 +0900
Subject: [PATCH 07/24] Upgrade tracing-subscriber

---
 Cargo.lock | 40 ++--------------------------------------
 Cargo.toml |  2 +-
 2 files changed, 3 insertions(+), 39 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 35d65179..1103588c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2287,15 +2287,6 @@ dependencies = [
  "tendril",
 ]
 
-[[package]]
-name = "matchers"
-version = "0.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1"
-dependencies = [
- "regex-automata",
-]
-
 [[package]]
 name = "matches"
 version = "0.1.9"
@@ -3637,15 +3628,6 @@ dependencies = [
  "regex-syntax 0.6.25",
 ]
 
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-dependencies = [
- "regex-syntax 0.6.25",
-]
-
 [[package]]
 name = "regex-syntax"
 version = "0.4.2"
@@ -5028,36 +5010,18 @@ dependencies = [
  "tracing-core",
 ]
 
-[[package]]
-name = "tracing-serde"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb65ea441fbb84f9f6748fd496cf7f63ec9af5bca94dd86456978d055e8eb28b"
-dependencies = [
- "serde 1.0.133",
- "tracing-core",
-]
-
 [[package]]
 name = "tracing-subscriber"
-version = "0.2.25"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71"
+checksum = "5d81bfa81424cc98cb034b837c985b7a290f592e5b4322f353f94a0ab0f9f594"
 dependencies = [
  "ansi_term",
- "chrono",
- "lazy_static",
- "matchers",
- "regex",
- "serde 1.0.133",
- "serde_json",
  "sharded-slab",
  "smallvec 1.7.0",
  "thread_local",
- "tracing",
  "tracing-core",
  "tracing-log",
- "tracing-serde",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 698d3ee6..b06d1cac 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -28,7 +28,7 @@ shrinkwraprs = "0.2.1"
 validator = { version = "0.14", features = ["derive"] }
 webfinger = "0.4.1"
 tracing = "0.1.22"
-tracing-subscriber = "0.2.15"
+tracing-subscriber = "0.3.5"
 riker = "0.4.2"
 
 [[bin]]

From dd54058516b18fb1ee2c66c03b9d1a57b4e71399 Mon Sep 17 00:00:00 2001
From: Kitaiti Makoto <KitaitiMakoto@gmail.com>
Date: Fri, 7 Jan 2022 05:09:08 +0900
Subject: [PATCH 08/24] Upgrade guid-create

---
 Cargo.lock              | 19 +++----------------
 Cargo.toml              |  2 +-
 plume-models/Cargo.toml |  2 +-
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1103588c..d43e5c6a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1533,15 +1533,15 @@ dependencies = [
 
 [[package]]
 name = "guid-create"
-version = "0.1.1"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcea207bf7a6092166ab590f98fe5dde5a7deed1f1920d98dcac31f80814c40d"
+checksum = "31477e35c699193e6af9d34765c8ccaaf750a9695844cc6a7a380259452e308d"
 dependencies = [
  "byteorder 1.4.3",
  "chomp",
  "guid",
  "guid-parser",
- "rand 0.5.6",
+ "rand 0.8.4",
  "winapi 0.3.9",
 ]
 
@@ -3368,19 +3368,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "rand"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9"
-dependencies = [
- "cloudabi",
- "fuchsia-cprng",
- "libc",
- "rand_core 0.3.1",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "rand"
 version = "0.6.5"
diff --git a/Cargo.toml b/Cargo.toml
index b06d1cac..53908e91 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,7 +14,7 @@ dotenv = "0.15.0"
 gettext = { git = "https://github.com/Plume-org/gettext/", rev = "294c54d74c699fbc66502b480a37cc66c1daa7f3" }
 gettext-macros = { git = "https://github.com/Plume-org/gettext-macros/", rev = "a7c605f7edd6bfbfbfe7778026bfefd88d82db10" }
 gettext-utils = { git = "https://github.com/Plume-org/gettext-macros/", rev = "a7c605f7edd6bfbfbfe7778026bfefd88d82db10" }
-guid-create = "0.1"
+guid-create = "0.2"
 lettre_email = "0.9.2"
 num_cpus = "1.10"
 rocket = "0.4.6"
diff --git a/plume-models/Cargo.toml b/plume-models/Cargo.toml
index 42d78cd8..193d2b31 100644
--- a/plume-models/Cargo.toml
+++ b/plume-models/Cargo.toml
@@ -9,7 +9,7 @@ activitypub = "0.1.1"
 ammonia = "2.1.1"
 askama_escape = "0.1"
 bcrypt = "0.10.1"
-guid-create = "0.1"
+guid-create = "0.2"
 itertools = "0.8.0"
 lazy_static = "1.0"
 ldap3 = "0.7.1"

From 2084145dd3cb92d55470b5df2a181450475aa8ea Mon Sep 17 00:00:00 2001
From: Kitaiti Makoto <KitaitiMakoto@gmail.com>
Date: Fri, 7 Jan 2022 05:12:29 +0900
Subject: [PATCH 09/24] Upgrade multipart

---
 Cargo.lock | 27 +++++++--------------------
 Cargo.toml |  2 +-
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d43e5c6a..5a8734ba 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2375,18 +2375,6 @@ version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
 
-[[package]]
-name = "mime_guess"
-version = "1.8.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216929a5ee4dd316b1702eedf5e74548c123d370f47841ceaac38ca154690ca3"
-dependencies = [
- "mime 0.2.6",
- "phf",
- "phf_codegen",
- "unicase 1.4.2",
-]
-
 [[package]]
 name = "mime_guess"
 version = "2.0.3"
@@ -2490,17 +2478,17 @@ dependencies = [
 
 [[package]]
 name = "multipart"
-version = "0.16.1"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "136eed74cadb9edd2651ffba732b19a450316b680e4f48d6c79e905799e19d01"
+checksum = "00dec633863867f29cb39df64a397cdf4a6354708ddd7759f70c7fb51c5f9182"
 dependencies = [
  "buf_redux",
  "httparse",
  "log 0.4.14",
- "mime 0.2.6",
- "mime_guess 1.8.8",
+ "mime 0.3.16",
+ "mime_guess",
  "quick-error",
- "rand 0.6.5",
+ "rand 0.8.4",
  "safemem",
  "tempfile",
  "twoway",
@@ -2928,7 +2916,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0"
 dependencies = [
  "siphasher",
- "unicase 1.4.2",
 ]
 
 [[package]]
@@ -3654,7 +3641,7 @@ dependencies = [
  "hyper-tls 0.3.2",
  "log 0.4.14",
  "mime 0.3.16",
- "mime_guess 2.0.3",
+ "mime_guess",
  "native-tls",
  "serde 1.0.133",
  "serde_json",
@@ -3691,7 +3678,7 @@ dependencies = [
  "lazy_static",
  "log 0.4.14",
  "mime 0.3.16",
- "mime_guess 2.0.3",
+ "mime_guess",
  "native-tls",
  "percent-encoding 2.1.0",
  "pin-project-lite 0.2.8",
diff --git a/Cargo.toml b/Cargo.toml
index 53908e91..8117f297 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -50,7 +50,7 @@ version = "1.4.5"
 [dependencies.multipart]
 default-features = false
 features = ["server"]
-version = "0.16"
+version = "0.18"
 
 [dependencies.plume-api]
 path = "plume-api"

From a6f06559ea9b0fa2b7eefc53889f3cd46609ddc9 Mon Sep 17 00:00:00 2001
From: Kitaiti Makoto <KitaitiMakoto@gmail.com>
Date: Fri, 7 Jan 2022 05:14:21 +0900
Subject: [PATCH 10/24] Remove rspassword from dependencies

---
 Cargo.lock | 13 +------------
 Cargo.toml |  1 -
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5a8734ba..4d4f1a8d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3003,7 +3003,6 @@ dependencies = [
  "rocket_contrib",
  "rocket_csrf",
  "rocket_i18n",
- "rpassword 4.0.5",
  "rsass",
  "ructe",
  "scheduled-thread-pool",
@@ -3032,7 +3031,7 @@ dependencies = [
  "diesel",
  "dotenv",
  "plume-models",
- "rpassword 5.0.1",
+ "rpassword",
 ]
 
 [[package]]
@@ -3824,16 +3823,6 @@ dependencies = [
  "rocket",
 ]
 
-[[package]]
-name = "rpassword"
-version = "4.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99371657d3c8e4d816fb6221db98fa408242b0b53bac08f8676a41f8554fe99f"
-dependencies = [
- "libc",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "rpassword"
 version = "5.0.1"
diff --git a/Cargo.toml b/Cargo.toml
index 8117f297..33e46dca 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,7 +20,6 @@ num_cpus = "1.10"
 rocket = "0.4.6"
 rocket_contrib = { version = "0.4.5", features = ["json"] }
 rocket_i18n = { git = "https://github.com/Plume-org/rocket_i18n", rev = "e922afa7c366038b3433278c03b1456b346074f2" }
-rpassword = "4.0"
 scheduled-thread-pool = "0.2.2"
 serde = "1.0"
 serde_json = "1.0.70"

From d83a75e3f4075e88418a62bdacbb34337028bb19 Mon Sep 17 00:00:00 2001
From: Kitaiti Makoto <KitaitiMakoto@gmail.com>
Date: Fri, 7 Jan 2022 05:26:32 +0900
Subject: [PATCH 11/24] Add askama_escape to plume-common

---
 Cargo.lock              | 11 +++++++++--
 plume-common/Cargo.toml |  1 +
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4d4f1a8d..1c3c33c7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -204,6 +204,12 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "719b48039ffac1564f67d70162109ba9341125cee0096a540e478355b3c724a7"
 
+[[package]]
+name = "askama_escape"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a1bb320f97e6edf9f756bf015900038e43c7700e059688e5724a928c8f3b8d5"
+
 [[package]]
 name = "async-trait"
 version = "0.1.52"
@@ -2981,7 +2987,7 @@ name = "plume"
 version = "0.7.1-dev"
 dependencies = [
  "activitypub",
- "askama_escape",
+ "askama_escape 0.1.0",
  "atom_syndication",
  "chrono",
  "clap",
@@ -3042,6 +3048,7 @@ dependencies = [
  "activitystreams-derive",
  "activitystreams-traits",
  "array_tool",
+ "askama_escape 0.10.2",
  "base64 0.10.1",
  "chrono",
  "heck",
@@ -3094,7 +3101,7 @@ version = "0.7.1-dev"
 dependencies = [
  "activitypub",
  "ammonia",
- "askama_escape",
+ "askama_escape 0.1.0",
  "bcrypt",
  "chrono",
  "diesel",
diff --git a/plume-common/Cargo.toml b/plume-common/Cargo.toml
index 6e1d9912..95d2e7e1 100644
--- a/plume-common/Cargo.toml
+++ b/plume-common/Cargo.toml
@@ -24,6 +24,7 @@ syntect = "4.5.0"
 tokio = "0.1.22"
 regex-syntax = { version = "0.6.17", default-features = false, features = ["unicode-perl"] }
 tracing = "0.1.22"
+askama_escape = "0.10.2"
 
 [dependencies.chrono]
 features = ["serde"]

From c7865691710b4f6c3d205b0b1acb877742b49f5d Mon Sep 17 00:00:00 2001
From: Kitaiti Makoto <KitaitiMakoto@gmail.com>
Date: Fri, 7 Jan 2022 05:36:39 +0900
Subject: [PATCH 12/24] Define plume_common::escape()

---
 plume-common/src/utils.rs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plume-common/src/utils.rs b/plume-common/src/utils.rs
index 4bb23c85..4f55a53a 100644
--- a/plume-common/src/utils.rs
+++ b/plume-common/src/utils.rs
@@ -466,6 +466,10 @@ pub fn md_to_html<'a>(
     (buf, mentions.collect(), hashtags.collect())
 }
 
+pub fn escape(string: &str) -> askama_escape::Escaped<askama_escape::Html> {
+    askama_escape::escape(string, askama_escape::Html)
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;

From 61d54461138f06f6493911ebffa1ac65856d1912 Mon Sep 17 00:00:00 2001
From: Kitaiti Makoto <KitaitiMakoto@gmail.com>
Date: Fri, 7 Jan 2022 05:38:17 +0900
Subject: [PATCH 13/24] Use plume_common::escape() instead of
 askama_escape::escape() directly

---
 Cargo.lock                 | 10 +---------
 Cargo.toml                 |  1 -
 plume-models/src/medias.rs |  3 +--
 src/template_utils.rs      |  2 +-
 4 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1c3c33c7..5e6b0016 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -198,12 +198,6 @@ version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71938f30533e4d95a6d17aa530939da3842c2ab6f4f84b9dae68447e4129f74a"
 
-[[package]]
-name = "askama_escape"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "719b48039ffac1564f67d70162109ba9341125cee0096a540e478355b3c724a7"
-
 [[package]]
 name = "askama_escape"
 version = "0.10.2"
@@ -2987,7 +2981,6 @@ name = "plume"
 version = "0.7.1-dev"
 dependencies = [
  "activitypub",
- "askama_escape 0.1.0",
  "atom_syndication",
  "chrono",
  "clap",
@@ -3048,7 +3041,7 @@ dependencies = [
  "activitystreams-derive",
  "activitystreams-traits",
  "array_tool",
- "askama_escape 0.10.2",
+ "askama_escape",
  "base64 0.10.1",
  "chrono",
  "heck",
@@ -3101,7 +3094,6 @@ version = "0.7.1-dev"
 dependencies = [
  "activitypub",
  "ammonia",
- "askama_escape 0.1.0",
  "bcrypt",
  "chrono",
  "diesel",
diff --git a/Cargo.toml b/Cargo.toml
index 33e46dca..c1a2d8a1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,7 +7,6 @@ edition = "2018"
 
 [dependencies]
 activitypub = "0.1.3"
-askama_escape = "0.1"
 atom_syndication = "0.6"
 clap = "2.33"
 dotenv = "0.15.0"
diff --git a/plume-models/src/medias.rs b/plume-models/src/medias.rs
index 68cb52c4..f4761461 100644
--- a/plume-models/src/medias.rs
+++ b/plume-models/src/medias.rs
@@ -3,12 +3,11 @@ use crate::{
     users::User, Connection, Error, Result, CONFIG,
 };
 use activitypub::object::Image;
-use askama_escape::escape;
 use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl};
 use guid_create::GUID;
 use plume_common::{
     activity_pub::{inbox::FromId, request, Id},
-    utils::MediaProcessor,
+    utils::{escape, MediaProcessor},
 };
 use std::{
     fs::{self, DirBuilder},
diff --git a/src/template_utils.rs b/src/template_utils.rs
index de1e18ac..945fdbd9 100644
--- a/src/template_utils.rs
+++ b/src/template_utils.rs
@@ -9,7 +9,7 @@ use rocket_i18n::Catalog;
 use std::collections::{btree_map::BTreeMap, hash_map::DefaultHasher};
 use std::hash::Hasher;
 
-pub use askama_escape::escape;
+pub use plume_common::utils::escape;
 
 pub static CACHE_NAME: &str = env!("CACHE_ID");
 

From 181a78876b67f63c7a290a1563b43f2cbe812459 Mon Sep 17 00:00:00 2001
From: Kitaiti Makoto <KitaitiMakoto@gmail.com>
Date: Fri, 7 Jan 2022 05:47:46 +0900
Subject: [PATCH 14/24] Remove askama_escape from dependencies of plume-models

---
 plume-models/Cargo.toml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plume-models/Cargo.toml b/plume-models/Cargo.toml
index 193d2b31..477526ea 100644
--- a/plume-models/Cargo.toml
+++ b/plume-models/Cargo.toml
@@ -7,7 +7,6 @@ edition = "2018"
 [dependencies]
 activitypub = "0.1.1"
 ammonia = "2.1.1"
-askama_escape = "0.1"
 bcrypt = "0.10.1"
 guid-create = "0.2"
 itertools = "0.8.0"

From 32e1e4788f1f03a33f3d43c5facf6da595c2860f Mon Sep 17 00:00:00 2001
From: Kitaiti Makoto <KitaitiMakoto@gmail.com>
Date: Fri, 7 Jan 2022 05:49:06 +0900
Subject: [PATCH 15/24] Upgrade shrinkwraprs

---
 Cargo.lock              | 2 +-
 plume-models/Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5e6b0016..db68e54a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3121,7 +3121,7 @@ dependencies = [
  "serde 1.0.133",
  "serde_derive",
  "serde_json",
- "shrinkwraprs 0.2.3",
+ "shrinkwraprs 0.3.0",
  "tantivy 0.13.3",
  "tracing",
  "url 2.2.2",
diff --git a/plume-models/Cargo.toml b/plume-models/Cargo.toml
index 477526ea..b56c5e4d 100644
--- a/plume-models/Cargo.toml
+++ b/plume-models/Cargo.toml
@@ -26,7 +26,7 @@ url = "2.1"
 walkdir = "2.2"
 webfinger = "0.4.1"
 whatlang = "0.11.1"
-shrinkwraprs = "0.2.1"
+shrinkwraprs = "0.3.0"
 diesel-derive-newtype = "0.1.2"
 glob = "0.3.0"
 lindera-tantivy = { version = "0.7.1", optional = true }

From 65233c0a9a272675941bd9078f544ae7c2298b17 Mon Sep 17 00:00:00 2001
From: Kitaiti Makoto <KitaitiMakoto@gmail.com>
Date: Fri, 7 Jan 2022 05:53:09 +0900
Subject: [PATCH 16/24] Upgrade ammonia

---
 Cargo.lock              | 100 +++++++++++++++++++++++++---------------
 plume-models/Cargo.toml |   2 +-
 2 files changed, 63 insertions(+), 39 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index db68e54a..e9cf1886 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -153,16 +153,17 @@ dependencies = [
 
 [[package]]
 name = "ammonia"
-version = "2.1.3"
+version = "3.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd2d5a92c367351a571f1f1bd6c7d2c77b28d841fcc83da2a656d04b1304d57"
+checksum = "2e445c26125ff80316eaea16e812d717b147b82a68682bd4730f74d4845c8b35"
 dependencies = [
  "html5ever",
  "lazy_static",
  "maplit",
+ "markup5ever_rcdom",
  "matches",
  "tendril",
- "url 1.7.2",
+ "url 2.2.2",
 ]
 
 [[package]]
@@ -1681,16 +1682,16 @@ dependencies = [
 
 [[package]]
 name = "html5ever"
-version = "0.23.0"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ce65ac8028cf5a287a7dbf6c4e0a6cf2dcf022ed5b167a81bae66ebf599a8b7"
+checksum = "aafcf38a1a36118242d29b92e1b08ef84e67e4a5ed06e0a80be20e6a32bfed6b"
 dependencies = [
  "log 0.4.14",
  "mac",
  "markup5ever",
- "proc-macro2 0.4.30",
- "quote 0.6.13",
- "syn 0.15.44",
+ "proc-macro2 1.0.36",
+ "quote 1.0.14",
+ "syn 1.0.85",
 ]
 
 [[package]]
@@ -2272,21 +2273,30 @@ checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
 
 [[package]]
 name = "markup5ever"
-version = "0.8.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1af46a727284117e09780d05038b1ce6fc9c76cc6df183c3dae5a8955a25e21"
+checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd"
 dependencies = [
  "log 0.4.14",
  "phf",
  "phf_codegen",
- "serde 1.0.133",
- "serde_derive",
- "serde_json",
  "string_cache",
  "string_cache_codegen",
  "tendril",
 ]
 
+[[package]]
+name = "markup5ever_rcdom"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f015da43bcd8d4f144559a3423f4591d69b8ce0652c905374da7205df336ae2b"
+dependencies = [
+ "html5ever",
+ "markup5ever",
+ "tendril",
+ "xml5ever",
+]
+
 [[package]]
 name = "matches"
 version = "0.1.9"
@@ -2882,18 +2892,18 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 
 [[package]]
 name = "phf"
-version = "0.7.24"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18"
+checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
 dependencies = [
  "phf_shared",
 ]
 
 [[package]]
 name = "phf_codegen"
-version = "0.7.24"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e"
+checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815"
 dependencies = [
  "phf_generator",
  "phf_shared",
@@ -2901,19 +2911,19 @@ dependencies = [
 
 [[package]]
 name = "phf_generator"
-version = "0.7.24"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662"
+checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526"
 dependencies = [
  "phf_shared",
- "rand 0.6.5",
+ "rand 0.7.3",
 ]
 
 [[package]]
 name = "phf_shared"
-version = "0.7.24"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0"
+checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7"
 dependencies = [
  "siphasher",
 ]
@@ -3367,7 +3377,7 @@ dependencies = [
  "rand_isaac",
  "rand_jitter",
  "rand_os",
- "rand_pcg",
+ "rand_pcg 0.1.2",
  "rand_xorshift",
  "winapi 0.3.9",
 ]
@@ -3383,6 +3393,7 @@ dependencies = [
  "rand_chacha 0.2.2",
  "rand_core 0.5.1",
  "rand_hc 0.2.0",
+ "rand_pcg 0.2.1",
 ]
 
 [[package]]
@@ -3531,6 +3542,15 @@ dependencies = [
  "rand_core 0.4.2",
 ]
 
+[[package]]
+name = "rand_pcg"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
+dependencies = [
+ "rand_core 0.5.1",
+]
+
 [[package]]
 name = "rand_xorshift"
 version = "0.1.1"
@@ -4118,9 +4138,9 @@ dependencies = [
 
 [[package]]
 name = "siphasher"
-version = "0.2.3"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
+checksum = "533494a8f9b724d33625ab53c6c4800f7cc445895924a8ef649222dcb76e938b"
 
 [[package]]
 name = "slab"
@@ -4229,38 +4249,30 @@ dependencies = [
 
 [[package]]
 name = "string_cache"
-version = "0.7.5"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89c058a82f9fd69b1becf8c274f412281038877c553182f1d02eb027045a2d67"
+checksum = "923f0f39b6267d37d23ce71ae7235602134b250ace715dd2c90421998ddac0c6"
 dependencies = [
  "lazy_static",
  "new_debug_unreachable",
+ "parking_lot 0.11.2",
  "phf_shared",
  "precomputed-hash",
  "serde 1.0.133",
- "string_cache_codegen",
- "string_cache_shared",
 ]
 
 [[package]]
 name = "string_cache_codegen"
-version = "0.4.4"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0f45ed1b65bf9a4bf2f7b7dc59212d1926e9eaf00fa998988e420fd124467c6"
+checksum = "f24c8e5e19d22a726626f1a5e16fe15b132dcf21d10177fa5a45ce7962996b97"
 dependencies = [
  "phf_generator",
  "phf_shared",
  "proc-macro2 1.0.36",
  "quote 1.0.14",
- "string_cache_shared",
 ]
 
-[[package]]
-name = "string_cache_shared"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1884d1bc09741d466d9b14e6d37ac89d6909cbcac41dd9ae982d4d063bbedfc"
-
 [[package]]
 name = "strsim"
 version = "0.8.0"
@@ -5477,6 +5489,18 @@ version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3"
 
+[[package]]
+name = "xml5ever"
+version = "0.16.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9234163818fd8e2418fcde330655e757900d4236acd8cc70fef345ef91f6d865"
+dependencies = [
+ "log 0.4.14",
+ "mac",
+ "markup5ever",
+ "time 0.1.43",
+]
+
 [[package]]
 name = "yada"
 version = "0.4.1"
diff --git a/plume-models/Cargo.toml b/plume-models/Cargo.toml
index b56c5e4d..35de08bb 100644
--- a/plume-models/Cargo.toml
+++ b/plume-models/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 activitypub = "0.1.1"
-ammonia = "2.1.1"
+ammonia = "3.1.2"
 bcrypt = "0.10.1"
 guid-create = "0.2"
 itertools = "0.8.0"

From 0f0c89688725c914b2d31b5905954076c665c8f5 Mon Sep 17 00:00:00 2001
From: Kitaiti Makoto <KitaitiMakoto@gmail.com>
Date: Fri, 7 Jan 2022 06:05:05 +0900
Subject: [PATCH 17/24] Upgrade itertools

---
 Cargo.lock              | 2 +-
 plume-models/Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e9cf1886..ef430bb3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3111,7 +3111,7 @@ dependencies = [
  "diesel_migrations",
  "glob",
  "guid-create",
- "itertools 0.8.2",
+ "itertools 0.10.3",
  "lazy_static",
  "ldap3",
  "lettre",
diff --git a/plume-models/Cargo.toml b/plume-models/Cargo.toml
index 35de08bb..697cb30e 100644
--- a/plume-models/Cargo.toml
+++ b/plume-models/Cargo.toml
@@ -9,7 +9,7 @@ activitypub = "0.1.1"
 ammonia = "3.1.2"
 bcrypt = "0.10.1"
 guid-create = "0.2"
-itertools = "0.8.0"
+itertools = "0.10.3"
 lazy_static = "1.0"
 ldap3 = "0.7.1"
 migrations_internals= "1.4.0"

From 88d7d54601b640450cc0d2d05c87e2691fc91a85 Mon Sep 17 00:00:00 2001
From: Kitaiti Makoto <KitaitiMakoto@gmail.com>
Date: Fri, 7 Jan 2022 06:05:20 +0900
Subject: [PATCH 18/24] Upgrade whatlang

---
 Cargo.lock              | 4 ++--
 plume-models/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ef430bb3..618030fc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5381,9 +5381,9 @@ dependencies = [
 
 [[package]]
 name = "whatlang"
-version = "0.11.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "783066160df650d0cc2629fa4f616ef4fcf00817803789e92ca09a55eba6ff05"
+checksum = "349357fdf0f049dcb402da4a4c5a5aae80a7f6b3e5976b38475ce4ac18e5cd2f"
 dependencies = [
  "hashbrown 0.7.2",
 ]
diff --git a/plume-models/Cargo.toml b/plume-models/Cargo.toml
index 697cb30e..8a38a63b 100644
--- a/plume-models/Cargo.toml
+++ b/plume-models/Cargo.toml
@@ -25,7 +25,7 @@ tantivy = "0.13.3"
 url = "2.1"
 walkdir = "2.2"
 webfinger = "0.4.1"
-whatlang = "0.11.1"
+whatlang = "0.13.0"
 shrinkwraprs = "0.3.0"
 diesel-derive-newtype = "0.1.2"
 glob = "0.3.0"

From d53543ccb19063e91ac5b491ba27feb671e87f10 Mon Sep 17 00:00:00 2001
From: Kitaiti Makoto <KitaitiMakoto@gmail.com>
Date: Fri, 7 Jan 2022 06:06:49 +0900
Subject: [PATCH 19/24] Upgrade base64

---
 Cargo.lock              | 2 +-
 plume-common/Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 618030fc..709212ee 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3052,7 +3052,7 @@ dependencies = [
  "activitystreams-traits",
  "array_tool",
  "askama_escape",
- "base64 0.10.1",
+ "base64 0.13.0",
  "chrono",
  "heck",
  "hex",
diff --git a/plume-common/Cargo.toml b/plume-common/Cargo.toml
index 95d2e7e1..fbdfa872 100644
--- a/plume-common/Cargo.toml
+++ b/plume-common/Cargo.toml
@@ -9,7 +9,7 @@ activitypub = "0.1.1"
 activitystreams-derive = "0.1.1"
 activitystreams-traits = "0.1.0"
 array_tool = "1.0"
-base64 = "0.10"
+base64 = "0.13"
 heck = "0.3.0"
 hex = "0.3"
 hyper = "0.12.33"

From 6a808c7cc55577b505f39c2cdd9c4f98f5f55619 Mon Sep 17 00:00:00 2001
From: Kitaiti Makoto <KitaitiMakoto@gmail.com>
Date: Fri, 7 Jan 2022 06:07:07 +0900
Subject: [PATCH 20/24] Upgrade hex

---
 Cargo.lock              | 4 ++--
 plume-common/Cargo.toml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 709212ee..6ca44526 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1646,9 +1646,9 @@ dependencies = [
 
 [[package]]
 name = "hex"
-version = "0.3.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hkdf"
diff --git a/plume-common/Cargo.toml b/plume-common/Cargo.toml
index fbdfa872..4a8f7b71 100644
--- a/plume-common/Cargo.toml
+++ b/plume-common/Cargo.toml
@@ -11,7 +11,7 @@ activitystreams-traits = "0.1.0"
 array_tool = "1.0"
 base64 = "0.13"
 heck = "0.3.0"
-hex = "0.3"
+hex = "0.4"
 hyper = "0.12.33"
 openssl = "0.10.22"
 rocket = "0.4.6"

From b0bc2372fa6f4d60eb883745ba8d7781986566ae Mon Sep 17 00:00:00 2001
From: Kitaiti Makoto <KitaitiMakoto@gmail.com>
Date: Fri, 7 Jan 2022 06:12:03 +0900
Subject: [PATCH 21/24] Upgrade heck

---
 Cargo.lock              | 13 ++-----------
 plume-common/Cargo.toml |  2 +-
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6ca44526..7882813f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1628,12 +1628,9 @@ dependencies = [
 
 [[package]]
 name = "heck"
-version = "0.3.3"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
-dependencies = [
- "unicode-segmentation",
-]
+checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
 
 [[package]]
 name = "hermit-abi"
@@ -5073,12 +5070,6 @@ dependencies = [
  "tinyvec",
 ]
 
-[[package]]
-name = "unicode-segmentation"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b"
-
 [[package]]
 name = "unicode-width"
 version = "0.1.9"
diff --git a/plume-common/Cargo.toml b/plume-common/Cargo.toml
index 4a8f7b71..fb17f91d 100644
--- a/plume-common/Cargo.toml
+++ b/plume-common/Cargo.toml
@@ -10,7 +10,7 @@ activitystreams-derive = "0.1.1"
 activitystreams-traits = "0.1.0"
 array_tool = "1.0"
 base64 = "0.13"
-heck = "0.3.0"
+heck = "0.4.0"
 hex = "0.4"
 hyper = "0.12.33"
 openssl = "0.10.22"

From 677e238c6df5b958fa8a405b6d75390484373276 Mon Sep 17 00:00:00 2001
From: Kitaiti Makoto <KitaitiMakoto@gmail.com>
Date: Fri, 7 Jan 2022 06:12:15 +0900
Subject: [PATCH 22/24] Follow API change of heck

---
 plume-common/src/utils.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plume-common/src/utils.rs b/plume-common/src/utils.rs
index 4f55a53a..cae6504d 100644
--- a/plume-common/src/utils.rs
+++ b/plume-common/src/utils.rs
@@ -1,4 +1,4 @@
-use heck::CamelCase;
+use heck::ToUpperCamelCase;
 use openssl::rand::rand_bytes;
 use pulldown_cmark::{html, CodeBlockKind, CowStr, Event, LinkType, Options, Parser, Tag};
 use regex_syntax::is_word_character;
@@ -21,7 +21,7 @@ pub fn random_hex() -> String {
 
 /// Remove non alphanumeric characters and CamelCase a string
 pub fn make_actor_id(name: &str) -> String {
-    name.to_camel_case()
+    name.to_upper_camel_case()
         .chars()
         .filter(|c| c.is_alphanumeric())
         .collect()

From 6778a0e9437e94e9fd7babae63453dd43b54e76f Mon Sep 17 00:00:00 2001
From: Kitaiti Makoto <KitaitiMakoto@gmail.com>
Date: Fri, 7 Jan 2022 06:16:00 +0900
Subject: [PATCH 23/24] Remove hyper from plume-common

---
 Cargo.lock              | 1 -
 plume-common/Cargo.toml | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7882813f..48f34810 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3053,7 +3053,6 @@ dependencies = [
  "chrono",
  "heck",
  "hex",
- "hyper 0.12.36",
  "once_cell",
  "openssl",
  "pulldown-cmark",
diff --git a/plume-common/Cargo.toml b/plume-common/Cargo.toml
index fb17f91d..777e002b 100644
--- a/plume-common/Cargo.toml
+++ b/plume-common/Cargo.toml
@@ -12,7 +12,6 @@ array_tool = "1.0"
 base64 = "0.13"
 heck = "0.4.0"
 hex = "0.4"
-hyper = "0.12.33"
 openssl = "0.10.22"
 rocket = "0.4.6"
 reqwest = { version = "0.9", features = ["socks"] }
@@ -37,3 +36,5 @@ branch = "bidi-plume"
 
 [dev-dependencies]
 once_cell = "1.5.2"
+
+[features]

From c5c6b70a892dded95170c28c635a8e7a30cda952 Mon Sep 17 00:00:00 2001
From: Kitaiti Makoto <KitaitiMakoto@gmail.com>
Date: Fri, 7 Jan 2022 06:17:58 +0900
Subject: [PATCH 24/24] Upgrade ldap3

---
 Cargo.lock              | 122 ++++++++++++++++++++++++++++++++--------
 plume-models/Cargo.toml |   2 +-
 2 files changed, 99 insertions(+), 25 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 48f34810..57fdf507 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1602,7 +1602,7 @@ dependencies = [
  "indexmap",
  "slab",
  "tokio 0.2.25",
- "tokio-util",
+ "tokio-util 0.3.1",
  "tracing",
  "tracing-futures",
 ]
@@ -2003,23 +2003,23 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "lber"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a749954d43fcfb8d4381aa0c6cf291065053e0590d622f4f830393a9bd8278a5"
+checksum = "8a99b520993b21a6faab32643cf4726573dc18ca4cf2d48cbeb24d248c86c930"
 dependencies = [
  "byteorder 1.4.3",
- "bytes 0.5.6",
+ "bytes 1.1.0",
  "nom 2.2.1",
 ]
 
 [[package]]
 name = "ldap3"
-version = "0.7.4"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915f14e5fbd72f2f0816dcdbb98b56e7fe6d04dae6ed2c0395133b627aafda9e"
+checksum = "b2bdad98cd197646a9fd7be985cb711cffaded69d8dc0d87d83f8d88bcbc1691"
 dependencies = [
  "async-trait",
- "bytes 0.5.6",
+ "bytes 1.1.0",
  "futures 0.3.19",
  "futures-util",
  "lazy_static",
@@ -2030,9 +2030,10 @@ dependencies = [
  "nom 2.2.1",
  "percent-encoding 2.1.0",
  "thiserror",
- "tokio 0.2.25",
+ "tokio 1.15.0",
  "tokio-native-tls",
- "tokio-util",
+ "tokio-stream",
+ "tokio-util 0.6.9",
  "url 2.2.2",
 ]
 
@@ -2427,6 +2428,19 @@ dependencies = [
  "winapi 0.2.8",
 ]
 
+[[package]]
+name = "mio"
+version = "0.7.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc"
+dependencies = [
+ "libc",
+ "log 0.4.14",
+ "miow 0.3.7",
+ "ntapi",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "mio-extras"
 version = "2.0.6"
@@ -2435,7 +2449,7 @@ checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19"
 dependencies = [
  "lazycell",
  "log 0.4.14",
- "mio",
+ "mio 0.6.23",
  "slab",
 ]
 
@@ -2446,7 +2460,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656"
 dependencies = [
  "log 0.4.14",
- "mio",
+ "mio 0.6.23",
  "miow 0.3.7",
  "winapi 0.3.9",
 ]
@@ -2459,7 +2473,7 @@ checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0"
 dependencies = [
  "iovec",
  "libc",
- "mio",
+ "mio 0.6.23",
 ]
 
 [[package]]
@@ -2645,12 +2659,21 @@ dependencies = [
  "fsevent-sys",
  "inotify",
  "libc",
- "mio",
+ "mio 0.6.23",
  "mio-extras",
  "walkdir",
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "ntapi"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
+dependencies = [
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "num-bigint"
 version = "0.4.3"
@@ -4648,7 +4671,7 @@ checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6"
 dependencies = [
  "bytes 0.4.12",
  "futures 0.1.31",
- "mio",
+ "mio 0.6.23",
  "num_cpus",
  "tokio-codec",
  "tokio-current-thread",
@@ -4677,14 +4700,29 @@ dependencies = [
  "lazy_static",
  "libc",
  "memchr",
- "mio",
+ "mio 0.6.23",
  "mio-named-pipes",
  "mio-uds",
  "num_cpus",
  "pin-project-lite 0.1.12",
  "signal-hook-registry",
  "slab",
- "tokio-macros",
+ "tokio-macros 0.2.6",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "tokio"
+version = "1.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbbf1c778ec206785635ce8ad57fe52b3009ae9e0c9f574a728f3049d3e55838"
+dependencies = [
+ "bytes 1.1.0",
+ "libc",
+ "memchr",
+ "mio 0.7.14",
+ "pin-project-lite 0.2.8",
+ "tokio-macros 1.7.0",
  "winapi 0.3.9",
 ]
 
@@ -4764,13 +4802,24 @@ dependencies = [
 ]
 
 [[package]]
-name = "tokio-native-tls"
-version = "0.1.0"
+name = "tokio-macros"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd608593a919a8e05a7d1fc6df885e40f6a88d3a70a3a7eff23ff27964eda069"
+checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7"
+dependencies = [
+ "proc-macro2 1.0.36",
+ "quote 1.0.14",
+ "syn 1.0.85",
+]
+
+[[package]]
+name = "tokio-native-tls"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b"
 dependencies = [
  "native-tls",
- "tokio 0.2.25",
+ "tokio 1.15.0",
 ]
 
 [[package]]
@@ -4783,7 +4832,7 @@ dependencies = [
  "futures 0.1.31",
  "lazy_static",
  "log 0.4.14",
- "mio",
+ "mio 0.6.23",
  "num_cpus",
  "parking_lot 0.9.0",
  "slab",
@@ -4792,6 +4841,17 @@ dependencies = [
  "tokio-sync",
 ]
 
+[[package]]
+name = "tokio-stream"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3"
+dependencies = [
+ "futures-core",
+ "pin-project-lite 0.2.8",
+ "tokio 1.15.0",
+]
+
 [[package]]
 name = "tokio-sync"
 version = "0.1.8"
@@ -4811,7 +4871,7 @@ dependencies = [
  "bytes 0.4.12",
  "futures 0.1.31",
  "iovec",
- "mio",
+ "mio 0.6.23",
  "tokio-io",
  "tokio-reactor",
 ]
@@ -4864,7 +4924,7 @@ dependencies = [
  "bytes 0.4.12",
  "futures 0.1.31",
  "log 0.4.14",
- "mio",
+ "mio 0.6.23",
  "tokio-codec",
  "tokio-io",
  "tokio-reactor",
@@ -4881,7 +4941,7 @@ dependencies = [
  "iovec",
  "libc",
  "log 0.4.14",
- "mio",
+ "mio 0.6.23",
  "mio-uds",
  "tokio-codec",
  "tokio-io",
@@ -4902,6 +4962,20 @@ dependencies = [
  "tokio 0.2.25",
 ]
 
+[[package]]
+name = "tokio-util"
+version = "0.6.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0"
+dependencies = [
+ "bytes 1.1.0",
+ "futures-core",
+ "futures-sink",
+ "log 0.4.14",
+ "pin-project-lite 0.2.8",
+ "tokio 1.15.0",
+]
+
 [[package]]
 name = "toml"
 version = "0.4.10"
diff --git a/plume-models/Cargo.toml b/plume-models/Cargo.toml
index 8a38a63b..c0c4da3a 100644
--- a/plume-models/Cargo.toml
+++ b/plume-models/Cargo.toml
@@ -11,7 +11,7 @@ bcrypt = "0.10.1"
 guid-create = "0.2"
 itertools = "0.10.3"
 lazy_static = "1.0"
-ldap3 = "0.7.1"
+ldap3 = "0.9.3"
 migrations_internals= "1.4.0"
 openssl = "0.10.22"
 rocket = "0.4.6"