Skip to content

Commit e64844f

Browse files
committed
Rename methods
Signed-off-by: Zahari Dichev <zaharidichev@gmail.com>
1 parent 8e38db8 commit e64844f

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

linkerd/proxy/core/src/resolve.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,16 +82,16 @@ where
8282
}
8383

8484
pub trait ResolutionStreamExt<E, T>: TryStream<Ok = Update<E>, Error = T> {
85-
fn next_update(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<Update<E>, T>> {
85+
fn poll_next_update(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Result<Update<E>, T>> {
8686
self.try_poll_next(cx)
8787
.map(|result| result.expect("resolution stream never ends"))
8888
}
8989

90-
fn next_update_pin(&mut self, cx: &mut Context<'_>) -> Poll<Result<Update<E>, T>>
90+
fn poll_next_update_unpin(&mut self, cx: &mut Context<'_>) -> Poll<Result<Update<E>, T>>
9191
where
9292
Self: Unpin,
9393
{
94-
Pin::new(self).next_update(cx)
94+
Pin::new(self).poll_next_update(cx)
9595
}
9696
}
9797

linkerd/proxy/discover/src/from_resolve.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ where
109109
return Poll::Ready(Some(Ok(change)));
110110
}
111111

112-
match ready!(this.resolution.next_update(cx))? {
112+
match ready!(this.resolution.poll_next_update(cx))? {
113113
Update::Add(endpoints) => {
114114
for (addr, endpoint) in endpoints.into_iter() {
115115
this.active.insert(addr);

linkerd/proxy/resolve/src/map_endpoint.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ where
116116

117117
fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
118118
let this = self.project();
119-
let update = match ready!(this.resolution.next_update(cx))? {
119+
let update = match ready!(this.resolution.poll_next_update(cx))? {
120120
resolve::Update::Add(eps) => {
121121
let mut update = Vec::new();
122122
for (a, ep) in eps.into_iter() {

linkerd/proxy/resolve/src/recover.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ where
200200
//
201201
// Attempt recovery/backoff if the resolution fails.
202202

203-
match ready!(resolution.next_update_pin(cx)) {
203+
match ready!(resolution.poll_next_update_unpin(cx)) {
204204
Ok(update) => {
205205
this.update_active(&update);
206206
return Poll::Ready(Some(Ok(update)));
@@ -301,7 +301,7 @@ where
301301
} => match ready!(resolution
302302
.as_mut()
303303
.expect("illegal state")
304-
.next_update_pin(cx))
304+
.poll_next_update_unpin(cx))
305305
{
306306
Err(e) => State::Recover {
307307
error: Some(e.into()),

0 commit comments

Comments
 (0)