nix-config/overlay/plume/0001-cargo-update.patch

1281 lines
34 KiB
Diff

From 4543edd52c5ff7e369c11a79aecdf9a99ef3d0e8 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Sun, 19 Jun 2022 23:15:30 +0200
Subject: [PATCH] cargo update
---
Cargo.lock | 450 ++++++++++++++++++++---------------------
Cargo.toml | 3 +
plume-front/Cargo.toml | 2 +-
3 files changed, 225 insertions(+), 230 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index fd91e109..be2aa1f8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -121,7 +121,7 @@ version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
dependencies = [
- "getrandom 0.2.6",
+ "getrandom 0.2.7",
"once_cell",
"version_check 0.9.4",
]
@@ -199,13 +199,13 @@ dependencies = [
[[package]]
name = "async-trait"
-version = "0.1.53"
+version = "0.1.56"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600"
+checksum = "96cf8829f67d2eab0b2dfa42c5d0ef737e0724e4a82b01b3e292456202b19716"
dependencies = [
- "proc-macro2 1.0.37",
- "quote 1.0.18",
- "syn 1.0.92",
+ "proc-macro2 1.0.39",
+ "quote 1.0.19",
+ "syn 1.0.98",
]
[[package]]
@@ -337,7 +337,7 @@ checksum = "6fe4fef31efb0f76133ae8e3576a88e58edb7cfc5584c81c758c349ba46b43fc"
dependencies = [
"base64 0.13.0",
"blowfish",
- "getrandom 0.2.6",
+ "getrandom 0.2.7",
"zeroize",
]
@@ -408,15 +408,15 @@ checksum = "40e38929add23cdf8a366df9b0e088953150724bcbe5fc330b0d8eb3b328eec8"
[[package]]
name = "bumpalo"
-version = "3.9.1"
+version = "3.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899"
+checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3"
[[package]]
name = "bytecount"
-version = "0.6.2"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72feb31ffc86498dacdbd0fcebb56138e7177a8cc5cea4516031d15ae85a742e"
+checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c"
[[package]]
name = "byteorder"
@@ -493,7 +493,7 @@ dependencies = [
"num-integer",
"num-traits 0.2.15",
"serde 1.0.137",
- "time 0.1.43",
+ "time 0.1.44",
"winapi 0.3.9",
]
@@ -591,7 +591,7 @@ version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "615f6e27d000a2bffbc7f2f6a8669179378fa27ee4d0a509e985dfc0a7defb40"
dependencies = [
- "getrandom 0.2.6",
+ "getrandom 0.2.7",
"lazy_static",
"proc-macro-hack 0.5.19",
"tiny-keccak",
@@ -599,9 +599,7 @@ dependencies = [
[[package]]
name = "conv"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ff10625fd0ac447827aa30ea8b861fead473bb60aeb73af6c1c58caf0d1299"
+version = "0.3.4"
dependencies = [
"custom_derive",
]
@@ -619,7 +617,7 @@ dependencies = [
"percent-encoding 2.1.0",
"rand 0.8.5",
"sha2",
- "time 0.1.43",
+ "time 0.1.44",
]
[[package]]
@@ -628,7 +626,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",
]
@@ -645,7 +643,7 @@ dependencies = [
"publicsuffix",
"serde 1.0.137",
"serde_json",
- "time 0.1.43",
+ "time 0.1.44",
"try_from",
"url 1.7.2",
]
@@ -711,11 +709,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ae5588f6b3c3cb05239e90bd110f257254aecd01e4635400391aeae07497845"
dependencies = [
"cfg-if 1.0.0",
- "crossbeam-channel 0.5.4",
+ "crossbeam-channel 0.5.5",
"crossbeam-deque 0.8.1",
- "crossbeam-epoch 0.9.8",
+ "crossbeam-epoch 0.9.9",
"crossbeam-queue 0.3.5",
- "crossbeam-utils 0.8.8",
+ "crossbeam-utils 0.8.9",
]
[[package]]
@@ -730,12 +728,12 @@ dependencies = [
[[package]]
name = "crossbeam-channel"
-version = "0.5.4"
+version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53"
+checksum = "4c02a4d71819009c192cf4872265391563fd6a84c81ff2c0f2a7026ca4c1d85c"
dependencies = [
"cfg-if 1.0.0",
- "crossbeam-utils 0.8.8",
+ "crossbeam-utils 0.8.9",
]
[[package]]
@@ -756,8 +754,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
dependencies = [
"cfg-if 1.0.0",
- "crossbeam-epoch 0.9.8",
- "crossbeam-utils 0.8.8",
+ "crossbeam-epoch 0.9.9",
+ "crossbeam-utils 0.8.9",
]
[[package]]
@@ -777,15 +775,15 @@ dependencies = [
[[package]]
name = "crossbeam-epoch"
-version = "0.9.8"
+version = "0.9.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c"
+checksum = "07db9d94cbd326813772c968ccd25999e5f8ae22f4f8d1b11effa37ef6ce281d"
dependencies = [
"autocfg 1.1.0",
"cfg-if 1.0.0",
- "crossbeam-utils 0.8.8",
- "lazy_static",
+ "crossbeam-utils 0.8.9",
"memoffset 0.6.5",
+ "once_cell",
"scopeguard",
]
@@ -807,7 +805,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f25d8400f4a7a5778f0e4e52384a48cbd9b5c495d110786187fc750075277a2"
dependencies = [
"cfg-if 1.0.0",
- "crossbeam-utils 0.8.8",
+ "crossbeam-utils 0.8.9",
]
[[package]]
@@ -823,12 +821,12 @@ dependencies = [
[[package]]
name = "crossbeam-utils"
-version = "0.8.8"
+version = "0.8.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38"
+checksum = "8ff1f980957787286a554052d03c7aee98d99cc32e09f6d45f0a814133c87978"
dependencies = [
"cfg-if 1.0.0",
- "lazy_static",
+ "once_cell",
]
[[package]]
@@ -900,10 +898,10 @@ checksum = "8e91455b86830a1c21799d94524df0845183fa55bafd9aa137b01c7d1065fa36"
dependencies = [
"fnv",
"ident_case",
- "proc-macro2 1.0.37",
- "quote 1.0.18",
+ "proc-macro2 1.0.39",
+ "quote 1.0.19",
"strsim 0.10.0",
- "syn 1.0.92",
+ "syn 1.0.98",
]
[[package]]
@@ -913,8 +911,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "29b5acf0dea37a7f66f7b25d2c5e93fd46f8f6968b1a5d7a3e02e97768afc95a"
dependencies = [
"darling_core",
- "quote 1.0.18",
- "syn 1.0.92",
+ "quote 1.0.19",
+ "syn 1.0.98",
]
[[package]]
@@ -975,9 +973,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "66e616858f6187ed828df7c64a6d71720d83767a7f19740b2d1b6fe6327b36e5"
dependencies = [
"darling",
- "proc-macro2 1.0.37",
- "quote 1.0.18",
- "syn 1.0.92",
+ "proc-macro2 1.0.39",
+ "quote 1.0.19",
+ "syn 1.0.98",
]
[[package]]
@@ -987,7 +985,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "58a94ace95092c5acb1e97a7e846b310cfbd499652f72297da7493f618a98d73"
dependencies = [
"derive_builder_core",
- "syn 1.0.92",
+ "syn 1.0.98",
]
[[package]]
@@ -1054,9 +1052,9 @@ version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "45f5098f628d02a7a0f68ddba586fb61e80edec3bdc1be3b921f4ceec60858d3"
dependencies = [
- "proc-macro2 1.0.37",
- "quote 1.0.18",
- "syn 1.0.92",
+ "proc-macro2 1.0.39",
+ "quote 1.0.19",
+ "syn 1.0.98",
]
[[package]]
@@ -1128,7 +1126,7 @@ dependencies = [
"encoding",
"lazy_static",
"rand 0.4.6",
- "time 0.1.43",
+ "time 0.1.44",
"version_check 0.1.5",
]
@@ -1232,9 +1230,9 @@ version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
dependencies = [
- "proc-macro2 1.0.37",
- "quote 1.0.18",
- "syn 1.0.92",
+ "proc-macro2 1.0.39",
+ "quote 1.0.19",
+ "syn 1.0.98",
"synstructure",
]
@@ -1270,13 +1268,11 @@ dependencies = [
[[package]]
name = "flate2"
-version = "1.0.23"
+version = "1.0.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b39522e96686d38f4bc984b9198e3a0613264abaebaff2c5c918bfa6b6da09af"
+checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6"
dependencies = [
- "cfg-if 1.0.0",
"crc32fast",
- "libc",
"miniz_oxide",
]
@@ -1456,9 +1452,9 @@ version = "0.3.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512"
dependencies = [
- "proc-macro2 1.0.37",
- "quote 1.0.18",
- "syn 1.0.92",
+ "proc-macro2 1.0.39",
+ "quote 1.0.19",
+ "syn 1.0.98",
]
[[package]]
@@ -1514,14 +1510,14 @@ dependencies = [
[[package]]
name = "getrandom"
-version = "0.2.6"
+version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad"
+checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
dependencies = [
"cfg-if 1.0.0",
"js-sys",
"libc",
- "wasi 0.10.2+wasi-snapshot-preview1",
+ "wasi 0.11.0+wasi-snapshot-preview1",
"wasm-bindgen",
]
@@ -1543,9 +1539,9 @@ checksum = "649db3b5cda06091ea6aacb9f66f7002dfe885505b324b8ed795261253ffc2b3"
dependencies = [
"gettext",
"gettext-utils",
- "proc-macro2 1.0.37",
- "quote 1.0.18",
- "syn 1.0.92",
+ "proc-macro2 1.0.39",
+ "quote 1.0.19",
+ "syn 1.0.98",
]
[[package]]
@@ -1657,7 +1653,7 @@ dependencies = [
"futures-core",
"futures-sink",
"futures-util",
- "http 0.2.7",
+ "http 0.2.8",
"indexmap",
"slab",
"tokio 0.2.25",
@@ -1677,11 +1673,11 @@ dependencies = [
"futures-core",
"futures-sink",
"futures-util",
- "http 0.2.7",
+ "http 0.2.8",
"indexmap",
"slab",
"tokio 1.19.2",
- "tokio-util 0.7.1",
+ "tokio-util 0.7.3",
"tracing",
]
@@ -1757,9 +1753,9 @@ dependencies = [
"log 0.4.17",
"mac",
"markup5ever",
- "proc-macro2 1.0.37",
- "quote 1.0.18",
- "syn 1.0.92",
+ "proc-macro2 1.0.39",
+ "quote 1.0.19",
+ "syn 1.0.98",
]
[[package]]
@@ -1781,13 +1777,13 @@ dependencies = [
[[package]]
name = "http"
-version = "0.2.7"
+version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff8670570af52249509a86f5e3e18a08c60b177071826898fde8997cf5f6bfbb"
+checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
dependencies = [
"bytes 1.1.0",
"fnv",
- "itoa 1.0.1",
+ "itoa 1.0.2",
]
[[package]]
@@ -1809,17 +1805,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b"
dependencies = [
"bytes 0.5.6",
- "http 0.2.7",
+ "http 0.2.8",
]
[[package]]
name = "http-body"
-version = "0.4.4"
+version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6"
+checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
dependencies = [
"bytes 1.1.0",
- "http 0.2.7",
+ "http 0.2.8",
"pin-project-lite 0.2.9",
]
@@ -1853,7 +1849,7 @@ dependencies = [
"log 0.3.9",
"mime 0.2.6",
"num_cpus",
- "time 0.1.43",
+ "time 0.1.44",
"traitobject",
"typeable",
"unicase 1.4.2",
@@ -1878,7 +1874,7 @@ dependencies = [
"log 0.4.17",
"net2",
"rustc_version",
- "time 0.1.43",
+ "time 0.1.44",
"tokio 0.1.22",
"tokio-buf",
"tokio-executor",
@@ -1901,7 +1897,7 @@ dependencies = [
"futures-core",
"futures-util",
"h2 0.2.7",
- "http 0.2.7",
+ "http 0.2.8",
"http-body 0.3.1",
"httparse",
"httpdate 0.3.2",
@@ -1916,20 +1912,20 @@ dependencies = [
[[package]]
name = "hyper"
-version = "0.14.18"
+version = "0.14.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b26ae0a80afebe130861d90abf98e3814a4f28a4c6ffeb5ab8ebb2be311e0ef2"
+checksum = "42dc3c131584288d375f2d07f822b0cb012d8c6fb899a5b9fdb3cb7eb9b6004f"
dependencies = [
"bytes 1.1.0",
"futures-channel",
"futures-core",
"futures-util",
"h2 0.3.13",
- "http 0.2.7",
- "http-body 0.4.4",
+ "http 0.2.8",
+ "http-body 0.4.5",
"httparse",
"httpdate 1.0.2",
- "itoa 1.0.1",
+ "itoa 1.0.2",
"pin-project-lite 0.2.9",
"socket2 0.4.4",
"tokio 1.19.2",
@@ -1971,7 +1967,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
dependencies = [
"bytes 1.1.0",
- "hyper 0.14.18",
+ "hyper 0.14.19",
"native-tls",
"tokio 1.19.2",
"tokio-native-tls",
@@ -2013,12 +2009,12 @@ checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed"
[[package]]
name = "indexmap"
-version = "1.8.1"
+version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee"
+checksum = "6c6392766afd7964e2531940894cffe4bd8d7d17dbc3c1c4857040fd4b33bdb3"
dependencies = [
"autocfg 1.1.0",
- "hashbrown 0.11.2",
+ "hashbrown 0.12.1",
]
[[package]]
@@ -2076,9 +2072,9 @@ checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b"
[[package]]
name = "iri-string"
-version = "0.5.4"
+version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e76a2a488a2bce15f9e696e3b9b66a4e1412c13339344bba8a24b7eae30f91b"
+checksum = "141fcdf9a9482268670cec9575062b4db299646cdf7897222b689bcb1d86d68b"
dependencies = [
"serde 1.0.137",
]
@@ -2109,9 +2105,9 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
[[package]]
name = "itoa"
-version = "1.0.1"
+version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
+checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d"
[[package]]
name = "js-sys"
@@ -2181,7 +2177,7 @@ dependencies = [
"tokio 1.19.2",
"tokio-native-tls",
"tokio-stream",
- "tokio-util 0.7.1",
+ "tokio-util 0.7.3",
"url 2.2.2",
]
@@ -2213,7 +2209,7 @@ dependencies = [
"email",
"lettre",
"mime 0.3.16",
- "time 0.1.43",
+ "time 0.1.44",
"uuid 0.7.4",
]
@@ -2238,9 +2234,9 @@ dependencies = [
[[package]]
name = "libc"
-version = "0.2.125"
+version = "0.2.126"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b"
+checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
[[package]]
name = "libsqlite3-sys"
@@ -2500,9 +2496,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9753f12909fd8d923f75ae5c3258cae1ed3c8ec052e1b38c93c21a6d157f789c"
dependencies = [
"migrations_internals",
- "proc-macro2 1.0.37",
- "quote 1.0.18",
- "syn 1.0.92",
+ "proc-macro2 1.0.39",
+ "quote 1.0.19",
+ "syn 1.0.98",
]
[[package]]
@@ -2538,9 +2534,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
[[package]]
name = "miniz_oxide"
-version = "0.5.1"
+version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082"
+checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc"
dependencies = [
"adler",
]
@@ -2566,16 +2562,14 @@ dependencies = [
[[package]]
name = "mio"
-version = "0.8.2"
+version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9"
+checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf"
dependencies = [
"libc",
"log 0.4.17",
- "miow 0.3.7",
- "ntapi",
"wasi 0.11.0+wasi-snapshot-preview1",
- "winapi 0.3.9",
+ "windows-sys",
]
[[package]]
@@ -2667,7 +2661,7 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3"
dependencies = [
- "getrandom 0.2.6",
+ "getrandom 0.2.7",
]
[[package]]
@@ -2801,15 +2795,6 @@ dependencies = [
"winapi 0.3.9",
]
-[[package]]
-name = "ntapi"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f"
-dependencies = [
- "winapi 0.3.9",
-]
-
[[package]]
name = "num-bigint"
version = "0.4.3"
@@ -2881,9 +2866,9 @@ dependencies = [
[[package]]
name = "object"
-version = "0.28.3"
+version = "0.28.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40bec70ba014595f99f7aa110b84331ffe1ee9aece7fe6f387cc7e3ecda4d456"
+checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424"
dependencies = [
"memchr",
]
@@ -2943,9 +2928,9 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
dependencies = [
- "proc-macro2 1.0.37",
- "quote 1.0.18",
- "syn 1.0.92",
+ "proc-macro2 1.0.39",
+ "quote 1.0.19",
+ "syn 1.0.98",
]
[[package]]
@@ -2956,9 +2941,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
[[package]]
name = "openssl-sys"
-version = "0.9.73"
+version = "0.9.74"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d5fd19fb3e0a8191c1e34935718976a3e70c112ab9a24af6d7cadccd9d90bc0"
+checksum = "835363342df5fba8354c5b453325b110ffd54044e588c539cf2f20a8014e4cb1"
dependencies = [
"autocfg 1.1.0",
"cc",
@@ -3009,9 +2994,9 @@ dependencies = [
[[package]]
name = "parking_lot"
-version = "0.12.0"
+version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58"
+checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
dependencies = [
"lock_api 0.4.7",
"parking_lot_core 0.9.3",
@@ -3070,9 +3055,9 @@ dependencies = [
[[package]]
name = "pear_codegen"
-version = "0.1.4"
+version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfc1c836fdc3d1ef87c348b237b5b5c4dff922156fb2d968f57734f9669768ca"
+checksum = "c0288ba5d581afbc93e2bbd931c1013584c15ecf46b1cdb927edc7abddbc8ca6"
dependencies = [
"proc-macro2 0.4.30",
"quote 0.6.13",
@@ -3146,9 +3131,9 @@ version = "1.0.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb"
dependencies = [
- "proc-macro2 1.0.37",
- "quote 1.0.18",
- "syn 1.0.92",
+ "proc-macro2 1.0.39",
+ "quote 1.0.19",
+ "syn 1.0.98",
]
[[package]]
@@ -3384,9 +3369,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
dependencies = [
"proc-macro-error-attr",
- "proc-macro2 1.0.37",
- "quote 1.0.18",
- "syn 1.0.92",
+ "proc-macro2 1.0.39",
+ "quote 1.0.19",
+ "syn 1.0.98",
"version_check 0.9.4",
]
@@ -3396,8 +3381,8 @@ version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
dependencies = [
- "proc-macro2 1.0.37",
- "quote 1.0.18",
+ "proc-macro2 1.0.39",
+ "quote 1.0.19",
"version_check 0.9.4",
]
@@ -3442,11 +3427,11 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.37"
+version = "1.0.39"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1"
+checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f"
dependencies = [
- "unicode-xid 0.2.3",
+ "unicode-ident",
]
[[package]]
@@ -3505,11 +3490,11 @@ dependencies = [
[[package]]
name = "quote"
-version = "1.0.18"
+version = "1.0.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1"
+checksum = "f53dc8cf16a769a6f677e09e7ff2cd4be1ea0f48754aac39520536962011de0d"
dependencies = [
- "proc-macro2 1.0.37",
+ "proc-macro2 1.0.39",
]
[[package]]
@@ -3639,7 +3624,7 @@ version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
dependencies = [
- "getrandom 0.2.6",
+ "getrandom 0.2.7",
]
[[package]]
@@ -3715,9 +3700,9 @@ dependencies = [
[[package]]
name = "rayon"
-version = "1.5.2"
+version = "1.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd249e82c21598a9a426a4e00dd7adc1d640b22445ec8545feef801d1a74c221"
+checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d"
dependencies = [
"autocfg 1.1.0",
"crossbeam-deque 0.8.1",
@@ -3727,13 +3712,13 @@ dependencies = [
[[package]]
name = "rayon-core"
-version = "1.9.2"
+version = "1.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f51245e1e62e1f1629cbfec37b5793bbabcaeb90f30e94d2ba03564687353e4"
+checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f"
dependencies = [
- "crossbeam-channel 0.5.4",
+ "crossbeam-channel 0.5.5",
"crossbeam-deque 0.8.1",
- "crossbeam-utils 0.8.8",
+ "crossbeam-utils 0.8.9",
"num_cpus",
]
@@ -3763,9 +3748,9 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.5.5"
+version = "1.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286"
+checksum = "d83f127d94bdbcda4c8cc2e50f6f84f4b611f69c902699ca385a39c3a75f9ff1"
dependencies = [
"aho-corasick",
"memchr",
@@ -3816,7 +3801,7 @@ dependencies = [
"serde 1.0.137",
"serde_json",
"serde_urlencoded 0.5.5",
- "time 0.1.43",
+ "time 0.1.44",
"tokio 0.1.22",
"tokio-executor",
"tokio-io",
@@ -3838,7 +3823,7 @@ dependencies = [
"encoding_rs",
"futures-core",
"futures-util",
- "http 0.2.7",
+ "http 0.2.8",
"http-body 0.3.1",
"hyper 0.13.10",
"hyper-tls 0.4.3",
@@ -3874,9 +3859,9 @@ dependencies = [
"futures-core",
"futures-util",
"h2 0.3.13",
- "http 0.2.7",
- "http-body 0.4.4",
- "hyper 0.14.18",
+ "http 0.2.8",
+ "http-body 0.4.5",
+ "hyper 0.14.19",
"hyper-tls 0.5.0",
"ipnet",
"js-sys",
@@ -3959,7 +3944,7 @@ dependencies = [
"rocket_codegen",
"rocket_http",
"state",
- "time 0.1.43",
+ "time 0.1.44",
"toml 0.4.10",
"version_check 0.9.4",
"yansi",
@@ -4002,7 +3987,7 @@ dependencies = [
"ring",
"rocket",
"serde 1.0.137",
- "time 0.1.43",
+ "time 0.1.44",
]
[[package]]
@@ -4018,7 +4003,7 @@ dependencies = [
"percent-encoding 1.0.1",
"smallvec 1.8.0",
"state",
- "time 0.1.43",
+ "time 0.1.44",
"unicode-xid 0.1.0",
]
@@ -4046,9 +4031,9 @@ dependencies = [
[[package]]
name = "rsass"
-version = "0.25.0"
+version = "0.25.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0a591e01b92182a881aa6d89df6e56c6923a6589662c0194921466024d7d78b"
+checksum = "0ab003a9ff922b4d7b1f5f383bc54645887ad278f534dfc65e071096fcb30023"
dependencies = [
"fastrand",
"lazy_static",
@@ -4107,9 +4092,9 @@ dependencies = [
[[package]]
name = "ryu"
-version = "1.0.9"
+version = "1.0.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f"
+checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695"
[[package]]
name = "safemem"
@@ -4128,12 +4113,12 @@ dependencies = [
[[package]]
name = "schannel"
-version = "0.1.19"
+version = "0.1.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75"
+checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2"
dependencies = [
"lazy_static",
- "winapi 0.3.9",
+ "windows-sys",
]
[[package]]
@@ -4142,7 +4127,7 @@ version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "977a7519bff143a44f842fd07e80ad1329295bd71686457f18e496736f4bf9bf"
dependencies = [
- "parking_lot 0.12.0",
+ "parking_lot 0.12.1",
]
[[package]]
@@ -4223,9 +4208,9 @@ version = "1.0.137"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be"
dependencies = [
- "proc-macro2 1.0.37",
- "quote 1.0.18",
- "syn 1.0.92",
+ "proc-macro2 1.0.39",
+ "quote 1.0.19",
+ "syn 1.0.98",
]
[[package]]
@@ -4234,7 +4219,7 @@ version = "1.0.81"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c"
dependencies = [
- "itoa 1.0.1",
+ "itoa 1.0.2",
"ryu",
"serde 1.0.137",
]
@@ -4267,7 +4252,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
dependencies = [
"form_urlencoded",
- "itoa 1.0.1",
+ "itoa 1.0.2",
"ryu",
"serde 1.0.137",
]
@@ -4302,9 +4287,9 @@ checksum = "e63e6744142336dfb606fe2b068afa2e1cca1ee6a5d8377277a92945d81fa331"
dependencies = [
"bitflags 1.3.2",
"itertools 0.8.2",
- "proc-macro2 1.0.37",
- "quote 1.0.18",
- "syn 1.0.92",
+ "proc-macro2 1.0.39",
+ "quote 1.0.19",
+ "syn 1.0.98",
]
[[package]]
@@ -4442,7 +4427,7 @@ checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08"
dependencies = [
"new_debug_unreachable",
"once_cell",
- "parking_lot 0.12.0",
+ "parking_lot 0.12.1",
"phf_shared",
"precomputed-hash",
"serde 1.0.137",
@@ -4456,8 +4441,8 @@ checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988"
dependencies = [
"phf_generator",
"phf_shared",
- "proc-macro2 1.0.37",
- "quote 1.0.18",
+ "proc-macro2 1.0.39",
+ "quote 1.0.19",
]
[[package]]
@@ -4513,13 +4498,13 @@ dependencies = [
[[package]]
name = "syn"
-version = "1.0.92"
+version = "1.0.98"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ff7c592601f11445996a06f8ad0c27f094a58857c2f89e97974ab9235b92c52"
+checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd"
dependencies = [
- "proc-macro2 1.0.37",
- "quote 1.0.18",
- "unicode-xid 0.2.3",
+ "proc-macro2 1.0.39",
+ "quote 1.0.19",
+ "unicode-ident",
]
[[package]]
@@ -4528,9 +4513,9 @@ version = "0.12.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
dependencies = [
- "proc-macro2 1.0.37",
- "quote 1.0.18",
- "syn 1.0.92",
+ "proc-macro2 1.0.39",
+ "quote 1.0.19",
+ "syn 1.0.98",
"unicode-xid 0.2.3",
]
@@ -4742,9 +4727,9 @@ version = "1.0.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a"
dependencies = [
- "proc-macro2 1.0.37",
- "quote 1.0.18",
- "syn 1.0.92",
+ "proc-macro2 1.0.39",
+ "quote 1.0.19",
+ "syn 1.0.98",
]
[[package]]
@@ -4758,11 +4743,12 @@ dependencies = [
[[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",
]
@@ -4772,7 +4758,7 @@ version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd"
dependencies = [
- "itoa 1.0.1",
+ "itoa 1.0.2",
"libc",
"num_threads",
]
@@ -4853,14 +4839,14 @@ dependencies = [
"bytes 1.1.0",
"libc",
"memchr",
- "mio 0.8.2",
+ "mio 0.8.4",
"num_cpus",
"once_cell",
- "parking_lot 0.12.0",
+ "parking_lot 0.12.1",
"pin-project-lite 0.2.9",
"signal-hook-registry",
"socket2 0.4.4",
- "tokio-macros 1.7.0",
+ "tokio-macros 1.8.0",
"winapi 0.3.9",
]
@@ -4912,20 +4898,20 @@ version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a"
dependencies = [
- "proc-macro2 1.0.37",
- "quote 1.0.18",
- "syn 1.0.92",
+ "proc-macro2 1.0.39",
+ "quote 1.0.19",
+ "syn 1.0.98",
]
[[package]]
name = "tokio-macros"
-version = "1.7.0"
+version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7"
+checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484"
dependencies = [
- "proc-macro2 1.0.37",
- "quote 1.0.18",
- "syn 1.0.92",
+ "proc-macro2 1.0.39",
+ "quote 1.0.19",
+ "syn 1.0.98",
]
[[package]]
@@ -4971,9 +4957,9 @@ dependencies = [
[[package]]
name = "tokio-stream"
-version = "0.1.8"
+version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3"
+checksum = "df54d54117d6fdc4e4fea40fe1e4e566b3505700e148a6827e59b34b0d2600d9"
dependencies = [
"futures-core",
"pin-project-lite 0.2.9",
@@ -5059,9 +5045,9 @@ dependencies = [
[[package]]
name = "tokio-util"
-version = "0.7.1"
+version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764"
+checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45"
dependencies = [
"bytes 1.1.0",
"futures-core",
@@ -5091,9 +5077,9 @@ dependencies = [
[[package]]
name = "tower-service"
-version = "0.3.1"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
+checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
[[package]]
name = "tracing"
@@ -5114,9 +5100,9 @@ version = "0.1.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc6b8ad3567499f98a1db7a752b07a7c8c7c7c34c332ec00effb2b0027974b7c"
dependencies = [
- "proc-macro2 1.0.37",
- "quote 1.0.18",
- "syn 1.0.92",
+ "proc-macro2 1.0.39",
+ "quote 1.0.19",
+ "syn 1.0.98",
]
[[package]]
@@ -5230,6 +5216,12 @@ version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
+[[package]]
+name = "unicode-ident"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c"
+
[[package]]
name = "unicode-normalization"
version = "0.1.19"
@@ -5323,7 +5315,7 @@ version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
dependencies = [
- "getrandom 0.2.6",
+ "getrandom 0.2.7",
"serde 1.0.137",
]
@@ -5352,10 +5344,10 @@ dependencies = [
"if_chain",
"lazy_static",
"proc-macro-error",
- "proc-macro2 1.0.37",
- "quote 1.0.18",
+ "proc-macro2 1.0.39",
+ "quote 1.0.19",
"regex",
- "syn 1.0.92",
+ "syn 1.0.98",
"validator_types",
]
@@ -5365,8 +5357,8 @@ version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2ddf34293296847abfc1493b15c6e2f5d3cd19f57ad7d22673bf4c6278da329"
dependencies = [
- "proc-macro2 1.0.37",
- "syn 1.0.92",
+ "proc-macro2 1.0.39",
+ "syn 1.0.98",
]
[[package]]
@@ -5445,9 +5437,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 = "wasi"
@@ -5476,17 +5468,17 @@ dependencies = [
"bumpalo",
"lazy_static",
"log 0.4.17",
- "proc-macro2 1.0.37",
- "quote 1.0.18",
- "syn 1.0.92",
+ "proc-macro2 1.0.39",
+ "quote 1.0.19",
+ "syn 1.0.98",
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-futures"
-version = "0.4.30"
+version = "0.4.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f741de44b75e14c35df886aff5f1eb73aa114fa5d4d00dcd37b5e01259bf3b2"
+checksum = "de9a9cec1733468a8c657e57fa2413d2ae2c0129b95e87c5b72b8ace4d13f31f"
dependencies = [
"cfg-if 1.0.0",
"js-sys",
@@ -5500,7 +5492,7 @@ version = "0.2.81"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c441e177922bc58f1e12c022624b6216378e5febc2f0533e41ba443d505b80aa"
dependencies = [
- "quote 1.0.18",
+ "quote 1.0.19",
"wasm-bindgen-macro-support",
]
@@ -5510,9 +5502,9 @@ version = "0.2.81"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d94ac45fcf608c1f45ef53e748d35660f168490c10b23704c7779ab8f5c3048"
dependencies = [
- "proc-macro2 1.0.37",
- "quote 1.0.18",
- "syn 1.0.92",
+ "proc-macro2 1.0.39",
+ "quote 1.0.19",
+ "syn 1.0.98",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
diff --git a/Cargo.toml b/Cargo.toml
index 3632d47f..030b226e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -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 3ea82f17..b30b07c5 100644
--- a/plume-front/Cargo.toml
+++ b/plume-front/Cargo.toml
@@ -14,7 +14,7 @@ gettext-utils = "0.1.0"
lazy_static = "1.3"
serde = "1.0"
serde_json = "1.0"
-wasm-bindgen = "0.2.81"
+wasm-bindgen = "0.2.79"
js-sys = "0.3.58"
serde_derive = "1.0.123"
console_error_panic_hook = "0.1.6"
--
2.36.0