Skip to content

Commit e6bff0d

Browse files
committed
Update to new nightly
1 parent 642c941 commit e6bff0d

File tree

136 files changed

+430
-429
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+430
-429
lines changed

futures-channel/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ futures-core-preview = { path = "../futures-core", version = "0.3.0-alpha.10", d
2424
[dev-dependencies]
2525
futures-preview = { path = "../futures", version = "0.3.0-alpha.10", default-features = true }
2626
futures-test-preview = { path = "../futures-test", version = "0.3.0-alpha.10", default-features = true }
27-
pin-utils = "0.1.0-alpha.3"
27+
pin-utils = "0.1.0-alpha.4"

futures-channel/benches/sync_mpsc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(test, futures_api, pin, arbitrary_self_types)]
1+
#![feature(test, futures_api)]
22

33
extern crate test;
44
use crate::test::Bencher;

futures-channel/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//! This crate provides channels that can be used to communicate between
44
//! asynchronous tasks.
55
6-
#![feature(pin, arbitrary_self_types, futures_api)]
6+
#![feature(futures_api)]
77

88
#![cfg_attr(not(feature = "std"), no_std)]
99

futures-channel/tests/mpsc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(futures_api, async_await, await_macro, pin)]
1+
#![feature(futures_api, async_await, await_macro)]
22

33
use futures::channel::{mpsc, oneshot};
44
use futures::executor::{block_on, block_on_stream};

futures-channel/tests/oneshot.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(futures_api, arbitrary_self_types, pin)]
1+
#![feature(futures_api)]
22

33
use futures::channel::oneshot::{self, Sender};
44
use futures::executor::block_on;

futures-core/src/future/future_obj.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ where
173173
F: Future<Output = T> + 'a
174174
{
175175
fn into_raw(mut self) -> *mut () {
176-
let mut_ref: &mut F = unsafe { Pin::get_mut_unchecked(Pin::as_mut(&mut self)) };
176+
let mut_ref: &mut F = unsafe { Pin::get_unchecked_mut(Pin::as_mut(&mut self)) };
177177
mut_ref as *mut F as *mut ()
178178
}
179179

@@ -213,7 +213,7 @@ mod if_std {
213213
F: Future<Output = T> + 'a
214214
{
215215
fn into_raw(mut self) -> *mut () {
216-
let mut_ref: &mut F = unsafe { Pin::get_mut_unchecked(Pin::as_mut(&mut self)) };
216+
let mut_ref: &mut F = unsafe { Pin::get_unchecked_mut(Pin::as_mut(&mut self)) };
217217
let ptr = mut_ref as *mut F as *mut ();
218218
mem::forget(self); // Don't drop the box
219219
ptr

futures-core/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! Core traits and types for asynchronous operations in Rust.
22
3-
#![feature(pin, arbitrary_self_types, futures_api)]
3+
#![feature(futures_api)]
44
#![cfg_attr(feature = "nightly", feature(cfg_target_has_atomic))]
55

66
#![cfg_attr(not(feature = "std"), no_std)]

futures-core/src/stream/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ impl<'a, S: ?Sized + Stream + Unpin> Stream for &'a mut S {
7171

7272
impl<P> Stream for Pin<P>
7373
where
74-
P: ops::DerefMut,
74+
P: ops::DerefMut + Unpin,
7575
P::Target: Stream,
7676
{
7777
type Item = <P::Target as Stream>::Item;
@@ -93,7 +93,7 @@ impl<A, B> Stream for Either<A, B>
9393

9494
fn poll_next(self: Pin<&mut Self>, lw: &LocalWaker) -> Poll<Option<A::Item>> {
9595
unsafe {
96-
match Pin::get_mut_unchecked(self) {
96+
match Pin::get_unchecked_mut(self) {
9797
Either::Left(a) => Pin::new_unchecked(a).poll_next(lw),
9898
Either::Right(b) => Pin::new_unchecked(b).poll_next(lw),
9999
}

futures-core/src/stream/stream_obj.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ where
175175
F: Stream<Item = T> + 'a,
176176
{
177177
fn into_raw(self) -> *mut () {
178-
unsafe { Pin::get_mut_unchecked(self) as *mut F as *mut () }
178+
unsafe { Pin::get_unchecked_mut(self) as *mut F as *mut () }
179179
}
180180

181181
unsafe fn poll_next(
@@ -215,7 +215,7 @@ mod if_std {
215215
where F: Stream<Item = T> + 'a
216216
{
217217
fn into_raw(mut self) -> *mut () {
218-
let mut_ref: &mut F = unsafe { Pin::get_mut_unchecked(Pin::as_mut(&mut self)) };
218+
let mut_ref: &mut F = unsafe { Pin::get_unchecked_mut(Pin::as_mut(&mut self)) };
219219
let ptr = mut_ref as *mut F as *mut ();
220220
mem::forget(self); // Don't drop the box
221221
ptr

futures-core/src/task/__internal/atomic_waker.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ impl AtomicWaker {
169169
/// Here is how `register` is used when implementing a flag.
170170
///
171171
/// ```
172-
/// #![feature(pin, arbitrary_self_types, futures_api)]
172+
/// #![feature(futures_api)]
173173
/// use futures::future::Future;
174174
/// use futures::task::{LocalWaker, Poll, AtomicWaker};
175175
/// use std::sync::atomic::AtomicBool;

0 commit comments

Comments
 (0)