Downgrade tokio. aa966d7533 broke headless and updater. Blocked on https://github.com/seanmonstar/reqwest/issues/1060

This commit is contained in:
Dustin Carlino 2020-11-12 10:31:52 -08:00
parent 7854823c28
commit b9bf23e420
3 changed files with 48 additions and 69 deletions

113
Cargo.lock generated
View File

@ -231,12 +231,6 @@ version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
[[package]]
name = "bytes"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e0dcbc35f504eb6fc275a6d20e4ebcda18cf50d40ba6fabff8c711fa16cb3b16"
[[package]]
name = "calloop"
version = "0.6.5"
@ -1244,7 +1238,7 @@ version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535"
dependencies = [
"bytes 0.5.6",
"bytes",
"fnv",
"futures-core",
"futures-sink",
@ -1252,7 +1246,7 @@ dependencies = [
"http",
"indexmap",
"slab",
"tokio 0.2.22",
"tokio",
"tokio-util",
"tracing",
"tracing-futures",
@ -1292,7 +1286,7 @@ dependencies = [
"serde",
"serde_json",
"sim",
"tokio 0.3.3",
"tokio",
"url",
]
@ -1335,7 +1329,7 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9"
dependencies = [
"bytes 0.5.6",
"bytes",
"fnv",
"itoa",
]
@ -1346,7 +1340,7 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b"
dependencies = [
"bytes 0.5.6",
"bytes",
"http",
]
@ -1368,7 +1362,7 @@ version = "0.13.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f6ad767baac13b44d4529fcf58ba2cd0995e36e7b435bc5b039de6f47e880dbf"
dependencies = [
"bytes 0.5.6",
"bytes",
"futures-channel",
"futures-core",
"futures-util",
@ -1380,7 +1374,7 @@ dependencies = [
"itoa",
"pin-project 1.0.1",
"socket2",
"tokio 0.2.22",
"tokio",
"tower-service",
"tracing",
"want",
@ -1392,12 +1386,12 @@ version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37743cc83e8ee85eacfce90f2f4102030d9ff0a95244098d781e9bee4a90abb6"
dependencies = [
"bytes 0.5.6",
"bytes",
"futures-util",
"hyper",
"log",
"rustls",
"tokio 0.2.22",
"tokio",
"tokio-rustls",
"webpki",
]
@ -1879,19 +1873,6 @@ dependencies = [
"winapi 0.2.8",
]
[[package]]
name = "mio"
version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8962c171f57fcfffa53f4df1bb15ec4c8cf26a7569459c9ceb62d94aab0d9584"
dependencies = [
"libc",
"log",
"miow 0.3.5",
"ntapi",
"winapi 0.3.9",
]
[[package]]
name = "mio-extras"
version = "2.0.6"
@ -1900,10 +1881,33 @@ checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19"
dependencies = [
"lazycell",
"log",
"mio 0.6.22",
"mio",
"slab",
]
[[package]]
name = "mio-named-pipes"
version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656"
dependencies = [
"log",
"mio",
"miow 0.3.5",
"winapi 0.3.9",
]
[[package]]
name = "mio-uds"
version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0"
dependencies = [
"iovec",
"libc",
"mio",
]
[[package]]
name = "miow"
version = "0.2.1"
@ -2013,15 +2017,6 @@ dependencies = [
"version_check",
]
[[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-integer"
version = "0.1.43"
@ -2478,7 +2473,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e9eaa17ac5d7b838b7503d118fa16ad88f440498bf9ffe5424e621f93190d61e"
dependencies = [
"base64",
"bytes 0.5.6",
"bytes",
"encoding_rs",
"futures-core",
"futures-util",
@ -2497,7 +2492,7 @@ dependencies = [
"rustls",
"serde",
"serde_urlencoded",
"tokio 0.2.22",
"tokio",
"tokio-rustls",
"url",
"wasm-bindgen",
@ -3001,33 +2996,17 @@ version = "0.2.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d34ca54d84bf2b5b4d7d31e901a8464f7b60ac145a284fba25ceb801f2ddccd"
dependencies = [
"bytes 0.5.6",
"bytes",
"fnv",
"futures-core",
"iovec",
"lazy_static",
"memchr",
"mio 0.6.22",
"num_cpus",
"pin-project-lite",
"slab",
]
[[package]]
name = "tokio"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e5ca08accbcb46f11fd8d2d1c6158c348b7888009a1f39260bcad66f6a454250"
dependencies = [
"autocfg",
"bytes 0.6.0",
"futures-core",
"lazy_static",
"libc",
"memchr",
"mio 0.7.5",
"mio",
"mio-named-pipes",
"mio-uds",
"num_cpus",
"parking_lot",
"pin-project-lite",
"signal-hook-registry",
"slab",
@ -3037,9 +3016,9 @@ dependencies = [
[[package]]
name = "tokio-macros"
version = "0.3.1"
version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "21d30fdbb5dc2d8f91049691aa1a9d4d4ae422a21c334ce8936e5886d30c5c45"
checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a"
dependencies = [
"proc-macro2",
"quote",
@ -3054,7 +3033,7 @@ checksum = "e12831b255bcfa39dc0436b01e19fea231a37db570686c06ee72c423479f889a"
dependencies = [
"futures-core",
"rustls",
"tokio 0.2.22",
"tokio",
"webpki",
]
@ -3064,12 +3043,12 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499"
dependencies = [
"bytes 0.5.6",
"bytes",
"futures-core",
"futures-sink",
"log",
"pin-project-lite",
"tokio 0.2.22",
"tokio",
]
[[package]]
@ -3219,7 +3198,7 @@ dependencies = [
"flate2",
"md5",
"reqwest",
"tokio 0.3.3",
"tokio",
"walkdir",
]
@ -3609,7 +3588,7 @@ dependencies = [
"lazy_static",
"libc",
"log",
"mio 0.6.22",
"mio",
"mio-extras",
"ndk",
"ndk-glue",

View File

@ -17,5 +17,5 @@ rand_xorshift = "0.2.0"
serde = "1.0.116"
serde_json = "1.0.57"
sim = { path = "../sim" }
tokio = { version = "0.3.3", features = ["full"] }
tokio = { version = "0.2.22", features = ["full"] }
url = "2.2.0"

View File

@ -9,5 +9,5 @@ abstutil = { path = "../abstutil" }
flate2 = "1.0.19"
md5 = "0.7.0"
reqwest = { version = "0.10.8", default-features=false, features=["rustls-tls"] }
tokio = { version = "0.3.3", features = ["full"] }
tokio = { version = "0.2.22", features = ["full"] }
walkdir = "2.3.1"