diff options
| author | Ryan Dahl <ry@tinyclouds.org> | 2018-10-10 11:27:09 -0400 |
|---|---|---|
| committer | Ryan Dahl <ry@tinyclouds.org> | 2018-10-10 12:19:08 -0400 |
| commit | 930df1848af5dc6a6979fb8cc44ed2ad2ff23298 (patch) | |
| tree | 6de0eff43b9aa57807454f1e07afd43c8e049e51 | |
| parent | d26792d926429c3df8906d70da1a5f631fafe50a (diff) | |
Upgrade hyper-rustls
This removes tokio-core, which was deprecated.
| -rw-r--r-- | Cargo.toml | 4 | ||||
| -rw-r--r-- | build_extra/rust/BUILD.gn | 21 | ||||
| m--------- | third_party | 0 |
3 files changed, 5 insertions, 20 deletions
diff --git a/Cargo.toml b/Cargo.toml index 3781cc852..b5d4bbb7b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,9 @@ dirs = "1.0.3" flatbuffers = { path = "third_party/flatbuffers/rust/flatbuffers/" } futures = "0.1.23" hyper = "0.12.9" -hyper-rustls = "0.14.0" +# The current version of hyper-rustls, 0.14.0, depends on tokio-core, which is +# deprecated. +hyper-rustls = { git = "https://github.com/ctz/hyper-rustls.git" } libc = "0.2.42" log = "0.4.4" rand = "0.4.3" diff --git a/build_extra/rust/BUILD.gn b/build_extra/rust/BUILD.gn index fffe76e86..93c370c41 100644 --- a/build_extra/rust/BUILD.gn +++ b/build_extra/rust/BUILD.gn @@ -426,23 +426,6 @@ rust_crate("hyper") { ] } -rust_crate("tokio_core") { - source_root = "$registry_github/tokio-core-0.1.17/src/lib.rs" - extern = [ - ":mio", - ":futures", - ":tokio", - ":tokio_executor", - ":tokio_reactor", - ":tokio_timer", - ":tokio_io", - ":log", - ":iovec", - ":bytes", - ":scoped_tls", - ] -} - rust_crate("h2") { source_root = "$registry_github/h2-0.1.12/src/lib.rs" extern = [ @@ -659,14 +642,14 @@ rust_crate("tokio_current_thread") { } rust_crate("hyper_rustls") { - source_root = "$registry_github/hyper-rustls-0.14.0/src/lib.rs" + source_root = + "$crates/git/checkouts/hyper-rustls-d4ca51501db57c63/2c536d5/src/lib.rs" extern = [ ":ct_logs", ":futures", ":http", ":hyper", ":rustls", - ":tokio_core", ":tokio_io", ":tokio_rustls", ":tokio_tcp", diff --git a/third_party b/third_party -Subproject 30c059313d7b5440ca91dc06619f30958369088 +Subproject 8401dc99b953c61c2a79c2f85294d8c7f3c55c9 |