Skip to content

Commit 59b7c66

Browse files
taiki-ecramertj
authored andcommitted
Update to latest Pin::set
With this change, the minimum required version will go up to nightly-2019-01-11.
1 parent 8c0002f commit 59b7c66

File tree

9 files changed

+11
-11
lines changed

9 files changed

+11
-11
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ matrix:
2525

2626
# When updating this, the reminder to update the minimum required version in README.md.
2727
- name: cargo test (minimum required version)
28-
rust: nightly-2018-12-26
28+
rust: nightly-2019-01-11
2929

3030
- name: cargo clippy
3131
rust: nightly

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Now, you can use futures-rs:
3939
use futures::future::Future; // Note: It's not `futures_preview`
4040
```
4141

42-
The current version of futures-rs requires Rust nightly 2018-12-26 or later.
42+
The current version of futures-rs requires Rust nightly 2019-01-11 or later.
4343

4444
### Feature `std`
4545

futures-util/src/future/fuse.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ impl<Fut: Future> Future for Fuse<Fut> {
5050
None => return Poll::Pending,
5151
};
5252

53-
Pin::set(self.as_mut().future(), None);
53+
Pin::set(&mut self.as_mut().future(), None);
5454
Poll::Ready(v)
5555
}
5656
}

futures-util/src/future/into_stream.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ impl<Fut: Future> Stream for IntoStream<Fut> {
3636
None => return Poll::Ready(None),
3737
};
3838

39-
Pin::set(self.as_mut().future(), None);
39+
Pin::set(&mut self.as_mut().future(), None);
4040
Poll::Ready(Some(v))
4141
}
4242
}

futures-util/src/future/maybe_done.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ impl<Fut: Future> Future for MaybeDone<Fut> {
107107
MaybeDone::Gone => panic!("MaybeDone polled after value taken"),
108108
}
109109
};
110-
Pin::set(self, MaybeDone::Done(res));
110+
Pin::set(&mut self, MaybeDone::Done(res));
111111
Poll::Ready(())
112112
}
113113
}

futures-util/src/sink/with_flat_map.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ where
102102
};
103103
}
104104
}
105-
Pin::set(stream, None);
105+
Pin::set(&mut stream, None);
106106
Poll::Ready(Ok(()))
107107
}
108108
}

futures-util/src/stream/unfold.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ impl<T, F, Fut, It> Stream for Unfold<T, F, Fut>
9696
) -> Poll<Option<It>> {
9797
if let Some(state) = self.as_mut().state().take() {
9898
let fut = (self.as_mut().f())(state);
99-
Pin::set(self.as_mut().fut(), Some(fut));
99+
Pin::set(&mut self.as_mut().fut(), Some(fut));
100100
}
101101

102102
let step = ready!(self.as_mut().fut().as_pin_mut().unwrap().poll(lw));

futures-util/src/try_future/flatten_sink.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ where
5959
Waiting(f) => try_ready!(f.try_poll(lw)),
6060
Closed => panic!("poll_ready called after eof"),
6161
};
62-
Pin::set(self.as_mut(), FlattenSink(Ready(resolved_stream)));
62+
Pin::set(&mut self.as_mut(), FlattenSink(Ready(resolved_stream)));
6363
if let Ready(resolved_stream) = self.project_pin() {
6464
resolved_stream.poll_ready(lw)
6565
} else {
@@ -99,7 +99,7 @@ where
9999
Waiting(_) | Closed => Poll::Ready(Ok(())),
100100
};
101101
if res.is_ready() {
102-
Pin::set(self, FlattenSink(Closed));
102+
Pin::set(&mut self, FlattenSink(Closed));
103103
}
104104
res
105105
}

futures-util/src/try_stream/try_for_each.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ impl<St, Fut, F> Future for TryForEach<St, Fut, F>
4949
if let Some(future) = self.as_mut().future().as_pin_mut() {
5050
try_ready!(future.try_poll(lw));
5151
}
52-
Pin::set(self.as_mut().future(), None);
52+
Pin::set(&mut self.as_mut().future(), None);
5353

5454
match ready!(self.as_mut().stream().try_poll_next(lw)) {
5555
Some(Ok(e)) => {
5656
let future = (self.as_mut().f())(e);
57-
Pin::set(self.as_mut().future(), Some(future));
57+
Pin::set(&mut self.as_mut().future(), Some(future));
5858
}
5959
Some(Err(e)) => return Poll::Ready(Err(e)),
6060
None => return Poll::Ready(Ok(())),

0 commit comments

Comments
 (0)