Skip to content

Commit

Permalink
Auto merge of #61078 - pietroalbini:nightly-next, r=Centril
Browse files Browse the repository at this point in the history
Bump nightly to 1.37.0

r? @Mark-Simulacrum
  • Loading branch information
bors committed May 27, 2019
2 parents e70d538 + 924cdd4 commit b711179
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/bootstrap/channel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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>,
Expand Down
5 changes: 2 additions & 3 deletions src/libcore/task/wake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 ()),
Expand Down
2 changes: 1 addition & 1 deletion src/stage0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit b711179

Please sign in to comment.