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 ZcashFoundation#1452.
teor2345 · Dec 14, 2020 · 46aeb90 · 46aeb90
1 parent d725eeb
commit 46aeb90
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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" }