From 46aeb90ebebeafe7a4be87ae2c4d7566a9360219 Mon Sep 17 00:00:00 2001
From: teor <teor@riseup.net>
Date: Mon, 14 Dec 2020 12:04:52 +1000
Subject: [PATCH] Depend on a tokio commit with the time wheel panic fix

Updates the tokio dependency to the commit that merged
tokio-rs/tokio#3229, which should fix the time wheel panic in #1452.
---
 Cargo.lock | 8 +++-----
 Cargo.toml | 8 +++++++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 59a6f5bfaa4..b576a5d5463 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3158,17 +3158,16 @@ dependencies = [
 [[package]]
 name = "tokio"
 version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a12a3eb39ee2c231be64487f1fcbe726c8f2514876a55480a5ab8559fc374252"
+source = "git+https://github.com/tokio-rs/tokio?rev=9706ca92a8deb69d6e29265f21424042fea966c5#9706ca92a8deb69d6e29265f21424042fea966c5"
 dependencies = [
  "autocfg",
  "bytes 0.6.0",
  "futures-core",
- "lazy_static",
  "libc",
  "memchr",
  "mio 0.7.6",
  "num_cpus",
+ "once_cell",
  "parking_lot",
  "pin-project-lite 0.2.0",
  "signal-hook-registry",
@@ -3181,8 +3180,7 @@ dependencies = [
 [[package]]
 name = "tokio-macros"
 version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21d30fdbb5dc2d8f91049691aa1a9d4d4ae422a21c334ce8936e5886d30c5c45"
+source = "git+https://github.com/tokio-rs/tokio?rev=9706ca92a8deb69d6e29265f21424042fea966c5#9706ca92a8deb69d6e29265f21424042fea966c5"
 dependencies = [
  "proc-macro2 1.0.24",
  "quote 1.0.7",
diff --git a/Cargo.toml b/Cargo.toml
index 568dd8e3d0f..3ed219edbf9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,7 +21,13 @@ panic = "abort"
 panic = "abort"
 
 [patch.crates-io]
+# awaiting tower 0.4
 tower = { git = "https://github.com/tower-rs/tower", rev = "d4d1c67c6a0e4213a52abcc2b9df6cc58276ee39" }
-hyper = { git = "https://github.com/hyperium/hyper/", rev = "ed2b22a7f66899d338691552fbcb6c0f2f4e06b9" }
+
+# fix for #1452, should be included in tokio 0.3.6 or later
+tokio = { git = "https://github.com/tokio-rs/tokio", rev = "9706ca92a8deb69d6e29265f21424042fea966c5" }
+
+# awaiting stable versions which depend on tokio 0.3
+hyper = { git = "https://github.com/hyperium/hyper", rev = "ed2b22a7f66899d338691552fbcb6c0f2f4e06b9" }
 metrics = { git = "https://github.com/ZcashFoundation/metrics", rev = "971133128e5aebe3ad177acffc6154449736cfa2" }
 metrics-exporter-prometheus = { git = "https://github.com/ZcashFoundation/metrics", rev = "971133128e5aebe3ad177acffc6154449736cfa2" }