diff options
| author | bors <bors@rust-lang.org> | 2019-03-26 13:58:30 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-03-26 13:58:30 +0000 |
| commit | 07d350897c7f95bb40ae9762ad1e945f95fc37ae (patch) | |
| tree | bcb3591565eb3652ebb77b23c3c80862e68cf432 | |
| parent | 54479c624cc24bb852291d83e11cc19389dcb21b (diff) | |
| parent | d976dbe853bf8ae104b1569d9143629535b6e507 (diff) | |
| download | rust-07d350897c7f95bb40ae9762ad1e945f95fc37ae.tar.gz rust-07d350897c7f95bb40ae9762ad1e945f95fc37ae.zip | |
Auto merge of #59434 - Centril:bootstrap-to-2019-03-20, r=Mark-Simulacrum
Bump bootstrap compiler to 2019-03-20 Includes https://github.com/rust-lang/rust/pull/59295 and by extension https://github.com/rust-lang/rust/pull/59047, which unblocks https://github.com/rust-lang/rust/pull/58253, https://github.com/rust-lang/rust/pull/58837, and possibly https://github.com/rust-lang/rust/pull/59336, and so therefore: @bors p=50 r? @Mark-Simulacrum cc @pietroalbini
| -rw-r--r-- | src/libcore/ptr.rs | 4 | ||||
| -rw-r--r-- | src/libsyntax_pos/lib.rs | 1 | ||||
| -rw-r--r-- | src/stage0.txt | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/libcore/ptr.rs b/src/libcore/ptr.rs index a9a029d606d..b139c82753d 100644 --- a/src/libcore/ptr.rs +++ b/src/libcore/ptr.rs @@ -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; @@ -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) diff --git a/src/libsyntax_pos/lib.rs b/src/libsyntax_pos/lib.rs index f4771a52034..48d087ee43c 100644 --- a/src/libsyntax_pos/lib.rs +++ b/src/libsyntax_pos/lib.rs @@ -17,7 +17,6 @@ #![feature(rustc_attrs)] #![feature(specialization)] #![feature(step_trait)] -#![cfg_attr(not(stage0), feature(stdsimd))] use serialize::{Encodable, Decodable, Encoder, Decoder}; diff --git a/src/stage0.txt b/src/stage0.txt index 274c0f90442..43610f9068f 100644 --- a/src/stage0.txt +++ b/src/stage0.txt @@ -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 |