diff options
| -rw-r--r-- | library/core/src/future/pending.rs | 5 | ||||
| -rw-r--r-- | library/core/src/iter/sources/empty.rs | 12 |
2 files changed, 7 insertions, 10 deletions
diff --git a/library/core/src/future/pending.rs b/library/core/src/future/pending.rs index 560dd25ecff..2877e66eca8 100644 --- a/library/core/src/future/pending.rs +++ b/library/core/src/future/pending.rs @@ -12,7 +12,7 @@ use crate::task::{Context, Poll}; #[stable(feature = "future_readiness_fns", since = "1.48.0")] #[must_use = "futures do nothing unless you `.await` or poll them"] pub struct Pending<T> { - _data: marker::PhantomData<T>, + _data: marker::PhantomData<fn() -> T>, } /// Creates a future which never resolves, representing a computation that never @@ -44,9 +44,6 @@ impl<T> Future for Pending<T> { } #[stable(feature = "future_readiness_fns", since = "1.48.0")] -impl<T> Unpin for Pending<T> {} - -#[stable(feature = "future_readiness_fns", since = "1.48.0")] impl<T> Debug for Pending<T> { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { f.debug_struct("Pending").finish() diff --git a/library/core/src/iter/sources/empty.rs b/library/core/src/iter/sources/empty.rs index 7abe01d17c9..98734c527f2 100644 --- a/library/core/src/iter/sources/empty.rs +++ b/library/core/src/iter/sources/empty.rs @@ -22,17 +22,17 @@ pub const fn empty<T>() -> Empty<T> { Empty(marker::PhantomData) } +// Newtype for use in `PhantomData` to avoid +// > error: const-stable function cannot use `#[feature(const_fn_fn_ptr_basics)]` +// in `const fn empty<T>()` above. +struct FnReturning<T>(fn() -> T); + /// An iterator that yields nothing. /// /// This `struct` is created by the [`empty()`] function. See its documentation for more. #[must_use = "iterators are lazy and do nothing unless consumed"] #[stable(feature = "iter_empty", since = "1.2.0")] -pub struct Empty<T>(marker::PhantomData<T>); - -#[stable(feature = "iter_empty_send_sync", since = "1.42.0")] -unsafe impl<T> Send for Empty<T> {} -#[stable(feature = "iter_empty_send_sync", since = "1.42.0")] -unsafe impl<T> Sync for Empty<T> {} +pub struct Empty<T>(marker::PhantomData<FnReturning<T>>); #[stable(feature = "core_impl_debug", since = "1.9.0")] impl<T> fmt::Debug for Empty<T> { |