about summary refs log tree commit diff
path: root/src/libcore/task
diff options
context:
space:
mode:
authorPietro Albini <pietro@pietroalbini.org>2019-05-23 12:27:58 +0200
committerPietro Albini <pietro@pietroalbini.org>2019-05-23 12:27:58 +0200
commit924cdd4532e4b0124f38584a7b886ba0f8516782 (patch)
tree3a90064d2a1f6ba88868bedf88d93015d6e3c1a1 /src/libcore/task
parent85334c50921a1c90707c9d0fb344c63bd373e1b8 (diff)
downloadrust-924cdd4532e4b0124f38584a7b886ba0f8516782.tar.gz
rust-924cdd4532e4b0124f38584a7b886ba0f8516782.zip
bump nightly to 1.37.0
Diffstat (limited to 'src/libcore/task')
-rw-r--r--src/libcore/task/wake.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libcore/task/wake.rs b/src/libcore/task/wake.rs
index a6d611d2e93..f1247239f4f 100644
--- a/src/libcore/task/wake.rs
+++ b/src/libcore/task/wake.rs
@@ -147,14 +147,13 @@ impl RawWakerVTable {
     /// [`Waker`]: struct.Waker.html
     /// [`RawWaker`]: struct.RawWaker.html
     #[rustc_promotable]
-    #[cfg_attr(stage0, unstable(feature = "futures_api_const_fn_ptr", issue = "50547"))]
-    #[cfg_attr(not(stage0), stable(feature = "futures_api", since = "1.36.0"))]
+    #[stable(feature = "futures_api", since = "1.36.0")]
     // `rustc_allow_const_fn_ptr` is a hack that should not be used anywhere else
     // without first consulting with T-Lang.
     //
     // FIXME: remove whenever we have a stable way to accept fn pointers from const fn
     // (see https://github.com/rust-rfcs/const-eval/issues/19#issuecomment-472799062)
-    #[cfg_attr(not(stage0), rustc_allow_const_fn_ptr)]
+    #[rustc_allow_const_fn_ptr]
     pub const fn new(
         clone: unsafe fn(*const ()) -> RawWaker,
         wake: unsafe fn(*const ()),