mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #76759 - yoshuawuyts:fix-future-pending-ready-stabilization-label, r=Dylan-DPC

Browse Source 
Fix stabilization marker for future_readiness_fns

Updated the rustc version in which this will be stabilized from `1.47.0 -> 1.48.0`. Fixes https://github.com/rust-lang/rust/pull/74328#issuecomment-692133125. Ref #70921.

r? @Dylan-DPC
This commit is contained in:
Tyler Mandry 2020-09-16 12:24:21 -07:00 committed by GitHub
commit 273267c9ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/core/src/future/mod.rs
View File

@ -21,9 +21,9 @@ pub use self::future::Future;
#[unstable(feature = "into_future", issue = "67644")] #[unstable(feature = "into_future", issue = "67644")]
pub use into_future::IntoFuture; pub use into_future::IntoFuture;
#[stable(feature = "future_readiness_fns", since = "1.47.0")] #[stable(feature = "future_readiness_fns", since = "1.48.0")]
pub use pending::{pending, Pending}; pub use pending::{pending, Pending};
#[stable(feature = "future_readiness_fns", since = "1.47.0")] #[stable(feature = "future_readiness_fns", since = "1.48.0")]
pub use ready::{ready, Ready}; pub use ready::{ready, Ready};
#[unstable(feature = "future_poll_fn", issue = "72302")] #[unstable(feature = "future_poll_fn", issue = "72302")]

12
library/core/src/future/pending.rs
View File

@ -11,7 +11,7 @@ use crate::task::{Context, Poll};
/// documentation for more. /// documentation for more.
/// ///
/// [`pending`]: fn.pending.html /// [`pending`]: fn.pending.html
#[stable(feature = "future_readiness_fns", since = "1.47.0")] #[stable(feature = "future_readiness_fns", since = "1.48.0")]
#[must_use = "futures do nothing unless you `.await` or poll them"] #[must_use = "futures do nothing unless you `.await` or poll them"]
pub struct Pending<T> { pub struct Pending<T> {
_data: marker::PhantomData<T>, _data: marker::PhantomData<T>,
@ -31,12 +31,12 @@ pub struct Pending<T> {
/// unreachable!(); /// unreachable!();
/// # } /// # }
/// ``` /// ```
#[stable(feature = "future_readiness_fns", since = "1.47.0")] #[stable(feature = "future_readiness_fns", since = "1.48.0")]
pub fn pending<T>() -> Pending<T> { pub fn pending<T>() -> Pending<T> {
Pending { _data: marker::PhantomData } Pending { _data: marker::PhantomData }
} }
#[stable(feature = "future_readiness_fns", since = "1.47.0")] #[stable(feature = "future_readiness_fns", since = "1.48.0")]
impl<T> Future for Pending<T> { impl<T> Future for Pending<T> {
type Output = T; type Output = T;
@ -45,17 +45,17 @@ impl<T> Future for Pending<T> {
} }
} }
#[stable(feature = "future_readiness_fns", since = "1.47.0")] #[stable(feature = "future_readiness_fns", since = "1.48.0")]
impl<T> Unpin for Pending<T> {} impl<T> Unpin for Pending<T> {}
#[stable(feature = "future_readiness_fns", since = "1.47.0")] #[stable(feature = "future_readiness_fns", since = "1.48.0")]
impl<T> Debug for Pending<T> { impl<T> Debug for Pending<T> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.debug_struct("Pending").finish() f.debug_struct("Pending").finish()
} }
} }
#[stable(feature = "future_readiness_fns", since = "1.47.0")] #[stable(feature = "future_readiness_fns", since = "1.48.0")]
impl<T> Clone for Pending<T> { impl<T> Clone for Pending<T> {
fn clone(&self) -> Self { fn clone(&self) -> Self {
pending() pending()

8
library/core/src/future/ready.rs
View File

@ -8,15 +8,15 @@ use crate::task::{Context, Poll};
/// documentation for more. /// documentation for more.
/// ///
/// [`ready`]: fn.ready.html /// [`ready`]: fn.ready.html
#[stable(feature = "future_readiness_fns", since = "1.47.0")] #[stable(feature = "future_readiness_fns", since = "1.48.0")]
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
#[must_use = "futures do nothing unless you `.await` or poll them"] #[must_use = "futures do nothing unless you `.await` or poll them"]
pub struct Ready<T>(Option<T>); pub struct Ready<T>(Option<T>);
#[stable(feature = "future_readiness_fns", since = "1.47.0")] #[stable(feature = "future_readiness_fns", since = "1.48.0")]
impl<T> Unpin for Ready<T> {} impl<T> Unpin for Ready<T> {}
#[stable(feature = "future_readiness_fns", since = "1.47.0")] #[stable(feature = "future_readiness_fns", since = "1.48.0")]
impl<T> Future for Ready<T> { impl<T> Future for Ready<T> {
type Output = T; type Output = T;
@ -42,7 +42,7 @@ impl<T> Future for Ready<T> {
/// assert_eq!(a.await, 1); /// assert_eq!(a.await, 1);
/// # } /// # }
/// ``` /// ```
#[stable(feature = "future_readiness_fns", since = "1.47.0")] #[stable(feature = "future_readiness_fns", since = "1.48.0")]
pub fn ready<T>(t: T) -> Ready<T> { pub fn ready<T>(t: T) -> Ready<T> {
Ready(Some(t)) Ready(Some(t))
} }

2
library/std/src/future.rs
View File

@ -9,7 +9,7 @@ pub use core::future::Future;
pub use core::future::{from_generator, get_context, ResumeTy}; pub use core::future::{from_generator, get_context, ResumeTy};
#[doc(inline)] #[doc(inline)]
#[stable(feature = "future_readiness_fns", since = "1.47.0")] #[stable(feature = "future_readiness_fns", since = "1.48.0")]
pub use core::future::{pending, ready, Pending, Ready}; pub use core::future::{pending, ready, Pending, Ready};
#[doc(inline)] #[doc(inline)]