Skip to content

Commit bf0c222

Browse files
authored
Update tower to tower-rs/tower@ad348d8 (#647)
We need tower-rs/tower@ad348d8 for an upcoming change. This PR updates the tower dependency in anticipation of this change. The `Balance` constructor has changed.
1 parent e478b3e commit bf0c222

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Cargo.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2669,7 +2669,7 @@ dependencies = [
26692669
[[package]]
26702670
name = "tower"
26712671
version = "0.3.1"
2672-
source = "git+https://github.com/tower-rs/tower?rev=8752a3811788e94670c62dc0acbc9613207931b1#8752a3811788e94670c62dc0acbc9613207931b1"
2672+
source = "git+https://github.com/tower-rs/tower?rev=ad348d8#ad348d8ee5106f21b87155d2a0e8e18b90bd6b73"
26732673
dependencies = [
26742674
"futures-core",
26752675
"futures-util",
@@ -2678,15 +2678,15 @@ dependencies = [
26782678
"rand 0.7.2",
26792679
"slab",
26802680
"tokio",
2681-
"tower-layer 0.3.0 (git+https://github.com/tower-rs/tower?rev=8752a3811788e94670c62dc0acbc9613207931b1)",
2681+
"tower-layer 0.3.0 (git+https://github.com/tower-rs/tower?rev=ad348d8)",
26822682
"tower-service",
26832683
"tracing",
26842684
]
26852685

26862686
[[package]]
26872687
name = "tower-layer"
26882688
version = "0.3.0"
2689-
source = "git+https://github.com/tower-rs/tower?rev=8752a3811788e94670c62dc0acbc9613207931b1#8752a3811788e94670c62dc0acbc9613207931b1"
2689+
source = "git+https://github.com/tower-rs/tower?rev=ad348d8#ad348d8ee5106f21b87155d2a0e8e18b90bd6b73"
26902690

26912691
[[package]]
26922692
name = "tower-layer"

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,4 @@ debug = false
6363

6464
[patch.crates-io]
6565
webpki = { git = "https://github.com/linkerd/webpki", branch = "cert-dns-names-0.21" }
66-
tower = { version = "0.3", git = "https://github.com/tower-rs/tower", rev = "8752a3811788e94670c62dc0acbc9613207931b1"}
66+
tower = { version = "0.3", git = "https://github.com/tower-rs/tower", rev = "ad348d8" }

linkerd/proxy/http/src/balance.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@ where
5858
fn layer(&self, discover: D) -> Self::Service {
5959
let instrument = PendingUntilFirstData::default();
6060
let loaded = PeakEwmaDiscover::new(discover, self.default_rtt, self.decay, instrument);
61-
Balance::new(loaded, self.rng.clone())
61+
Balance::from_rng(loaded, self.rng.clone()).expect("RNG must be valid")
6262
}
6363
}

0 commit comments

Comments
 (0)