zecfoundation
/
tower
mirror of https://github.com/ZcashFoundation/tower.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix up broken dependencies and deprecated methods (#347) 

* fix up broken dependencies and deprecated methods

* use released version of tracing-subscriber

Co-Authored-By: Lucio Franco <luciofranco14@gmail.com>
This commit is contained in:
Luke Steensen 2019-09-17 14:29:11 -05:00 committed by Lucio Franco
parent 793e2e8e94
commit 8509ab879d
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tower-balance/Cargo.toml
View File

@ -41,7 +41,7 @@ tower-util = "0.1.0"
slab = "0.4"
[dev-dependencies]
tracing-fmt = { git = "https://github.com/tokio-rs/tracing.git" }
tracing-subscriber = "0.1.3"
hdrhistogram = "6.0"
quickcheck = { version = "0.6", default-features = false }
tokio = "0.1.7"

3
tower-balance/examples/demo.rs
View File

@ -37,7 +37,8 @@ struct Summary {
}
fn main() {
tracing::subscriber::set_global_default(tracing_fmt::FmtSubscriber::default()).unwrap();
tracing::subscriber::set_global_default(tracing_subscriber::fmt::Subscriber::default())
.unwrap();
println!("REQUESTS={}", REQUESTS);
println!("CONCURRENCY={}", CONCURRENCY);

4
tower-balance/src/p2c/service.rs
View File

@ -132,7 +132,7 @@ where
.next_ready_index
.and_then(|i| Self::repair_index(i, idx, self.ready_services.len()));
debug_assert!(!self.cancelations.contains_key(key));
} else if let Some(cancel) = self.cancelations.remove(key) {
} else if let Some(cancel) = self.cancelations.swap_remove(key) {
let _ = cancel.send(());
}
}
@ -143,7 +143,7 @@ where
Ok(Async::NotReady) | Ok(Async::Ready(None)) => return,
Ok(Async::Ready(Some((key, svc)))) => {
trace!("endpoint ready");
let _cancel = self.cancelations.remove(&key);
let _cancel = self.cancelations.swap_remove(&key);
debug_assert!(_cancel.is_some(), "missing cancelation");
self.ready_services.insert(key, svc);
}

2
tower-buffer/Cargo.toml
View File

@ -30,7 +30,7 @@ futures = "0.1.25"
tower-service = "0.2.0"
tower-layer = "0.1.0"
tokio-executor = "0.1.7"
tokio-sync = "0.1.0"
tokio-sync = "0.1.3"
tracing = "0.1.2"
[dev-dependencies]

2
tower-spawn-ready/Cargo.toml
View File

@ -28,7 +28,7 @@ tower-service = "0.2.0"
tower-layer = "0.1.0"
tower-util = "0.1.0"
tokio-executor = "0.1.7"
tokio-sync = "0.1.0"
tokio-sync = "0.1.3"
[dev-dependencies]
tower = { version = "0.1.0", path = "../tower" }