Skip to content

Commit b711179

Browse files
committed
Auto merge of #61078 - pietroalbini:nightly-next, r=Centril
Bump nightly to 1.37.0 r? @Mark-Simulacrum
2 parents e70d538 + 924cdd4 commit b711179

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

src/bootstrap/channel.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use build_helper::output;
1313
use crate::Build;
1414

1515
// The version number
16-
pub const CFG_RELEASE_NUM: &str = "1.36.0";
16+
pub const CFG_RELEASE_NUM: &str = "1.37.0";
1717

1818
pub struct GitInfo {
1919
inner: Option<Info>,

src/libcore/task/wake.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -147,14 +147,13 @@ impl RawWakerVTable {
147147
/// [`Waker`]: struct.Waker.html
148148
/// [`RawWaker`]: struct.RawWaker.html
149149
#[rustc_promotable]
150-
#[cfg_attr(stage0, unstable(feature = "futures_api_const_fn_ptr", issue = "50547"))]
151-
#[cfg_attr(not(stage0), stable(feature = "futures_api", since = "1.36.0"))]
150+
#[stable(feature = "futures_api", since = "1.36.0")]
152151
// `rustc_allow_const_fn_ptr` is a hack that should not be used anywhere else
153152
// without first consulting with T-Lang.
154153
//
155154
// FIXME: remove whenever we have a stable way to accept fn pointers from const fn
156155
// (see https://github.com/rust-rfcs/const-eval/issues/19#issuecomment-472799062)
157-
#[cfg_attr(not(stage0), rustc_allow_const_fn_ptr)]
156+
#[rustc_allow_const_fn_ptr]
158157
pub const fn new(
159158
clone: unsafe fn(*const ()) -> RawWaker,
160159
wake: unsafe fn(*const ()),

src/stage0.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# source tarball for a stable release you'll likely see `1.x.0` for rustc and
1313
# `0.x.0` for Cargo where they were released on `date`.
1414

15-
date: 2019-04-11
15+
date: 2019-05-23
1616
rustc: beta
1717
cargo: beta
1818

0 commit comments

Comments
 (0)