diff --git a/.gitlab/CODEOWNERS b/.gitlab/CODEOWNERS new file mode 100644 index 0000000000..481f44ae39 --- /dev/null +++ b/.gitlab/CODEOWNERS @@ -0,0 +1,3 @@ +*/Cargo.toml @xMAC94x +Cargo.toml @xMAC94x +rust-toolchain @xMAC94x \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index cb28e02171..50414f1559 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -26,9 +26,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f3e0bf23f51883cce372d5d5892211236856e4bb37fb942e1eb135ee0f146e3" +checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217" dependencies = [ "const-random", ] @@ -93,19 +93,13 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33954243bd79057c2de7338850b85983a44588021f8a5fee574a8888c6de4344" -[[package]] -name = "approx" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08abcc3b4e9339e33a3d0a5ed15d84a687350c05689d825e0f6655eef9e76a94" - [[package]] name = "approx" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0e60b75072ecd4168020818c0107f2857bb6c4e64252d8d3983f6263b40a5c3" dependencies = [ - "num-traits 0.2.11", + "num-traits", ] [[package]] @@ -125,8 +119,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0609c78bd572f4edc74310dfb63a01f5609d53fa8b4dd7c4d98aef3b3e8d72d1" dependencies = [ "proc-macro-hack", - "quote 1.0.6", - "syn 1.0.27", + "quote 1.0.7", + "syn 1.0.31", ] [[package]] @@ -152,9 +146,9 @@ checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" [[package]] name = "ascii" -version = "0.8.7" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97be891acc47ca214468e09425d02cef3af2c94d0d82081cd02061f996802f14" +checksum = "bbf56136a5198c7b01a49e3afcbef6cf84597273d298f54432926024107b0109" [[package]] name = "async-std" @@ -171,7 +165,7 @@ dependencies = [ "futures-io", "futures-timer", "kv-log-macro", - "log 0.4.8", + "log", "memchr", "mio", "mio-uds", @@ -225,25 +219,25 @@ dependencies = [ [[package]] name = "auth-common" version = "0.1.0" -source = "git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97#65571ade0d954a0e0bd995fdb314854ff146ab97" +source = "git+https://gitlab.com/veloren/auth.git?rev=223a4097f7ebc8d451936dccb5e6517194bbf086#223a4097f7ebc8d451936dccb5e6517194bbf086" dependencies = [ "rand 0.7.3", "serde", - "uuid 0.7.4", + "uuid", ] [[package]] name = "authc" version = "1.0.0" -source = "git+https://gitlab.com/veloren/auth.git?rev=65571ade0d954a0e0bd995fdb314854ff146ab97#65571ade0d954a0e0bd995fdb314854ff146ab97" +source = "git+https://gitlab.com/veloren/auth.git?rev=223a4097f7ebc8d451936dccb5e6517194bbf086#223a4097f7ebc8d451936dccb5e6517194bbf086" dependencies = [ "auth-common", "fxhash", "hex", - "reqwest", - "rust-argon2 0.6.1", + "rust-argon2 0.8.2", "serde_json", - "uuid 0.7.4", + "ureq", + "uuid", ] [[package]] @@ -277,31 +271,18 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b20b618342cf9891c292c4f5ac2cde7287cc5c87e87e9c769d617793607dec1" -[[package]] -name = "base64" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" -dependencies = [ - "byteorder 1.3.4", - "safemem", -] - -[[package]] -name = "base64" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" -dependencies = [ - "byteorder 1.3.4", -] - [[package]] name = "base64" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" +[[package]] +name = "base64" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d1ccbaf7d9ec9537465a97bf19edc1a4e158ecb49fc16178202238c569cc42" + [[package]] name = "bincode" version = "1.2.1" @@ -325,8 +306,8 @@ dependencies = [ "lazy_static", "lazycell", "peeking_take_while", - "proc-macro2 1.0.17", - "quote 1.0.6", + "proc-macro2 1.0.18", + "quote 1.0.7", "regex", "rustc-hash", "shlex", @@ -379,26 +360,6 @@ dependencies = [ "slab", ] -[[package]] -name = "brotli-sys" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "brotli2" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e" -dependencies = [ - "brotli-sys", - "libc", -] - [[package]] name = "bstr" version = "0.2.13" @@ -411,21 +372,11 @@ dependencies = [ "serde", ] -[[package]] -name = "buf_redux" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b953a6887648bb07a535631f2bc00fbdb2a2216f135552cb3f534ed136b9c07f" -dependencies = [ - "memchr", - "safemem", -] - [[package]] name = "bumpalo" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5356f1d23ee24a1f785a56d1d1a5f0fd5b0f6a0c0fb2412ce11da71649ab78f6" +checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820" [[package]] name = "byteorder" @@ -450,12 +401,6 @@ dependencies = [ "iovec", ] -[[package]] -name = "bytes" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1" - [[package]] name = "c_vec" version = "1.3.3" @@ -546,15 +491,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80094f509cf8b5ae86a4966a39b3ff66cd7e2a3e594accec3743ff3fabeab5b2" dependencies = [ "num-integer", - "num-traits 0.2.11", + "num-traits", "time", ] [[package]] name = "chunked_transfer" -version = "0.3.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "498d20a7aaf62625b9bf26e637cf7736417cde1d0c99f1d04d1170229a85cf87" +checksum = "5b89647f09b9f4c838cb622799b2843e4e13bff64661dab9a0362bb92985addd" [[package]] name = "clang-sys" @@ -564,7 +509,7 @@ checksum = "fe6837df1d5cba2397b835c8530f51723267e16abbf83892e9e5af4f0e5dd10a" dependencies = [ "glob", "libc", - "libloading", + "libloading 0.5.2", ] [[package]] @@ -604,7 +549,7 @@ checksum = "1706996401131526e36b3b49f0c4d912639ce110996f3ca144d78946727bce54" dependencies = [ "bitflags", "block", - "core-foundation 0.6.4", + "core-foundation", "core-graphics", "foreign-types", "libc", @@ -619,19 +564,13 @@ checksum = "f29f7768b2d1be17b96158e3285951d366b40211320fb30826a76cb7a0da6400" dependencies = [ "bitflags", "block", - "core-foundation 0.6.4", + "core-foundation", "core-graphics", "foreign-types", "libc", "objc", ] -[[package]] -name = "color_quant" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dbbb57365263e881e805dc77d94697c9118fd94d8da011240555aa7b23445bd" - [[package]] name = "colored" version = "1.9.3" @@ -716,9 +655,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a43d28ffebd3bb949c8c274de94fb84826134a023c5e6dac528c38a0f1cf1ba" dependencies = [ "darling", - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", ] [[package]] @@ -758,17 +697,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" dependencies = [ - "core-foundation-sys 0.6.2", - "libc", -] - -[[package]] -name = "core-foundation" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" -dependencies = [ - "core-foundation-sys 0.7.0", + "core-foundation-sys", "libc", ] @@ -778,12 +707,6 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" -[[package]] -name = "core-foundation-sys" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" - [[package]] name = "core-graphics" version = "0.17.3" @@ -791,7 +714,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56790968ab1c8a1202a102e6de05fc6e1ec87da99e4e93e9a7d13efbfc1e95a9" dependencies = [ "bitflags", - "core-foundation 0.6.4", + "core-foundation", "foreign-types", "libc", ] @@ -822,12 +745,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ded070249be850b5b59e1e3a44a70b8ae395e0e5c65b487131d8909a8208120" dependencies = [ "alsa-sys", - "core-foundation-sys 0.6.2", + "core-foundation-sys", "coreaudio-rs", "failure", "lazy_static", "libc", - "num-traits 0.2.11", + "num-traits", "stdweb 0.1.3", "winapi 0.3.8", ] @@ -854,7 +777,7 @@ dependencies = [ "csv", "itertools 0.9.0", "lazy_static", - "num-traits 0.2.11", + "num-traits", "oorandom", "plotters", "rayon", @@ -960,12 +883,13 @@ dependencies = [ [[package]] name = "crossbeam-queue" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c695eeca1e7173472a32221542ae469b3e9aac3a4fc81f7696bcad82029493db" +checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" dependencies = [ "cfg-if", "crossbeam-utils 0.7.2", + "maybe-uninit", ] [[package]] @@ -1011,15 +935,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "ct-logs" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d3686f5fa27dbc1d76c751300376e167c5a43387f44bb451fd1c24776e49113" -dependencies = [ - "sct", -] - [[package]] name = "daggy" version = "0.5.0" @@ -1047,10 +962,10 @@ checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.17", - "quote 1.0.6", + "proc-macro2 1.0.18", + "quote 1.0.7", "strsim", - "syn 1.0.27", + "syn 1.0.31", ] [[package]] @@ -1060,17 +975,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" dependencies = [ "darling_core", - "quote 1.0.6", - "syn 1.0.27", + "quote 1.0.7", + "syn 1.0.31", ] [[package]] name = "dashmap" -version = "3.11.2" +version = "3.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b384aed866a28e92a6943f4f5d869f0a623776b550751cb87e711148803c18" +checksum = "8cfcd41ae02d60edded204341d2798ba519c336c51a37330aa4b98a1128def32" dependencies = [ - "ahash 0.3.5", + "ahash 0.3.8", "cfg-if", "num_cpus", ] @@ -1089,7 +1004,6 @@ checksum = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4" dependencies = [ "adler32", "byteorder 1.3.4", - "gzip-header", ] [[package]] @@ -1111,9 +1025,9 @@ checksum = "80115a2dfde04491e181c2440a39e4be26e52d9ca4e92bed213f65b94e0b8db1" [[package]] name = "diesel" -version = "1.4.4" +version = "1.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33d7ca63eb2efea87a7f56a283acc49e2ce4b2bd54adf7465dc1d81fef13d8fc" +checksum = "3e2de9deab977a153492a1468d1b1c0662c1cf39e5ea87d0c060ecd59ef18d8c" dependencies = [ "byteorder 1.3.4", "diesel_derives", @@ -1126,9 +1040,9 @@ version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45f5098f628d02a7a0f68ddba586fb61e80edec3bdc1be3b921f4ceec60858d3" dependencies = [ - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", ] [[package]] @@ -1151,24 +1065,12 @@ dependencies = [ "dirs-sys", ] -[[package]] -name = "dirs" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" -dependencies = [ - "libc", - "redox_users", - "winapi 0.3.8", -] - [[package]] name = "dirs-sys" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b" +checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a" dependencies = [ - "cfg-if", "libc", "redox_users", "winapi 0.3.8", @@ -1188,11 +1090,11 @@ checksum = "04e93ca78226c51902d7aa8c12c988338aadd9e85ed9c6be8aaac39192ff3605" [[package]] name = "dlib" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77e51249a9d823a4cb79e3eca6dcd756153e8ed0157b6c04775d04bf1b13b76a" +checksum = "b11f15d1e3268f140f68d390637d5e76d849782d971ae7063e0da69fe9709a76" dependencies = [ - "libloading", + "libloading 0.6.2", ] [[package]] @@ -1203,7 +1105,7 @@ checksum = "83c18405ef54de0398b77a3ec8394d3a1639e7bf060e1385201e8db40c44ab41" dependencies = [ "byteorder 1.3.4", "lazy_static", - "log 0.4.8", + "log", "nom 4.2.3", ] @@ -1228,27 +1130,12 @@ dependencies = [ "bitflags", ] -[[package]] -name = "dtoa" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4358a9e11b9a09cf52383b451b49a169e8d797b68aa02301ff586d70d9661ea3" - [[package]] name = "either" version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" -[[package]] -name = "encoding_rs" -version = "0.8.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8ac63f94732332f44fe654443c46f6375d1939684c17b0afb6cb56b0456e171" -dependencies = [ - "cfg-if", -] - [[package]] name = "env_logger" version = "0.6.2" @@ -1257,7 +1144,7 @@ checksum = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3" dependencies = [ "atty", "humantime", - "log 0.4.8", + "log", "regex", "termcolor", ] @@ -1274,11 +1161,10 @@ dependencies = [ [[package]] name = "euc" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20f6684a8420df7c300a36bed7cb0b2387b2bc385d4940282399b5df0c08ebd" +version = "0.5.1" +source = "git+https://github.com/zesterer/euc.git#c9a7c17a03d45fce00caeeca09afa1e1558cd183" dependencies = [ - "vek 0.9.12", + "vek", ] [[package]] @@ -1288,7 +1174,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "596b99621b9477e7a5f94d2d8dd13a9c5c302ac358b822c67a42b6f1054450e1" dependencies = [ "euclid_macros", - "num-traits 0.2.11", + "num-traits", ] [[package]] @@ -1318,9 +1204,9 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" dependencies = [ - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", "synstructure", ] @@ -1332,7 +1218,7 @@ checksum = "e69ab0d5aca163e388c3a49d284fed6c3d0810700e77c5ae2756a50ec1a4daaa" dependencies = [ "chrono", "colored", - "log 0.4.8", + "log", ] [[package]] @@ -1382,9 +1268,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fsevent" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1616e68919f49d311720c3cf316e0a3522d8f2bd08f8da35f6b8a0fa12f9234b" +checksum = "97f347202c95c98805c216f9e1df210e8ebaec9fdb2365700a43c10797a35e63" dependencies = [ "bitflags", "fsevent-sys", @@ -1392,9 +1278,9 @@ dependencies = [ [[package]] name = "fsevent-sys" -version = "3.0.0" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a41f1722e9bf862f62429d192f37d0c82c589aa18783aa06f0c4e5c3c90649fb" +checksum = "77a29c77f1ca394c3e73a9a5d24cfcabb734682d9634fc398f2204a63c994120" dependencies = [ "libc", ] @@ -1493,9 +1379,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39" dependencies = [ "proc-macro-hack", - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", ] [[package]] @@ -1634,7 +1520,7 @@ checksum = "01de46f9508a5c259aef105f0bff760ceddca832ea9c87ce03d1923e22ee155b" dependencies = [ "draw_state", "gfx_core", - "log 0.4.8", + "log", ] [[package]] @@ -1645,7 +1531,7 @@ checksum = "75fbddaef2e12b4995900539d7209d947b988a3d87ee8737484d049b526e5441" dependencies = [ "bitflags", "draw_state", - "log 0.4.8", + "log", ] [[package]] @@ -1656,7 +1542,7 @@ checksum = "109c385fa380c18888633aa27d1e16cbae518469702a2f69dcb5f52d5378bebc" dependencies = [ "gfx_core", "gfx_gl", - "log 0.4.8", + "log", ] [[package]] @@ -1679,16 +1565,6 @@ dependencies = [ "glutin", ] -[[package]] -name = "gif" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "471d90201b3b223f3451cd4ad53e34295f16a1df17b1edf3736d47761c3981af" -dependencies = [ - "color_quant", - "lzw", -] - [[package]] name = "gilrs" version = "0.7.4" @@ -1697,10 +1573,10 @@ checksum = "122bb249f904e5f4ac73fc514b9b2ce6cce3af511f5df00ffc8000e47de6b290" dependencies = [ "fnv", "gilrs-core", - "log 0.4.8", + "log", "serde", "stdweb 0.4.20", - "uuid 0.8.1", + "uuid", "vec_map", ] @@ -1710,15 +1586,15 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43c758daf46af26d6872fe55507e3b2339779a160a06ad7a9b2a082f221209cd" dependencies = [ - "core-foundation 0.6.4", + "core-foundation", "io-kit-sys", "libc", "libudev-sys", - "log 0.4.8", + "log", "nix 0.15.0", "rusty-xinput", "stdweb 0.4.20", - "uuid 0.8.1", + "uuid", "vec_map", "winapi 0.3.8", ] @@ -1766,7 +1642,7 @@ dependencies = [ "bitflags", "libc", "libgit2-sys", - "log 0.4.8", + "log", "openssl-probe", "openssl-sys", "url 2.1.1", @@ -1779,7 +1655,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca98bbde17256e02d17336a6bdb5a50f7d0ccacee502e191d3e3d0ec2f96f84a" dependencies = [ "khronos_api", - "log 0.4.8", + "log", "xml-rs", ] @@ -1790,7 +1666,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" dependencies = [ "khronos_api", - "log 0.4.8", + "log", "xml-rs", ] @@ -1852,7 +1728,7 @@ dependencies = [ "android_glue", "cgl", "cocoa 0.18.5", - "core-foundation 0.6.4", + "core-foundation", "core-graphics", "glutin_egl_sys", "glutin_emscripten_sys", @@ -1860,7 +1736,7 @@ dependencies = [ "glutin_glx_sys", "glutin_wgl_sys", "lazy_static", - "libloading", + "libloading 0.5.2", "objc", "osmesa-sys", "parking_lot 0.9.0", @@ -1979,15 +1855,6 @@ dependencies = [ "svg_fmt", ] -[[package]] -name = "gzip-header" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0131feb3d3bb2a5a238d8a4d09f6353b7ebfdc52e77bccbf4ea6eaa751dde639" -dependencies = [ - "crc32fast", -] - [[package]] name = "h2" version = "0.1.26" @@ -1995,36 +1862,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462" dependencies = [ "byteorder 1.3.4", - "bytes 0.4.12", + "bytes", "fnv", "futures 0.1.29", - "http 0.1.21", + "http", "indexmap", - "log 0.4.8", + "log", "slab", "string", "tokio-io", ] -[[package]] -name = "h2" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79b7246d7e4b979c03fa093da39cfb3617a96bbeee6310af63991668d7e843ff" -dependencies = [ - "bytes 0.5.4", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 0.2.1", - "indexmap", - "log 0.4.8", - "slab", - "tokio 0.2.21", - "tokio-util", -] - [[package]] name = "hashbrown" version = "0.6.3" @@ -2080,18 +1928,7 @@ version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0" dependencies = [ - "bytes 0.4.12", - "fnv", - "itoa", -] - -[[package]] -name = "http" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9" -dependencies = [ - "bytes 0.5.4", + "bytes", "fnv", "itoa", ] @@ -2102,22 +1939,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d" dependencies = [ - "bytes 0.4.12", + "bytes", "futures 0.1.29", - "http 0.1.21", + "http", "tokio-buf", ] -[[package]] -name = "http-body" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" -dependencies = [ - "bytes 0.5.4", - "http 0.2.1", -] - [[package]] name = "http-service" version = "0.4.0" @@ -2125,9 +1952,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9625f605ddfaf894bf78a544a7b8e31f562dc843654723a49892d9c7e75ac708" dependencies = [ "async-std", - "bytes 0.4.12", + "bytes", "futures 0.3.5", - "http 0.1.21", + "http", "pin-project-lite", ] @@ -2138,9 +1965,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e33d5dae94e0fdb82f9524ea2f2b98458b3d8448526d8cc8beccb3d3fded8aff" dependencies = [ "futures 0.3.5", - "http 0.1.21", + "http", "http-service", - "hyper 0.12.35", + "hyper", ] [[package]] @@ -2164,20 +1991,20 @@ version = "0.12.35" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9dbe6ed1438e1f8ad955a4701e9a944938e9519f6888d12d8558b645e247d5f6" dependencies = [ - "bytes 0.4.12", + "bytes", "futures 0.1.29", "futures-cpupool", - "h2 0.1.26", - "http 0.1.21", - "http-body 0.1.0", + "h2", + "http", + "http-body", "httparse", "iovec", "itoa", - "log 0.4.8", + "log", "net2", "rustc_version", "time", - "tokio 0.1.22", + "tokio", "tokio-buf", "tokio-executor", "tokio-io", @@ -2185,49 +2012,7 @@ dependencies = [ "tokio-tcp", "tokio-threadpool", "tokio-timer", - "want 0.2.0", -] - -[[package]] -name = "hyper" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96816e1d921eca64d208a85aab4f7798455a8e34229ee5a88c935bdee1b78b14" -dependencies = [ - "bytes 0.5.4", - "futures-channel", - "futures-core", - "futures-util", - "h2 0.2.5", - "http 0.2.1", - "http-body 0.3.1", - "httparse", - "itoa", - "log 0.4.8", - "net2", - "pin-project", - "time", - "tokio 0.2.21", - "tower-service", - "want 0.3.0", -] - -[[package]] -name = "hyper-rustls" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac965ea399ec3a25ac7d13b8affd4b8f39325cca00858ddf5eb29b79e6b14b08" -dependencies = [ - "bytes 0.5.4", - "ct-logs", - "futures-util", - "hyper 0.13.5", - "log 0.4.8", - "rustls", - "rustls-native-certs", - "tokio 0.2.21", - "tokio-rustls", - "webpki", + "want", ] [[package]] @@ -2265,21 +2050,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08ed2ada878397b045454ac7cfb011d73132c59f31a955d230bd1f1c2e68eb4a" dependencies = [ "byteorder 1.3.4", - "gif", - "jpeg-decoder", "num-iter", "num-rational", - "num-traits 0.2.11", + "num-traits", "png", - "scoped_threadpool", - "tiff", ] [[package]] name = "indexmap" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076f042c5b7b98f31d205f1249267e12a6518c1481e9dae9764af19b707d2292" +checksum = "c398b2b113b55809ceb9ee3e753fcbac793f1956663f3c36549c1346015c2afe" dependencies = [ "autocfg 1.0.0", ] @@ -2295,9 +2076,9 @@ dependencies = [ [[package]] name = "inotify" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc39ee997811267bf8aa0b10e1674c5bea6caacc1957eede5ea45251fe33c6d5" +checksum = "46dd0a94b393c730779ccfd2a872b67b1eb67be3fc33082e733bdb38b5fde4d4" dependencies = [ "bitflags", "inotify-sys", @@ -2325,7 +2106,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f21dcc74995dd4cd090b147e79789f8d65959cbfb5f0b118002db869ea3bd0a0" dependencies = [ - "core-foundation-sys 0.6.2", + "core-foundation-sys", "mach", ] @@ -2371,21 +2152,11 @@ dependencies = [ "libc", ] -[[package]] -name = "jpeg-decoder" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b47b4c4e017b01abdc5bcc126d2d1002e5a75bbe3ce73f9f4f311a916363704" -dependencies = [ - "byteorder 1.3.4", - "rayon", -] - [[package]] name = "js-sys" -version = "0.3.39" +version = "0.3.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa5a448de267e7358beaf4a5d849518fe9a0c13fce7afd44b06e68550e5562a7" +checksum = "ce10c23ad2ea25ceca0093bd3192229da4c5b3c0f2de499c1ecac0d98d452177" dependencies = [ "wasm-bindgen", ] @@ -2412,7 +2183,7 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ff57d6d215f7ca7eb35a9a64d656ba4d9d2bef114d741dc08048e75e2f5d418" dependencies = [ - "log 0.4.8", + "log", ] [[package]] @@ -2468,6 +2239,15 @@ dependencies = [ "winapi 0.3.8", ] +[[package]] +name = "libloading" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cadb8e769f070c45df05c78c7520eb4cd17061d4ab262e43cfc68b4d00ac71c" +dependencies = [ + "winapi 0.3.8", +] + [[package]] name = "libsqlite3-sys" version = "0.9.3" @@ -2521,7 +2301,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5cc7ad3d82c845bdb5dde34ffdcc7a5fb4d2996e1e1ee0f19c33bc80e15196b9" dependencies = [ - "num-traits 0.2.11", + "num-traits", ] [[package]] @@ -2539,15 +2319,6 @@ dependencies = [ "scopeguard", ] -[[package]] -name = "log" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" -dependencies = [ - "log 0.4.8", -] - [[package]] name = "log" version = "0.4.8" @@ -2567,12 +2338,6 @@ dependencies = [ "quick-error", ] -[[package]] -name = "lzw" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d947cbb889ed21c2a84be6ffbaebf5b4e0f4340638cba0444907e38b56be084" - [[package]] name = "mach" version = "0.2.3" @@ -2653,18 +2418,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9753f12909fd8d923f75ae5c3258cae1ed3c8ec052e1b38c93c21a6d157f789c" dependencies = [ "migrations_internals", - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", -] - -[[package]] -name = "mime" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0" -dependencies = [ - "log 0.3.9", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", ] [[package]] @@ -2673,28 +2429,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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212" -dependencies = [ - "mime 0.3.16", - "unicase 2.6.0", -] - [[package]] name = "minifb" version = "0.14.0" @@ -2722,7 +2456,7 @@ dependencies = [ "iovec", "kernel32-sys", "libc", - "log 0.4.8", + "log", "miow", "net2", "slab", @@ -2736,7 +2470,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" dependencies = [ "lazycell", - "log 0.4.8", + "log", "mio", "slab", ] @@ -2781,24 +2515,6 @@ dependencies = [ "winapi 0.3.8", ] -[[package]] -name = "multipart" -version = "0.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adba94490a79baf2d6a23eac897157047008272fa3eecb3373ae6377b91eca28" -dependencies = [ - "buf_redux", - "httparse", - "log 0.4.8", - "mime 0.2.6", - "mime_guess 1.8.8", - "quick-error", - "rand 0.4.6", - "safemem", - "tempdir", - "twoway", -] - [[package]] name = "net2" version = "0.2.34" @@ -2900,7 +2616,7 @@ checksum = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e" dependencies = [ "num-integer", "num-iter", - "num-traits 0.2.11", + "num-traits", ] [[package]] @@ -2914,7 +2630,7 @@ dependencies = [ "num-integer", "num-iter", "num-rational", - "num-traits 0.2.11", + "num-traits", ] [[package]] @@ -2925,7 +2641,7 @@ checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" dependencies = [ "autocfg 1.0.0", "num-integer", - "num-traits 0.2.11", + "num-traits", ] [[package]] @@ -2935,18 +2651,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" dependencies = [ "autocfg 1.0.0", - "num-traits 0.2.11", -] - -[[package]] -name = "num-derive" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eafd0b45c5537c3ba526f79d3e75120036502bebacbb3f3220914067ce39dbf2" -dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "syn 0.15.44", + "num-traits", ] [[package]] @@ -2956,7 +2661,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba" dependencies = [ "autocfg 1.0.0", - "num-traits 0.2.11", + "num-traits", ] [[package]] @@ -2967,7 +2672,7 @@ checksum = "dfb0800a0291891dd9f4fe7bd9c19384f98f7fbe0cd0f39a2c6b88b9868bbc00" dependencies = [ "autocfg 1.0.0", "num-integer", - "num-traits 0.2.11", + "num-traits", ] [[package]] @@ -2979,16 +2684,7 @@ dependencies = [ "autocfg 1.0.0", "num-bigint", "num-integer", - "num-traits 0.2.11", -] - -[[package]] -name = "num-traits" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" -dependencies = [ - "num-traits 0.2.11", + "num-traits", ] [[package]] @@ -3074,9 +2770,9 @@ checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" [[package]] name = "openssl-sys" -version = "0.9.57" +version = "0.9.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7410fef80af8ac071d4f63755c0ab89ac3df0fd1ea91f1d1f37cf5cec4395990" +checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de" dependencies = [ "autocfg 1.0.0", "cc", @@ -3101,7 +2797,7 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "18869315e81473c951eb56ad5558bbc56978562d3ecfb87abb7a1e944cea4518" dependencies = [ - "num-traits 0.2.11", + "num-traits", ] [[package]] @@ -3257,70 +2953,31 @@ dependencies = [ "fixedbitset", ] -[[package]] -name = "phf" -version = "0.7.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18" -dependencies = [ - "phf_shared", -] - -[[package]] -name = "phf_codegen" -version = "0.7.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e" -dependencies = [ - "phf_generator", - "phf_shared", -] - -[[package]] -name = "phf_generator" -version = "0.7.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662" -dependencies = [ - "phf_shared", - "rand 0.6.5", -] - -[[package]] -name = "phf_shared" -version = "0.7.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" -dependencies = [ - "siphasher", - "unicase 1.4.2", -] - [[package]] name = "pin-project" -version = "0.4.17" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc93aeee735e60ecb40cf740eb319ff23eab1c5748abfdb5c180e4ce49f7791" +checksum = "e75373ff9037d112bb19bc61333a06a159eaeb217660dcfbea7d88e1db823919" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "0.4.17" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e58db2081ba5b4c93bd6be09c40fd36cb9193a8336c384f3b40012e531aa7e40" +checksum = "10b4b44893d3c370407a1d6a5cfde7c41ae0478e31c516c85f67eb3adc51be6d" dependencies = [ - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", ] [[package]] name = "pin-project-lite" -version = "0.1.5" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7505eeebd78492e0f6108f7171c4948dbb120ee8119d9d77d0afa5469bef67f" +checksum = "282adbf10f2698a7a77f8e983a74b2d18176c19a7fd32a45446139ae7b02b715" [[package]] name = "pin-utils" @@ -3368,7 +3025,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d1685fbe7beba33de0330629da9d955ac75bd54f33d7b79f9a895590124f6bb" dependencies = [ "js-sys", - "num-traits 0.2.11", + "num-traits", "wasm-bindgen", "web-sys", ] @@ -3388,9 +3045,9 @@ dependencies = [ [[package]] name = "portpicker" version = "0.1.0" -source = "git+https://github.com/wusyong/portpicker-rs?branch=fix_ipv6#06b989ac271ada33f9d44e7bcfcb10d55ead0c43" +source = "git+https://github.com/xMAC94x/portpicker-rs#9d6df36c53c94684080a64a7212dd6bfc3617ee4" dependencies = [ - "rand 0.6.5", + "rand 0.7.3", ] [[package]] @@ -3407,7 +3064,7 @@ checksum = "717ee476b1690853d222af4634056d830b5197ffd747726a9a1eee6da9f49074" dependencies = [ "chrono", "env_logger", - "log 0.4.8", + "log", ] [[package]] @@ -3418,9 +3075,9 @@ checksum = "7e0456befd48169b9f13ef0f0ad46d492cf9d2dbb918bcf38e01eed4ce3ec5e4" [[package]] name = "proc-macro-nested" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e946095f9d3ed29ec38de908c22f95d9ac008e424c7bcae54c75a79c527c694" +checksum = "0afe1bd463b9e9ed51d0e0f0b50b6b146aec855c56fd182bb242388710a9b6de" [[package]] name = "proc-macro2" @@ -3442,9 +3099,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1502d12e458c49a4c9cbff560d0fe0060c252bc29799ed94ca2ed4bb665a0101" +checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa" dependencies = [ "unicode-xid 0.2.0", ] @@ -3458,7 +3115,6 @@ dependencies = [ "cfg-if", "fnv", "lazy_static", - "protobuf", "quick-error", "spin", ] @@ -3476,10 +3132,13 @@ dependencies = [ ] [[package]] -name = "protobuf" -version = "2.14.0" +name = "qstring" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e86d370532557ae7573551a1ec8235a0f8d6cb276c7c9e6aa490b511c447485" +checksum = "d464fae65fff2680baf48019211ce37aaec0c78e9264c84a3e484717f965104e" +dependencies = [ + "percent-encoding 2.1.0", +] [[package]] name = "quick-error" @@ -3507,11 +3166,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a21852a652ad6f610c9510194f398ff6f8692e334fd1145fed931f7fbe44ea" +checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" dependencies = [ - "proc-macro2 1.0.17", + "proc-macro2 1.0.18", ] [[package]] @@ -3730,7 +3389,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9" dependencies = [ "crossbeam-deque", - "crossbeam-queue 0.2.1", + "crossbeam-queue 0.2.3", "crossbeam-utils 0.7.2", "lazy_static", "num_cpus", @@ -3764,9 +3423,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.3.7" +version = "1.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6020f034922e3194c711b82a627453881bc4682166cabb07134a10c26ba7692" +checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" dependencies = [ "aho-corasick", "memchr", @@ -3786,60 +3445,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.17" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe5bd57d1d7414c6b5ed48563a2c855d995ff777729dcd91c369ec7fea395ae" - -[[package]] -name = "remove_dir_all" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" -dependencies = [ - "winapi 0.3.8", -] - -[[package]] -name = "reqwest" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b81e49ddec5109a9dcfc5f2a317ff53377c915e9ae9d4f2fb50914b85614e2" -dependencies = [ - "base64 0.11.0", - "bytes 0.5.4", - "encoding_rs", - "futures-core", - "futures-util", - "http 0.2.1", - "http-body 0.3.1", - "hyper 0.13.5", - "hyper-rustls", - "js-sys", - "lazy_static", - "log 0.4.8", - "mime 0.3.16", - "mime_guess 2.0.3", - "percent-encoding 2.1.0", - "pin-project-lite", - "rustls", - "serde", - "serde_urlencoded", - "time", - "tokio 0.2.21", - "tokio-rustls", - "url 2.1.1", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "webpki-roots", - "winreg", -] +checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" [[package]] name = "ring" -version = "0.16.13" +version = "0.16.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703516ae74571f24b465b4a1431e81e2ad51336cb0ded733a55a1aa3eccac196" +checksum = "06b3fefa4f12272808f809a0af618501fdaba41a58963c5fb72238ab0be09603" dependencies = [ "cc", "libc", @@ -3864,11 +3478,11 @@ dependencies = [ [[package]] name = "ron" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ece421e0c4129b90e4a35b6f625e472e96c552136f5093a2f4fa2bbb75a62d5" +checksum = "a91260f321dbf3b5a16ff91c451dc9eb644ce72775a6812f9c3dfffe63818f8f" dependencies = [ - "base64 0.10.1", + "base64 0.12.1", "bitflags", "serde", ] @@ -3879,49 +3493,12 @@ version = "0.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4c67c712ab62be58b24ab8960e2b95dd4ee00aac115c76f2709657821fe376d" -[[package]] -name = "rouille" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "112568052ec17fa26c6c11c40acbb30d3ad244bf3d6da0be181f5e7e42e5004f" -dependencies = [ - "base64 0.9.3", - "brotli2", - "chrono", - "deflate", - "filetime", - "multipart", - "num_cpus", - "rand 0.5.6", - "serde", - "serde_derive", - "serde_json", - "sha1", - "term", - "threadpool", - "time", - "tiny_http", - "url 1.7.2", -] - [[package]] name = "route-recognizer" version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea509065eb0b3c446acdd0102f0d46567dc30902dc0be91d6552035d92b0f4f8" -[[package]] -name = "rust-argon2" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "416f5109bdd413cec4f04c029297838e7604c993f8d1483b1d438f23bdc3eb35" -dependencies = [ - "base64 0.11.0", - "blake2b_simd", - "constant_time_eq", - "crossbeam-utils 0.6.6", -] - [[package]] name = "rust-argon2" version = "0.7.0" @@ -3934,6 +3511,17 @@ dependencies = [ "crossbeam-utils 0.7.2", ] +[[package]] +name = "rust-argon2" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dab61250775933275e84053ac235621dfb739556d5c54a2f2e9313b7cf43a19" +dependencies = [ + "base64 0.12.1", + "blake2b_simd", + "constant_time_eq", +] + [[package]] name = "rustc-demangle" version = "0.1.16" @@ -3962,24 +3550,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0d4a31f5d68413404705d6982529b0e11a9aacd4839d1d6222ee3b8cb4015e1" dependencies = [ "base64 0.11.0", - "log 0.4.8", + "log", "ring", "sct", "webpki", ] -[[package]] -name = "rustls-native-certs" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75ffeb84a6bd9d014713119542ce415db3a3e4748f0bfce1e1416cd224a23a5" -dependencies = [ - "openssl-probe", - "rustls", - "schannel", - "security-framework", -] - [[package]] name = "rusttype" version = "0.7.9" @@ -3995,7 +3571,7 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f61411055101f7b60ecf1041d87fb74205fb20b0c7a723f07ef39174cf6b4c0" dependencies = [ - "approx 0.3.2", + "approx", "crossbeam-deque", "crossbeam-utils 0.7.2", "linked-hash-map", @@ -4012,21 +3588,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2aa654bc32eb9ca14cce1a084abc9dfe43949a4547c35269a094c39272db3bb" dependencies = [ "lazy_static", - "log 0.4.8", + "log", "winapi 0.3.8", ] [[package]] name = "ryu" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed3d612bc64430efeb3f7ee6ef26d590dce0c43249217bddc62112540c7941e1" - -[[package]] -name = "safemem" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" +checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" [[package]] name = "same-file" @@ -4046,22 +3616,6 @@ dependencies = [ "regex", ] -[[package]] -name = "schannel" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" -dependencies = [ - "lazy_static", - "winapi 0.3.8", -] - -[[package]] -name = "scoped_threadpool" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" - [[package]] name = "scopeguard" version = "1.1.0" @@ -4102,29 +3656,6 @@ dependencies = [ "libc", ] -[[package]] -name = "security-framework" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64808902d7d99f78eaddd2b4e2509713babc3dc3c85ad6f4c447680f3c01e535" -dependencies = [ - "bitflags", - "core-foundation 0.7.0", - "core-foundation-sys 0.7.0", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17bf11d99252f512695eb468de5516e5cf75455521e69dfe343f3b74e4748405" -dependencies = [ - "core-foundation-sys 0.7.0", - "libc", -] - [[package]] name = "semver" version = "0.9.0" @@ -4142,29 +3673,29 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.110" +version = "1.0.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99e7b308464d16b56eba9964e4972a3eee817760ab60d88c3f86e1fecb08204c" +checksum = "c9124df5b40cbd380080b2cc6ab894c040a3070d995f5c9dc77e18c34a8ae37d" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.110" +version = "1.0.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "818fbf6bfa9a42d3bfcaca148547aa00c7b915bec71d1757aa2d44ca68771984" +checksum = "3f2c3ac8e6ca1e9c80b8be1023940162bf81ae3cffbb1809474152f2ce1eb250" dependencies = [ - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", ] [[package]] name = "serde_json" -version = "1.0.53" +version = "1.0.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "993948e75b189211a9b31a7528f950c6adc21f9720b6438ff80a7fa2f864cea2" +checksum = "ec2c5d7e739bc07a3e73381a39d61fdb5f671c60c1df26a130690665803d8226" dependencies = [ "itoa", "ryu", @@ -4183,18 +3714,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_urlencoded" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97" -dependencies = [ - "dtoa", - "itoa", - "serde", - "url 2.1.1", -] - [[package]] name = "sha1" version = "0.6.0" @@ -4246,9 +3765,9 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1f37080f2751fbf091dbdebaa95bd6cf9dbf74ad1d50396b1908518a1747fdf" dependencies = [ - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", ] [[package]] @@ -4257,12 +3776,6 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5752e017e03af9d735b4b069f53b7a7fd90fefafa04d8bd0c25581b0bff437f" -[[package]] -name = "siphasher" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" - [[package]] name = "slab" version = "0.4.2" @@ -4337,7 +3850,7 @@ dependencies = [ "derivative", "hashbrown", "hibitset", - "log 0.4.8", + "log", "rayon", "serde", "shred", @@ -4365,12 +3878,6 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" -[[package]] -name = "static_assertions" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c19be23126415861cb3a23e501d34a708f7f9b2183c5252d690941c2e69199d5" - [[package]] name = "static_assertions" version = "1.1.0" @@ -4414,11 +3921,11 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" dependencies = [ - "proc-macro2 1.0.17", - "quote 1.0.6", + "proc-macro2 1.0.18", + "quote 1.0.7", "serde", "serde_derive", - "syn 1.0.27", + "syn 1.0.31", ] [[package]] @@ -4428,13 +3935,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" dependencies = [ "base-x", - "proc-macro2 1.0.17", - "quote 1.0.6", + "proc-macro2 1.0.18", + "quote 1.0.7", "serde", "serde_derive", "serde_json", "sha1", - "syn 1.0.27", + "syn 1.0.31", ] [[package]] @@ -4449,7 +3956,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d" dependencies = [ - "bytes 0.4.12", + "bytes", ] [[package]] @@ -4494,48 +4001,27 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.27" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef781e621ee763a2a40721a8861ec519cb76966aee03bb5d00adb6a31dc1c1de" +checksum = "b5304cfdf27365b7585c25d4af91b35016ed21ef88f17ced89c7093b43dba8b6" dependencies = [ - "proc-macro2 1.0.17", - "quote 1.0.6", + "proc-macro2 1.0.18", + "quote 1.0.7", "unicode-xid 0.2.0", ] [[package]] name = "synstructure" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" +checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" dependencies = [ - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", "unicode-xid 0.2.0", ] -[[package]] -name = "tempdir" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" -dependencies = [ - "rand 0.4.6", - "remove_dir_all", -] - -[[package]] -name = "term" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42" -dependencies = [ - "byteorder 1.3.4", - "dirs", - "winapi 0.3.8", -] - [[package]] name = "termcolor" version = "1.1.0" @@ -4563,15 +4049,6 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "threadpool" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" -dependencies = [ - "num_cpus", -] - [[package]] name = "tide" version = "0.6.0" @@ -4581,11 +4058,11 @@ dependencies = [ "async-std", "cookie", "futures 0.3.5", - "http 0.1.21", + "http", "http-service", "http-service-hyper", - "log 0.4.8", - "mime 0.3.16", + "log", + "mime", "pin-project-lite", "route-recognizer", "serde", @@ -4593,18 +4070,6 @@ dependencies = [ "serde_qs", ] -[[package]] -name = "tiff" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7b7c2cfc4742bd8a32f2e614339dd8ce30dbcf676bb262bd63a2327bc5df57d" -dependencies = [ - "byteorder 1.3.4", - "lzw", - "num-derive", - "num-traits 0.2.11", -] - [[package]] name = "time" version = "0.1.43" @@ -4617,22 +4082,22 @@ dependencies = [ [[package]] name = "tiny_http" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1661fa0a44c95d01604bd05c66732a446c657efb62b5164a7a083a3b552b4951" +checksum = "15ce4fc3c4cdea1a4399bb1819a539195fb69db4bbe0bde5b7c7f18fed412e02" dependencies = [ "ascii", "chrono", "chunked_transfer", - "log 0.4.8", - "url 1.7.2", + "log", + "url 2.1.1", ] [[package]] name = "tinytemplate" -version = "1.0.4" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45e4bc5ac99433e0dcb8b9f309dd271a165ae37dde129b9e0ce1bfdd8bfe4891" +checksum = "6d3dc76004a03cec1c5932bca4cdc2e39aaa798e3f82363dd94f9adf6098c12f" dependencies = [ "serde", "serde_json", @@ -4644,7 +4109,7 @@ version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6" dependencies = [ - "bytes 0.4.12", + "bytes", "futures 0.1.29", "mio", "num_cpus", @@ -4656,31 +4121,13 @@ dependencies = [ "tokio-timer", ] -[[package]] -name = "tokio" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d099fa27b9702bed751524694adbe393e18b36b204da91eb1cbbbbb4a5ee2d58" -dependencies = [ - "bytes 0.5.4", - "fnv", - "futures-core", - "iovec", - "lazy_static", - "memchr", - "mio", - "num_cpus", - "pin-project-lite", - "slab", -] - [[package]] name = "tokio-buf" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46" dependencies = [ - "bytes 0.4.12", + "bytes", "either", "futures 0.1.29", ] @@ -4711,9 +4158,9 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674" dependencies = [ - "bytes 0.4.12", + "bytes", "futures 0.1.29", - "log 0.4.8", + "log", ] [[package]] @@ -4725,7 +4172,7 @@ dependencies = [ "crossbeam-utils 0.7.2", "futures 0.1.29", "lazy_static", - "log 0.4.8", + "log", "mio", "num_cpus", "parking_lot 0.9.0", @@ -4735,18 +4182,6 @@ dependencies = [ "tokio-sync", ] -[[package]] -name = "tokio-rustls" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15cb62a0d2770787abc96e99c1cd98fcf17f94959f3af63ca85bdfb203f051b4" -dependencies = [ - "futures-core", - "rustls", - "tokio 0.2.21", - "webpki", -] - [[package]] name = "tokio-sync" version = "0.1.8" @@ -4763,7 +4198,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98df18ed66e3b72e742f185882a9e201892407957e45fbff8da17ae7a7c51f72" dependencies = [ - "bytes 0.4.12", + "bytes", "futures 0.1.29", "iovec", "mio", @@ -4778,11 +4213,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89" dependencies = [ "crossbeam-deque", - "crossbeam-queue 0.2.1", + "crossbeam-queue 0.2.3", "crossbeam-utils 0.7.2", "futures 0.1.29", "lazy_static", - "log 0.4.8", + "log", "num_cpus", "slab", "tokio-executor", @@ -4800,20 +4235,6 @@ dependencies = [ "tokio-executor", ] -[[package]] -name = "tokio-util" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" -dependencies = [ - "bytes 0.5.4", - "futures-core", - "futures-sink", - "log 0.4.8", - "pin-project-lite", - "tokio 0.2.21", -] - [[package]] name = "toml" version = "0.5.6" @@ -4823,17 +4244,11 @@ dependencies = [ "serde", ] -[[package]] -name = "tower-service" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860" - [[package]] name = "tracing" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7c6b59d116d218cb2d990eb06b77b64043e0268ef7323aae63d8b30ae462923" +checksum = "a41f40ed0e162c911ac6fcb53ecdc8134c46905fdbbae8c50add462a538b495f" dependencies = [ "cfg-if", "tracing-core", @@ -4879,8 +4294,8 @@ name = "treeculler" version = "0.1.0" source = "git+https://gitlab.com/yusdacra/treeculler.git#efcf5283cf386117a7e654abdaa45ef664a08e42" dependencies = [ - "num-traits 0.2.11", - "vek 0.11.0", + "num-traits", + "vek", ] [[package]] @@ -4895,33 +4310,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44834418e2c5b16f47bedf35c28e148db099187dd5feee6367fb2525863af4f1" -[[package]] -name = "twoway" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b11b2b5241ba34be09c3cc85a36e56e48f9888862e19cedf23336d35316ed1" -dependencies = [ - "memchr", -] - -[[package]] -name = "unicase" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33" -dependencies = [ - "version_check 0.1.5", -] - -[[package]] -name = "unicase" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" -dependencies = [ - "version_check 0.9.2", -] - [[package]] name = "unicode-bidi" version = "0.3.4" @@ -4964,6 +4352,22 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +[[package]] +name = "ureq" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b777d3fc1e1a5cf8e4675c9016ae748a26ba6a73f4030b9110bb3c8a70499c76" +dependencies = [ + "base64 0.12.1", + "chunked_transfer", + "lazy_static", + "qstring", + "rustls", + "url 2.1.1", + "webpki", + "webpki-roots", +] + [[package]] name = "url" version = "1.7.2" @@ -4986,21 +4390,15 @@ dependencies = [ "percent-encoding 2.1.0", ] -[[package]] -name = "uuid" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" -dependencies = [ - "rand 0.6.5", - "serde", -] - [[package]] name = "uuid" version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9fde2f6a4bea1d6e007c4ad38c6839fa71cbb63b6dbf5b595aa38dc9b1093c11" +dependencies = [ + "rand 0.7.3", + "serde", +] [[package]] name = "uvth" @@ -5009,15 +4407,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e59a167890d173eb0fcd7a1b99b84dc05c521ae8d76599130b8e19bef287abbf" dependencies = [ "crossbeam-channel 0.3.9", - "log 0.4.8", + "log", + "num_cpus", +] + +[[package]] +name = "uvth" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e5910f9106b96334c6cae1f1d77a764bda66ac4ca9f507f73259f184fe1bb6b" +dependencies = [ + "crossbeam-channel 0.3.9", + "log", "num_cpus", ] [[package]] name = "vcpkg" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" +checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c" [[package]] name = "vec_map" @@ -5027,50 +4436,23 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "vek" -version = "0.9.12" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b833a133490ae98e9e3db1c77fc28e844f8e51b12eb35b4ab8a2082cb7cb441a" +checksum = "2657d8704e5e0be82b60157c8dbc71a269273ad766984508fdc54030a0690c4d" dependencies = [ - "approx 0.1.1", + "approx", "num-integer", - "num-traits 0.1.43", - "rustc_version", - "static_assertions 0.2.5", -] - -[[package]] -name = "vek" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e44defd4e0c629bdc842e5d180dda428b3abd2c6b0c7e1fced8c718f65d5f77" -dependencies = [ - "approx 0.3.2", - "num-integer", - "num-traits 0.2.11", + "num-traits", "rustc_version", "serde", - "static_assertions 1.1.0", -] - -[[package]] -name = "vek" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5c74ee8a1ab829cab2b921f45c6e3d9a02b99f973ae68775c05547debf20bdf" -dependencies = [ - "approx 0.3.2", - "num-integer", - "num-traits 0.2.11", - "rustc_version", - "serde", - "static_assertions 1.1.0", + "static_assertions", ] [[package]] name = "veloren-chat-cli" version = "0.6.0" dependencies = [ - "log 0.4.8", + "log", "pretty_env_logger", "veloren-client", "veloren-common", @@ -5084,11 +4466,11 @@ dependencies = [ "byteorder 1.3.4", "hashbrown", "image", - "log 0.4.8", + "log", "num_cpus", "specs", - "uvth", - "vek 0.10.4", + "uvth 3.1.1", + "vek", "veloren-common", ] @@ -5102,15 +4484,13 @@ dependencies = [ "crossbeam", "dot_vox", "find_folder", - "fxhash", "hashbrown", "image", "indexmap", "lazy_static", - "log 0.4.8", + "log", "lz4-compress", "mio", - "mio-extras", "notify", "parking_lot 0.9.0", "rand 0.7.3", @@ -5122,7 +4502,7 @@ dependencies = [ "specs", "specs-idvs", "sum_type", - "vek 0.10.4", + "vek", ] [[package]] @@ -5138,21 +4518,21 @@ dependencies = [ "hashbrown", "lazy_static", "libsqlite3-sys", - "log 0.4.8", + "log", "portpicker", "prometheus", "prometheus-static-metric", "rand 0.7.3", "ron", - "rouille", "scan_fmt", "serde", "serde_derive", "serde_json", "specs", "specs-idvs", - "uvth", - "vek 0.10.4", + "tiny_http", + "uvth 3.1.1", + "vek", "veloren-common", "veloren-world", ] @@ -5161,7 +4541,7 @@ dependencies = [ name = "veloren-server-cli" version = "0.6.0" dependencies = [ - "log 0.4.8", + "log", "pretty_env_logger", "veloren-common", "veloren-server", @@ -5198,7 +4578,7 @@ dependencies = [ "guillotiere", "hashbrown", "image", - "log 0.4.8", + "log", "msgbox", "num 0.2.1", "rand 0.7.3", @@ -5209,8 +4589,8 @@ dependencies = [ "specs", "specs-idvs", "treeculler", - "uvth", - "vek 0.10.4", + "uvth 3.1.1", + "vek", "veloren-client", "veloren-common", "veloren-server", @@ -5231,7 +4611,7 @@ dependencies = [ "image", "itertools 0.8.2", "lazy_static", - "log 0.4.8", + "log", "minifb", "noise", "num 0.2.1", @@ -5245,7 +4625,7 @@ dependencies = [ "roots", "serde", "serde_derive", - "vek 0.10.4", + "vek", "veloren-common", ] @@ -5263,7 +4643,7 @@ dependencies = [ "tracing", "tracing-futures", "tracing-subscriber", - "uvth", + "uvth 4.0.1", ] [[package]] @@ -5302,17 +4682,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230" dependencies = [ "futures 0.1.29", - "log 0.4.8", - "try-lock", -] - -[[package]] -name = "want" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" -dependencies = [ - "log 0.4.8", + "log", "try-lock", ] @@ -5324,71 +4694,57 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "wasm-bindgen" -version = "0.2.62" +version = "0.2.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3c7d40d09cdbf0f4895ae58cf57d92e1e57a9dd8ed2e8390514b54a47cc5551" +checksum = "4c2dc4aa152834bc334f506c1a06b866416a8b6697d5c9f75b9a689c8486def0" dependencies = [ "cfg-if", - "serde", - "serde_json", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.62" +version = "0.2.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3972e137ebf830900db522d6c8fd74d1900dcfc733462e9a12e942b00b4ac94" +checksum = "ded84f06e0ed21499f6184df0e0cb3494727b0c5da89534e0fcc55c51d812101" dependencies = [ "bumpalo", "lazy_static", - "log 0.4.8", - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "log", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", "wasm-bindgen-shared", ] -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a369c5e1dfb7569e14d62af4da642a3cbc2f9a3652fe586e26ac22222aa4b04" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "wasm-bindgen-macro" -version = "0.2.62" +version = "0.2.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cd85aa2c579e8892442954685f0d801f9129de24fa2136b2c6a539c76b65776" +checksum = "838e423688dac18d73e31edce74ddfac468e37b1506ad163ffaf0a46f703ffe3" dependencies = [ - "quote 1.0.6", + "quote 1.0.7", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.62" +version = "0.2.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eb197bd3a47553334907ffd2f16507b4f4f01bbec3ac921a7719e0decdfe72a" +checksum = "3156052d8ec77142051a533cdd686cba889537b213f948cd1d20869926e68e92" dependencies = [ - "proc-macro2 1.0.17", - "quote 1.0.6", - "syn 1.0.27", + "proc-macro2 1.0.18", + "quote 1.0.7", + "syn 1.0.31", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.62" +version = "0.2.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a91c2916119c17a8e316507afaaa2dd94b47646048014bbdf6bef098c1bb58ad" +checksum = "c9ba19973a58daf4db6f352eda73dc0e289493cd29fb2632eb172085b6521acd" [[package]] name = "wayland-client" @@ -5509,9 +4865,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.39" +version = "0.3.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bc359e5dd3b46cb9687a051d50a2fdd228e4ba7cf6fcf861a5365c3d671a642" +checksum = "7b72fe77fd39e4bd3eaa4412fd299a0be6b3dfe9d2597e2f1c20beb968f41d17" dependencies = [ "js-sys", "wasm-bindgen", @@ -5519,9 +4875,9 @@ dependencies = [ [[package]] name = "webpki" -version = "0.21.2" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f50e1972865d6b1adb54167d1c8ed48606004c2c9d0ea5f1eeb34d95e863ef" +checksum = "ab146130f5f790d45f82aeeb09e55a256573373ec64409fc19a6fb82fb1032ae" dependencies = [ "ring", "untrusted", @@ -5529,9 +4885,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91cd5736df7f12a964a5067a12c62fa38e1bd8080aff1f80bc29be7c80d19ab4" +checksum = "f8eff4b7516a57307f9349c64bf34caa34b940b66fed4b2fb3136cb7386e5739" dependencies = [ "webpki", ] @@ -5589,11 +4945,11 @@ dependencies = [ "backtrace", "bitflags", "cocoa 0.18.5", - "core-foundation 0.6.4", + "core-foundation", "core-graphics", "lazy_static", "libc", - "log 0.4.8", + "log", "objc", "parking_lot 0.9.0", "percent-encoding 2.1.0", @@ -5605,15 +4961,6 @@ dependencies = [ "x11-dl", ] -[[package]] -name = "winreg" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" -dependencies = [ - "winapi 0.3.8", -] - [[package]] name = "winres" version = "0.1.11" @@ -5661,7 +5008,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62056f63138b39116f82a540c983cc11f1c90cd70b3d492a70c25eaa50bd22a6" dependencies = [ "libc", - "log 0.4.8", + "log", ] [[package]] diff --git a/client/Cargo.toml b/client/Cargo.toml index 00ac354e53..e32e0a3771 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -9,10 +9,10 @@ common = { package = "veloren-common", path = "../common", features = ["no-asset byteorder = "1.3.2" uvth = "3.1.1" -image = "0.22.3" +image = { version = "0.22.3", default-features = false, features = ["png"] } num_cpus = "1.10.1" log = "0.4.8" specs = "0.15.1" -vek = { version = "0.10.0", features = ["serde"] } -hashbrown = { version = "0.6.2", features = ["rayon", "serde", "nightly"] } -authc = { git = "https://gitlab.com/veloren/auth.git", rev = "65571ade0d954a0e0bd995fdb314854ff146ab97" } +vek = { version = "0.11.0", features = ["serde"] } +hashbrown = { version = "0.6", features = ["rayon", "serde", "nightly"] } +authc = { git = "https://gitlab.com/veloren/auth.git", rev = "223a4097f7ebc8d451936dccb5e6517194bbf086" } diff --git a/common/Cargo.toml b/common/Cargo.toml index 3a50a4e9f4..3b733d4354 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -11,30 +11,28 @@ no-assets = [] specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git" } specs = { version = "0.15.1", features = ["serde", "nightly", "storage-event-control"] } -vek = { version = "0.10.0", features = ["serde"] } -dot_vox = "4.0.0" -fxhash = "0.2.1" -image = "0.22.3" -mio = "0.6.19" -mio-extras = "2.0.5" -serde = "1.0.102" -serde_derive = "1.0.102" +vek = { version = "0.11.0", features = ["serde"] } +dot_vox = "4.0" +image = { version = "0.22.3", default-features = false, features = ["png"] } +mio = "0.6" +serde = "1.0" +serde_derive = "1.0" serde_json = "1.0.41" -ron = "0.5.1" +ron = { version = "0.6", default-features = false } bincode = "1.2.0" log = "0.4.8" -rand = "0.7.2" +rand = "0.7" rayon = "^1.3.0" lazy_static = "1.4.0" lz4-compress = "0.1.1" -hashbrown = { version = "0.6.2", features = ["rayon", "serde", "nightly"] } +hashbrown = { version = "0.6", features = ["rayon", "serde", "nightly"] } find_folder = "0.3.0" parking_lot = "0.9.0" -crossbeam = "=0.7.2" +crossbeam = "0.7" notify = "5.0.0-pre.2" indexmap = "1.3.0" sum_type = "0.2.0" -authc = { git = "https://gitlab.com/veloren/auth.git", rev = "65571ade0d954a0e0bd995fdb314854ff146ab97" } +authc = { git = "https://gitlab.com/veloren/auth.git", rev = "223a4097f7ebc8d451936dccb5e6517194bbf086" } [dev-dependencies] criterion = "0.3" diff --git a/network/Cargo.toml b/network/Cargo.toml index 3c791e32b7..ff62d67be2 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" bincode = "1.2" serde = { version = "1.0" } #sending -async-std = { version = "~1.5", features = ["std"] } +async-std = { version = "~1.5", default-features = false, features = ["std", "async-task", "default"] } #tracing and metrics tracing = { version = "0.1", default-features = false } tracing-futures = "0.2" @@ -25,4 +25,4 @@ rand = { version = "0.7" } [dev-dependencies] tracing-subscriber = { version = "0.2.3", default-features = false, features = ["env-filter", "fmt", "chrono", "ansi", "smallvec"] } -uvth = { version = "3.1", default-features = false } \ No newline at end of file +uvth = { version = ">= 3.0, <= 4.0", default-features = false } \ No newline at end of file diff --git a/server/Cargo.toml b/server/Cargo.toml index e80b6b8d84..12df9946b4 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -16,23 +16,23 @@ specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git" } log = "0.4.8" specs = { version = "0.15.1", features = ["shred-derive"] } -vek = "0.10.0" +vek = "0.11.0" uvth = "3.1.1" lazy_static = "1.4.0" scan_fmt = "0.2.4" -ron = "0.5.1" -serde = "1.0.102" -serde_derive = "1.0.102" +ron = { version = "0.6", default-features = false } +serde = "1.0" +serde_derive = "1.0" serde_json = "1.0" -rand = { version = "0.7.2", features = ["small_rng"] } +rand = { version = "0.7", features = ["small_rng"] } chrono = "0.4.9" -hashbrown = { version = "0.6.2", features = ["rayon", "serde", "nightly"] } +hashbrown = { version = "0.6", features = ["rayon", "serde", "nightly"] } crossbeam = "=0.7.2" -prometheus = "0.7" +prometheus = { version = "0.7", default-features = false} prometheus-static-metric = "0.2" -rouille = "3.0.0" -portpicker = { git = "https://github.com/wusyong/portpicker-rs", branch = "fix_ipv6" } -authc = { git = "https://gitlab.com/veloren/auth.git", rev = "65571ade0d954a0e0bd995fdb314854ff146ab97" } +tiny_http = "0.7.0" +portpicker = { git = "https://github.com/xMAC94x/portpicker-rs" } +authc = { git = "https://gitlab.com/veloren/auth.git", rev = "223a4097f7ebc8d451936dccb5e6517194bbf086" } libsqlite3-sys = { version = "0.9.1", features = ["bundled"] } diesel = { version = "1.4.3", features = ["sqlite"] } diesel_migrations = "1.4.0" diff --git a/server/src/metrics.rs b/server/src/metrics.rs index 56d707d8ce..89faf74114 100644 --- a/server/src/metrics.rs +++ b/server/src/metrics.rs @@ -1,6 +1,5 @@ -use log::info; +use log::{debug, error}; use prometheus::{Encoder, Gauge, IntGauge, IntGaugeVec, Opts, Registry, TextEncoder}; -use rouille::{router, Server}; use std::{ convert::TryInto, error::Error, @@ -135,25 +134,35 @@ impl ServerMetrics { //TODO: make this a job self.handle = Some(thread::spawn(move || { - let server = Server::new(addr, move |request| { - router!(request, - (GET) (/metrics) => { - let encoder = TextEncoder::new(); - let mut buffer = vec![]; - let mf = registry.gather(); - encoder.encode(&mf, &mut buffer).expect("Failed to encoder metrics text."); - rouille::Response::text(String::from_utf8(buffer).expect("Failed to parse bytes as a string.")) - }, - _ => rouille::Response::empty_404() - ) - }) - .expect("Failed to start server"); - info!("Started server metrics: {}", addr); + let server = tiny_http::Server::http(addr).unwrap(); + const TIMEOUT: Duration = Duration::from_secs(1); + debug!("starting tiny_http server to serve metrics"); while running2.load(Ordering::Relaxed) { - server.poll(); - // Poll at 10Hz - thread::sleep(Duration::from_millis(100)); + let request = match server.recv_timeout(TIMEOUT) { + Ok(Some(rq)) => rq, + Ok(None) => continue, + Err(e) => { + println!("error: {}", e); + break; + }, + }; + let mf = registry.gather(); + let encoder = TextEncoder::new(); + let mut buffer = vec![]; + encoder + .encode(&mf, &mut buffer) + .expect("Failed to encoder metrics text."); + let response = tiny_http::Response::from_string( + String::from_utf8(buffer).expect("Failed to parse bytes as a string."), + ); + if let Err(e) = request.respond(response) { + error!( + "The metrics HTTP server had encountered and error with answering, {}", + e + ); + } } + debug!("stopping tiny_http server to serve metrics"); })); Ok(()) } diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml index cc44fe8c11..fb9862bee2 100644 --- a/voxygen/Cargo.toml +++ b/voxygen/Cargo.toml @@ -27,14 +27,14 @@ glutin = "0.21.1" winit = { version = "0.19.4", features = ["serde"] } conrod_core = { git = "https://gitlab.com/veloren/conrod.git", branch = "pre-winit-20" } conrod_winit = { git = "https://gitlab.com/veloren/conrod.git", branch = "pre-winit-20" } -euc = "0.3.0" +euc = { git = "https://github.com/zesterer/euc.git" } # ECS specs = "0.15.1" specs-idvs = { git = "https://gitlab.com/veloren/specs-idvs.git" } # Mathematics -vek = { version = "0.10.0", features = ["serde"] } +vek = { version = "0.11.0", features = ["serde"] } # Controller gilrs = { version = "0.7", features = ["serde"] } @@ -46,28 +46,28 @@ server = { package = "veloren-server", path = "../server", optional = true } glsl-include = "0.3.1" failure = "0.1.6" log = "0.4.8" -dot_vox = "4.0.0" -image = "0.22.3" -serde = "1.0.102" -serde_derive = "1.0.102" -ron = "0.5.1" +dot_vox = "4.0" +image = { version = "0.22.5", default-features = false, features = ["ico", "png"] } +serde = "1.0" +serde_derive = "1.0" +ron = { version = "0.6", default-features = false } guillotiere = { git = "https://github.com/Imberflur/guillotiere" } fern = { version = "0.5.8", features = ["colored"] } -msgbox = { git = "https://github.com/bekker/msgbox-rs.git", rev = "68fe39a", optional = true } +msgbox = { git = "https://github.com/bekker/msgbox-rs.git", default-features = false, rev = "68fe39a", optional = true } directories = "2.0.2" num = "0.2.0" backtrace = "0.3.40" -rand = "0.7.2" +rand = "0.7" treeculler = { git = "https://gitlab.com/yusdacra/treeculler.git" } rodio = { version = "0.10", default-features = false, features = ["wav", "vorbis"] } cpal = "0.10" crossbeam = "=0.7.2" -hashbrown = { version = "0.6.2", features = ["rayon", "serde", "nightly"] } +hashbrown = { version = "0.6", features = ["rayon", "serde", "nightly"] } chrono = "0.4.9" bincode = "1.2" deunicode = "1.0" uvth = "3.1.1" -authc = { git = "https://gitlab.com/veloren/auth.git", rev = "65571ade0d954a0e0bd995fdb314854ff146ab97" } +authc = { git = "https://gitlab.com/veloren/auth.git", rev = "223a4097f7ebc8d451936dccb5e6517194bbf086" } const-tweaker = { version = "0.2.5", optional = true } [target.'cfg(target_os = "macos")'.dependencies] diff --git a/voxygen/src/menu/main/mod.rs b/voxygen/src/menu/main/mod.rs index 32c9f2c488..cd11aeaaad 100644 --- a/voxygen/src/menu/main/mod.rs +++ b/voxygen/src/menu/main/mod.rs @@ -121,10 +121,9 @@ impl PlayState for MainMenuState { localized_strings.get("common.fatal_error"), e ), - client::AuthClientError::RequestError(_) => format!( - "{}: {}", - localized_strings.get("main.login.failed_sending_request"), - e + client::AuthClientError::RequestError() => format!( + "{}", + localized_strings.get("main.login.failed_sending_request") ), client::AuthClientError::ServerError(_, e) => format!("{}", e), }, diff --git a/voxygen/src/scene/terrain.rs b/voxygen/src/scene/terrain.rs index 23b4b2020d..e84f36d502 100644 --- a/voxygen/src/scene/terrain.rs +++ b/voxygen/src/scene/terrain.rs @@ -2023,6 +2023,7 @@ impl Terrain { }) .min_by_key(|todo| todo.active_worker.unwrap_or(todo.started_tick)) { + // TODO: find a alternative! if scene_data.thread_pool.queued_jobs() > 0 { break; } diff --git a/voxygen/src/ui/graphic/renderer.rs b/voxygen/src/ui/graphic/renderer.rs index f21039b3a9..630db2e4a1 100644 --- a/voxygen/src/ui/graphic/renderer.rs +++ b/voxygen/src/ui/graphic/renderer.rs @@ -92,10 +92,10 @@ impl<'a> Pipeline for Voxel { //norm: _, ao_level, }: &Self::Vertex, - ) -> ([f32; 3], Self::VsOut) { + ) -> ([f32; 4], Self::VsOut) { let light = Rgba::from_opaque(Rgb::from(*ao_level as f32 / 4.0 + 0.25)); let color = light * srgba_to_linear(Rgba::from_opaque(*col)); - let position = (self.mvp * Vec4::from_point(*pos)).xyz().into_array(); + let position = (self.mvp * Vec4::from_point(*pos)).into_array(); (position, VsOut(color)) } @@ -175,7 +175,7 @@ pub fn draw_vox( Voxel { mvp }.draw::, _>( &generate_mesh(segment, Vec3::from(0.0)), &mut color, - &mut depth, + Some(&mut depth), ); let rgba_img = RgbaImage::from_vec( diff --git a/world/Cargo.toml b/world/Cargo.toml index 24c424845f..d8b2def456 100644 --- a/world/Cargo.toml +++ b/world/Cargo.toml @@ -9,24 +9,24 @@ bincode = "1.2.0" common = { package = "veloren-common", path = "../common" } bitvec = "0.17.4" fxhash = "0.2.1" -image = "0.22.3" +image = { version = "0.22.3", default-features = false, features = ["png"] } itertools = "0.8.2" -vek = "0.10.0" +vek = "0.11.0" noise = { version = "0.6.0", default-features = false } num = "0.2.0" ordered-float = "1.0" -hashbrown = { version = "0.6.2", features = ["rayon", "serde", "nightly"] } +hashbrown = { version = "0.6", features = ["rayon", "serde", "nightly"] } lazy_static = "1.4.0" log = "0.4.8" -rand = "0.7.2" +rand = "0.7" rand_chacha = "0.2.1" arr_macro = "0.1.2" packed_simd = "0.3.3" rayon = "^1.3.0" roots = "0.0.5" -serde = "1.0.102" -serde_derive = "1.0.102" -ron = "0.5.1" +serde = "1.0" +serde_derive = "1.0" +ron = { version = "0.6", default-features = false } [dev-dependencies] pretty_env_logger = "0.3.0"