Skip to content

Commit

Permalink
Auto merge of #59434 - Centril:bootstrap-to-2019-03-20, r=Mark-Simula…
Browse files Browse the repository at this point in the history
…crum

Bump bootstrap compiler to 2019-03-20

Includes #59295 and by extension #59047, which unblocks #58253, #58837, and possibly #59336, and so therefore:

@bors p=50

r? @Mark-Simulacrum

cc @pietroalbini
  • Loading branch information
bors committed Mar 26, 2019
2 parents 54479c6 + d976dbe commit 07d3508
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/libcore/ptr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2913,7 +2913,7 @@ impl<T: Sized> NonNull<T> {
/// some other means.
#[stable(feature = "nonnull", since = "1.25.0")]
#[inline]
#[cfg_attr(not(stage0), rustc_const_unstable(feature = "const_ptr_nonnull"))]
#[rustc_const_unstable(feature = "const_ptr_nonnull")]
pub const fn dangling() -> Self {
unsafe {
let ptr = mem::align_of::<T>() as *mut T;
Expand Down Expand Up @@ -2977,7 +2977,7 @@ impl<T: ?Sized> NonNull<T> {
/// Cast to a pointer of another type
#[stable(feature = "nonnull_cast", since = "1.27.0")]
#[inline]
#[cfg_attr(not(stage0), rustc_const_unstable(feature = "const_ptr_nonnull"))]
#[rustc_const_unstable(feature = "const_ptr_nonnull")]
pub const fn cast<U>(self) -> NonNull<U> {
unsafe {
NonNull::new_unchecked(self.as_ptr() as *mut U)
Expand Down
1 change: 0 additions & 1 deletion src/libsyntax_pos/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
#![feature(rustc_attrs)]
#![feature(specialization)]
#![feature(step_trait)]
#![cfg_attr(not(stage0), feature(stdsimd))]

use serialize::{Encodable, Decodable, Encoder, Decoder};

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-02-27
date: 2019-03-20
rustc: beta
cargo: beta

Expand Down

0 comments on commit 07d3508

Please sign in to comment.