]> git.lizzy.rs Git - rust.git/commitdiff
bump nightly to 1.37.0
authorPietro Albini <pietro@pietroalbini.org>
Thu, 23 May 2019 10:27:58 +0000 (12:27 +0200)
committerPietro Albini <pietro@pietroalbini.org>
Thu, 23 May 2019 10:27:58 +0000 (12:27 +0200)
src/bootstrap/channel.rs
src/libcore/task/wake.rs
src/stage0.txt

index a6da4f5385a5be1e3485e8112cd946befc84a40e..41235d911c03e52131bc1f6be897140c4c73f152 100644 (file)
@@ -13,7 +13,7 @@
 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>,
index a6d611d2e93c4b83847a9791a39a28bb1a270e14..f1247239f4f50e2b30349676b5962f96590cfcf0 100644 (file)
@@ -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 ()),
index 17dba63054eac12f1813935724e4de73e19eaff4..d928d0888a0dfaf34a9580b731feeafb03b5aedd 100644 (file)
@@ -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