Skip to content

Commit a70d0df

Browse files
committed
Fix last remaining localwaker references
1 parent 9c12c96 commit a70d0df

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

futures-util/src/compat/compat01as03.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,10 @@ impl<S, SinkItem> Compat01As03Sink<S, SinkItem> {
139139

140140
fn in_notify<R>(
141141
&mut self,
142-
lw: &LocalWaker,
142+
waker: &Waker,
143143
f: impl FnOnce(&mut S) -> R,
144144
) -> R {
145-
let notify = &WakerToHandle(lw.as_waker());
145+
let notify = &WakerToHandle(waker);
146146
self.inner.poll_fn_notify(notify, 0, f)
147147
}
148148
}
@@ -155,9 +155,9 @@ where
155155

156156
fn poll_next(
157157
mut self: Pin<&mut Self>,
158-
lw: &LocalWaker,
158+
waker: &Waker,
159159
) -> task03::Poll<Option<Self::Item>> {
160-
match self.in_notify(lw, |f| f.poll()) {
160+
match self.in_notify(waker, |f| f.poll()) {
161161
Ok(Async01::Ready(Some(t))) => task03::Poll::Ready(Some(Ok(t))),
162162
Ok(Async01::Ready(None)) => task03::Poll::Ready(None),
163163
Ok(Async01::NotReady) => task03::Poll::Pending,
@@ -184,10 +184,10 @@ where
184184

185185
fn poll_ready(
186186
mut self: Pin<&mut Self>,
187-
lw: &LocalWaker,
187+
waker: &Waker,
188188
) -> task03::Poll<Result<(), Self::SinkError>> {
189189
match self.buffer.take() {
190-
Some(item) => match self.in_notify(lw, |f| f.start_send(item)) {
190+
Some(item) => match self.in_notify(waker, |f| f.start_send(item)) {
191191
Ok(AsyncSink01::Ready) => task03::Poll::Ready(Ok(())),
192192
Ok(AsyncSink01::NotReady(i)) => {
193193
self.buffer = Some(i);
@@ -201,10 +201,10 @@ where
201201

202202
fn poll_flush(
203203
mut self: Pin<&mut Self>,
204-
lw: &LocalWaker,
204+
waker: &Waker,
205205
) -> task03::Poll<Result<(), Self::SinkError>> {
206206
let item = self.buffer.take();
207-
match self.in_notify(lw, |f| match item {
207+
match self.in_notify(waker, |f| match item {
208208
Some(i) => match f.start_send(i) {
209209
Ok(AsyncSink01::Ready) => f.poll_complete().map(|i| (i, None)),
210210
Ok(AsyncSink01::NotReady(t)) => {
@@ -225,12 +225,12 @@ where
225225

226226
fn poll_close(
227227
mut self: Pin<&mut Self>,
228-
lw: &LocalWaker,
228+
waker: &Waker,
229229
) -> task03::Poll<Result<(), Self::SinkError>> {
230230
let item = self.buffer.take();
231231
let close_started = self.close_started;
232232

233-
let result = self.in_notify(lw, |f| {
233+
let result = self.in_notify(waker, |f| {
234234
if !close_started {
235235
if let Some(item) = item {
236236
if let AsyncSink01::NotReady(item) = f.start_send(item)? {

0 commit comments

Comments
 (0)