Skip to content

Commit 48cb6be

Browse files
authoredApr 24, 2019
Rollup merge of #59739 - cramertj:stabilize, r=withoutboats
Stabilize futures_api cc #59725. Based on #59733 and #59119 -- only the last two commits here are relevant. r? @withoutboats , @oli-obk for the introduction of `rustc_allow_const_fn_ptr`.
·
1.90.01.36.0
2 parents 5f82b5b + 3f966dc commit 48cb6be

Some content is hidden

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

42 files changed

+178
-71
lines changed
 

‎src/liballoc/boxed.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,7 @@ impl<G: ?Sized + Generator> Generator for Pin<Box<G>> {
911911
}
912912
}
913913

914-
#[unstable(feature = "futures_api", issue = "50547")]
914+
#[stable(feature = "futures_api", since = "1.36.0")]
915915
impl<F: ?Sized + Future + Unpin> Future for Box<F> {
916916
type Output = F::Output;
917917

‎src/liballoc/lib.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@
8585
#![feature(fmt_internals)]
8686
#![feature(fn_traits)]
8787
#![feature(fundamental)]
88-
#![feature(futures_api)]
8988
#![feature(lang_items)]
9089
#![feature(libc)]
9190
#![feature(needs_allocator)]

‎src/libcore/future/future.rs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
#![unstable(feature = "futures_api",
2-
reason = "futures in libcore are unstable",
3-
issue = "50547")]
1+
#![stable(feature = "futures_api", since = "1.36.0")]
42

53
use crate::marker::Unpin;
64
use crate::ops;
@@ -26,8 +24,10 @@ use crate::task::{Context, Poll};
2624
/// `await!` the value.
2725
#[doc(spotlight)]
2826
#[must_use = "futures do nothing unless polled"]
27+
#[stable(feature = "futures_api", since = "1.36.0")]
2928
pub trait Future {
3029
/// The type of value produced on completion.
30+
#[stable(feature = "futures_api", since = "1.36.0")]
3131
type Output;
3232

3333
/// Attempt to resolve the future to a final value, registering
@@ -92,9 +92,11 @@ pub trait Future {
9292
/// [`Context`]: ../task/struct.Context.html
9393
/// [`Waker`]: ../task/struct.Waker.html
9494
/// [`Waker::wake`]: ../task/struct.Waker.html#method.wake
95+
#[stable(feature = "futures_api", since = "1.36.0")]
9596
fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output>;
9697
}
9798

99+
#[stable(feature = "futures_api", since = "1.36.0")]
98100
impl<F: ?Sized + Future + Unpin> Future for &mut F {
99101
type Output = F::Output;
100102

@@ -103,6 +105,7 @@ impl<F: ?Sized + Future + Unpin> Future for &mut F {
103105
}
104106
}
105107

108+
#[stable(feature = "futures_api", since = "1.36.0")]
106109
impl<P> Future for Pin<P>
107110
where
108111
P: Unpin + ops::DerefMut,

‎src/libcore/future/mod.rs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
#![unstable(feature = "futures_api",
2-
reason = "futures in libcore are unstable",
3-
issue = "50547")]
1+
#![stable(feature = "futures_api", since = "1.36.0")]
42

53
//! Asynchronous values.
64
75
mod future;
6+
#[stable(feature = "futures_api", since = "1.36.0")]
87
pub use self::future::Future;

0 commit comments

Comments
 (0)
Please sign in to comment.