From a6e3f22eaee7dcb312f278513f26aea00e9d2c0a Mon Sep 17 00:00:00 2001 From: shockrah Date: Sun, 7 Mar 2021 12:43:25 -0800 Subject: [PATCH] Reverting package upgrades --- json-api/Cargo.lock | 168 +++++++++++--------------------------------- json-api/Cargo.toml | 4 +- 2 files changed, 43 insertions(+), 129 deletions(-) diff --git a/json-api/Cargo.lock b/json-api/Cargo.lock index 082acd2..41d32e3 100644 --- a/json-api/Cargo.lock +++ b/json-api/Cargo.lock @@ -623,11 +623,11 @@ checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce" [[package]] name = "h2" -version = "0.3.1" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d832b01df74254fe364568d6ddc294443f61cbec82816b60904303af87efae78" +checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535" dependencies = [ - "bytes 1.0.1", + "bytes 0.5.6", "fnv", "futures-core", "futures-sink", @@ -635,9 +635,10 @@ dependencies = [ "http", "indexmap", "slab", - "tokio 1.2.0", - "tokio-util 0.6.3", + "tokio", + "tokio-util 0.3.1", "tracing", + "tracing-futures", ] [[package]] @@ -668,11 +669,11 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2861bd27ee074e5ee891e8b539837a9430012e249d7f0ca2d795650f579c1994" +checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" dependencies = [ - "bytes 1.0.1", + "bytes 0.5.6", "http", ] @@ -690,11 +691,11 @@ checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" [[package]] name = "hyper" -version = "0.14.4" +version = "0.13.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8e946c2b1349055e0b72ae281b238baf1a3ea7307c7e9f9d64673bdd9c26ac7" +checksum = "8a6f157065790a3ed2f88679250419b5cdd96e714a0d65f7797fd337186e96bb" dependencies = [ - "bytes 1.0.1", + "bytes 0.5.6", "futures-channel", "futures-core", "futures-util", @@ -706,7 +707,7 @@ dependencies = [ "itoa", "pin-project 1.0.5", "socket2", - "tokio 1.2.0", + "tokio", "tower-service", "tracing", "want", @@ -733,15 +734,6 @@ dependencies = [ "hashbrown", ] -[[package]] -name = "instant" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" -dependencies = [ - "cfg-if 1.0.0", -] - [[package]] name = "iovec" version = "0.1.4" @@ -786,7 +778,7 @@ dependencies = [ "serde", "serde_json", "time 0.2.25", - "tokio 1.2.0", + "tokio", "tokio-test", "url", ] @@ -861,15 +853,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "lock_api" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312" -dependencies = [ - "scopeguard", -] - [[package]] name = "log" version = "0.4.14" @@ -935,19 +918,6 @@ dependencies = [ "winapi 0.2.8", ] -[[package]] -name = "mio" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5dede4e2065b3842b8b0af444119f3aa331cc7cc2dd20388bfb0f5d5a38823a" -dependencies = [ - "libc", - "log", - "miow 0.3.6", - "ntapi", - "winapi 0.3.9", -] - [[package]] name = "mio-named-pipes" version = "0.1.7" @@ -955,7 +925,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656" dependencies = [ "log", - "mio 0.6.23", + "mio", "miow 0.3.6", "winapi 0.3.9", ] @@ -968,7 +938,7 @@ checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" dependencies = [ "iovec", "libc", - "mio 0.6.23", + "mio", ] [[package]] @@ -1013,7 +983,7 @@ dependencies = [ "serde", "serde_json", "thiserror", - "tokio 0.2.25", + "tokio", "tokio-tls", "tokio-util 0.2.0", "twox-hash", @@ -1079,15 +1049,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "ntapi" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" -dependencies = [ - "winapi 0.3.9", -] - [[package]] name = "num-bigint" version = "0.2.6" @@ -1185,31 +1146,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "parking_lot" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" -dependencies = [ - "cfg-if 1.0.0", - "instant", - "libc", - "redox_syscall", - "smallvec", - "winapi 0.3.9", -] - [[package]] name = "pem" version = "0.8.3" @@ -1642,12 +1578,6 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" -[[package]] -name = "smallvec" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" - [[package]] name = "socket2" version = "0.3.19" @@ -1895,30 +1825,14 @@ dependencies = [ "lazy_static", "libc", "memchr", - "mio 0.6.23", + "mio", + "mio-named-pipes", "mio-uds", - "pin-project-lite 0.1.12", - "slab", - "tokio-macros 0.2.6", -] - -[[package]] -name = "tokio" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8190d04c665ea9e6b6a0dc45523ade572c088d2e6566244c1122671dbf4ae3a" -dependencies = [ - "autocfg", - "bytes 1.0.1", - "libc", - "memchr", - "mio 0.7.9", "num_cpus", - "once_cell", - "parking_lot", - "pin-project-lite 0.2.6", + "pin-project-lite 0.1.12", "signal-hook-registry", - "tokio-macros 1.1.0", + "slab", + "tokio-macros", "winapi 0.3.9", ] @@ -1933,17 +1847,6 @@ dependencies = [ "syn", ] -[[package]] -name = "tokio-macros" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caf7b11a536f46a809a8a9f0bb4237020f70ecbf115b842360afb127ea2fda57" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "tokio-test" version = "0.2.1" @@ -1952,7 +1855,7 @@ checksum = "ed0049c119b6d505c4447f5c64873636c7af6c75ab0d45fd9f618d82acb8016d" dependencies = [ "bytes 0.5.6", "futures-core", - "tokio 0.2.25", + "tokio", ] [[package]] @@ -1962,7 +1865,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" dependencies = [ "native-tls", - "tokio 0.2.25", + "tokio", ] [[package]] @@ -1976,21 +1879,21 @@ dependencies = [ "futures-sink", "log", "pin-project-lite 0.1.12", - "tokio 0.2.25", + "tokio", ] [[package]] name = "tokio-util" -version = "0.6.3" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebb7cb2f00c5ae8df755b252306272cd1790d39728363936e01827e11f0b017b" +checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" dependencies = [ - "bytes 1.0.1", + "bytes 0.5.6", "futures-core", "futures-sink", "log", - "pin-project-lite 0.2.6", - "tokio 1.2.0", + "pin-project-lite 0.1.12", + "tokio", ] [[package]] @@ -2006,6 +1909,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01ebdc2bb4498ab1ab5f5b73c5803825e60199229ccba0698170e3be0e7f959f" dependencies = [ "cfg-if 1.0.0", + "log", "pin-project-lite 0.2.6", "tracing-core", ] @@ -2019,6 +1923,16 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "tracing-futures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" +dependencies = [ + "pin-project 1.0.5", + "tracing", +] + [[package]] name = "try-lock" version = "0.2.3" diff --git a/json-api/Cargo.toml b/json-api/Cargo.toml index 96a4386..3de2876 100644 --- a/json-api/Cargo.toml +++ b/json-api/Cargo.toml @@ -6,8 +6,8 @@ edition = "2018" [workspace] [dependencies] -tokio = { version = "1.2.0", features=["full"] } -hyper = { version = "0.14", features = ["full"] } +tokio = { version = "0.2", features=["full"] } +hyper = "0.13" futures = "0.3" url = "2.1.1" mysql_async = "0.23.1"