squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Auto merge of #61078 - pietroalbini:nightly-next, r=Centril

Browse source 
Bump nightly to 1.37.0

r? @Mark-Simulacrum
This commit is contained in:
bors 2019-05-27 23:04:54 +00:00
commit b71117947f
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/bootstrap/channel.rs
View file

@ -13,7 +13,7 @@ use build_helper::output;
use crate::Build; use crate::Build;
// The version number // The version number
pub const CFG_RELEASE_NUM: &str = "1.36.0"; pub const CFG_RELEASE_NUM: &str = "1.37.0";
pub struct GitInfo { pub struct GitInfo {
inner: Option<Info>, inner: Option<Info>,

5
src/libcore/task/wake.rs
View file

@ -147,14 +147,13 @@ impl RawWakerVTable {
/// [`Waker`]: struct.Waker.html /// [`Waker`]: struct.Waker.html
/// [`RawWaker`]: struct.RawWaker.html /// [`RawWaker`]: struct.RawWaker.html
#[rustc_promotable] #[rustc_promotable]
#[cfg_attr(stage0, unstable(feature = "futures_api_const_fn_ptr", issue = "50547"))] #[stable(feature = "futures_api", since = "1.36.0")]
#[cfg_attr(not(stage0), stable(feature = "futures_api", since = "1.36.0"))]
// `rustc_allow_const_fn_ptr` is a hack that should not be used anywhere else // `rustc_allow_const_fn_ptr` is a hack that should not be used anywhere else
// without first consulting with T-Lang. // without first consulting with T-Lang.
// //
// FIXME: remove whenever we have a stable way to accept fn pointers from const fn // 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) // (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( pub const fn new(
clone: unsafe fn(*const ()) -> RawWaker, clone: unsafe fn(*const ()) -> RawWaker,
wake: unsafe fn(*const ()), wake: unsafe fn(*const ()),

2
src/stage0.txt
View file

@ -12,7 +12,7 @@
# source tarball for a stable release you'll likely see `1.x.0` for rustc and # 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`. # `0.x.0` for Cargo where they were released on `date`.
date: 2019-04-11 date: 2019-05-23
rustc: beta rustc: beta
cargo: beta cargo: beta