Skip to content

Commit 85162dc

Browse files
taiki-ecramertj
authored andcommitted
Replace vec with bufs in AsyncRead::poll_read_vectored
1 parent 63d5288 commit 85162dc

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

futures-io/src/lib.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -138,13 +138,13 @@ mod if_std {
138138
/// `Interrupted`. Implementations must convert `WouldBlock` into
139139
/// `Poll::Pending` and either internally retry or convert
140140
/// `Interrupted` into another error kind.
141-
fn poll_read_vectored(self: Pin<&mut Self>, cx: &mut Context<'_>, vec: &mut [IoSliceMut<'_>])
141+
fn poll_read_vectored(self: Pin<&mut Self>, cx: &mut Context<'_>, bufs: &mut [IoSliceMut<'_>])
142142
-> Poll<Result<usize>>
143143
{
144-
if let Some(ref mut first_iovec) = vec.get_mut(0) {
144+
if let Some(ref mut first_iovec) = bufs.get_mut(0) {
145145
self.poll_read(cx, first_iovec)
146146
} else {
147-
// `vec` is empty.
147+
// `bufs` is empty.
148148
Poll::Ready(Ok(0))
149149
}
150150
}
@@ -346,10 +346,10 @@ mod if_std {
346346
Pin::new(&mut **self).poll_read(cx, buf)
347347
}
348348

349-
fn poll_read_vectored(mut self: Pin<&mut Self>, cx: &mut Context<'_>, vec: &mut [IoSliceMut<'_>])
349+
fn poll_read_vectored(mut self: Pin<&mut Self>, cx: &mut Context<'_>, bufs: &mut [IoSliceMut<'_>])
350350
-> Poll<Result<usize>>
351351
{
352-
Pin::new(&mut **self).poll_read_vectored(cx, vec)
352+
Pin::new(&mut **self).poll_read_vectored(cx, bufs)
353353
}
354354
}
355355
}
@@ -377,10 +377,10 @@ mod if_std {
377377
Pin::get_mut(self).as_mut().poll_read(cx, buf)
378378
}
379379

380-
fn poll_read_vectored(self: Pin<&mut Self>, cx: &mut Context<'_>, vec: &mut [IoSliceMut<'_>])
380+
fn poll_read_vectored(self: Pin<&mut Self>, cx: &mut Context<'_>, bufs: &mut [IoSliceMut<'_>])
381381
-> Poll<Result<usize>>
382382
{
383-
Pin::get_mut(self).as_mut().poll_read_vectored(cx, vec)
383+
Pin::get_mut(self).as_mut().poll_read_vectored(cx, bufs)
384384
}
385385
}
386386

@@ -398,10 +398,10 @@ mod if_std {
398398
Poll::Ready(StdIo::Read::read(&mut *self, buf))
399399
}
400400

401-
fn poll_read_vectored(mut self: Pin<&mut Self>, _: &mut Context<'_>, vec: &mut [IoSliceMut<'_>])
401+
fn poll_read_vectored(mut self: Pin<&mut Self>, _: &mut Context<'_>, bufs: &mut [IoSliceMut<'_>])
402402
-> Poll<Result<usize>>
403403
{
404-
Poll::Ready(StdIo::Read::read_vectored(&mut *self, vec))
404+
Poll::Ready(StdIo::Read::read_vectored(&mut *self, bufs))
405405
}
406406
}
407407
}

futures-util/src/io/split.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ impl<R: AsyncRead> AsyncRead for ReadHalf<R> {
4343
lock_and_then(&self.handle, cx, |l, cx| l.poll_read(cx, buf))
4444
}
4545

46-
fn poll_read_vectored(self: Pin<&mut Self>, cx: &mut Context<'_>, vec: &mut [IoSliceMut<'_>])
46+
fn poll_read_vectored(self: Pin<&mut Self>, cx: &mut Context<'_>, bufs: &mut [IoSliceMut<'_>])
4747
-> Poll<io::Result<usize>>
4848
{
49-
lock_and_then(&self.handle, cx, |l, cx| l.poll_read_vectored(cx, vec))
49+
lock_and_then(&self.handle, cx, |l, cx| l.poll_read_vectored(cx, bufs))
5050
}
5151
}
5252

0 commit comments

Comments
 (0)