From 924cdd4532e4b0124f38584a7b886ba0f8516782 Mon Sep 17 00:00:00 2001
From: Pietro Albini <pietro@pietroalbini.org>
Date: Thu, 23 May 2019 12:27:58 +0200
Subject: [PATCH] bump nightly to 1.37.0

---
 src/bootstrap/channel.rs | 2 +-
 src/libcore/task/wake.rs | 5 ++---
 src/stage0.txt           | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/bootstrap/channel.rs b/src/bootstrap/channel.rs
index a6da4f5385a..41235d911c0 100644
--- a/src/bootstrap/channel.rs
+++ b/src/bootstrap/channel.rs
@@ -13,7 +13,7 @@ use build_helper::output;
 use crate::Build;
 
 // The version number
-pub const CFG_RELEASE_NUM: &str = "1.36.0";
+pub const CFG_RELEASE_NUM: &str = "1.37.0";
 
 pub struct GitInfo {
     inner: Option<Info>,
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 ()),
diff --git a/src/stage0.txt b/src/stage0.txt
index 17dba63054e..d928d0888a0 100644
--- a/src/stage0.txt
+++ b/src/stage0.txt
@@ -12,7 +12,7 @@
 # source tarball for a stable release you'll likely see `1.x.0` for rustc and
 # `0.x.0` for Cargo where they were released on `date`.
 
-date: 2019-04-11
+date: 2019-05-23
 rustc: beta
 cargo: beta