diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2018-10-31 11:53:17 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2018-10-31 11:53:50 -0700 |
| commit | d0060d72e5b0f6ff2537808ff090b7fb96c3d10a (patch) | |
| tree | f68b873b1bf64e6987c49c6ffa98e1d08a86f1e9 /src/libcore | |
| parent | de9666f123e800d5fc34210f23127aa6a5d6e4ef (diff) | |
| download | rust-d0060d72e5b0f6ff2537808ff090b7fb96c3d10a.tar.gz rust-d0060d72e5b0f6ff2537808ff090b7fb96c3d10a.zip | |
Bump nightly to 1.32.0
* Also update the bootstrap compiler * Update cargo to 1.32.0 * Clean out stage0 annotations
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/lib.rs | 1 | ||||
| -rw-r--r-- | src/libcore/mem.rs | 13 | ||||
| -rw-r--r-- | src/libcore/num/mod.rs | 4 | ||||
| -rw-r--r-- | src/libcore/ops/range.rs | 2 | ||||
| -rw-r--r-- | src/libcore/ptr.rs | 4 | ||||
| -rw-r--r-- | src/libcore/tests/lib.rs | 1 | ||||
| -rw-r--r-- | src/libcore/time.rs | 8 |
7 files changed, 11 insertions, 22 deletions
diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs index 06727d8292d..1bbc7892c6b 100644 --- a/src/libcore/lib.rs +++ b/src/libcore/lib.rs @@ -88,7 +88,6 @@ #![feature(doc_spotlight)] #![feature(extern_types)] #![feature(fundamental)] -#![cfg_attr(stage0, feature(impl_header_lifetime_elision))] #![feature(intrinsics)] #![feature(lang_items)] #![feature(link_llvm_intrinsics)] diff --git a/src/libcore/mem.rs b/src/libcore/mem.rs index 22016e8cf41..1d0b194487e 100644 --- a/src/libcore/mem.rs +++ b/src/libcore/mem.rs @@ -285,7 +285,7 @@ pub fn forget<T>(t: T) { /// [alignment]: ./fn.align_of.html #[inline] #[stable(feature = "rust1", since = "1.0.0")] -#[cfg_attr(not(stage0), rustc_promotable)] +#[rustc_promotable] pub const fn size_of<T>() -> usize { intrinsics::size_of::<T>() } @@ -377,7 +377,7 @@ pub fn min_align_of_val<T: ?Sized>(val: &T) -> usize { /// ``` #[inline] #[stable(feature = "rust1", since = "1.0.0")] -#[cfg_attr(not(stage0), rustc_promotable)] +#[rustc_promotable] pub const fn align_of<T>() -> usize { intrinsics::min_align_of::<T>() } @@ -458,19 +458,10 @@ pub fn align_of_val<T: ?Sized>(val: &T) -> usize { #[inline] #[stable(feature = "needs_drop", since = "1.21.0")] #[rustc_const_unstable(feature = "const_needs_drop")] -#[cfg(not(stage0))] pub const fn needs_drop<T>() -> bool { intrinsics::needs_drop::<T>() } -#[inline] -#[stable(feature = "needs_drop", since = "1.21.0")] -#[cfg(stage0)] -/// Ceci n'est pas la documentation -pub fn needs_drop<T>() -> bool { - unsafe { intrinsics::needs_drop::<T>() } -} - /// Creates a value whose bytes are all zero. /// /// This has the same effect as allocating space with diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs index 772502cc800..c6cbeea5a0e 100644 --- a/src/libcore/num/mod.rs +++ b/src/libcore/num/mod.rs @@ -216,7 +216,7 @@ $EndFeature, " ```"), #[stable(feature = "rust1", since = "1.0.0")] #[inline] - #[cfg_attr(not(stage0), rustc_promotable)] + #[rustc_promotable] pub const fn min_value() -> Self { !0 ^ ((!0 as $UnsignedT) >> 1) as Self } @@ -235,7 +235,7 @@ $EndFeature, " ```"), #[stable(feature = "rust1", since = "1.0.0")] #[inline] - #[cfg_attr(not(stage0), rustc_promotable)] + #[rustc_promotable] pub const fn max_value() -> Self { !Self::min_value() } diff --git a/src/libcore/ops/range.rs b/src/libcore/ops/range.rs index fd3e50998fe..6cfb1005325 100644 --- a/src/libcore/ops/range.rs +++ b/src/libcore/ops/range.rs @@ -391,7 +391,7 @@ impl<Idx> RangeInclusive<Idx> { /// ``` #[stable(feature = "inclusive_range_methods", since = "1.27.0")] #[inline] - #[cfg_attr(not(stage0), rustc_promotable)] + #[rustc_promotable] pub const fn new(start: Idx, end: Idx) -> Self { Self { start, end, is_empty: None } } diff --git a/src/libcore/ptr.rs b/src/libcore/ptr.rs index 0fe82b93ff7..36852b10fac 100644 --- a/src/libcore/ptr.rs +++ b/src/libcore/ptr.rs @@ -209,7 +209,7 @@ pub unsafe fn drop_in_place<T: ?Sized>(to_drop: *mut T) { /// ``` #[inline] #[stable(feature = "rust1", since = "1.0.0")] -#[cfg_attr(not(stage0), rustc_promotable)] +#[rustc_promotable] pub const fn null<T>() -> *const T { 0 as *const T } /// Creates a null mutable raw pointer. @@ -224,7 +224,7 @@ pub const fn null<T>() -> *const T { 0 as *const T } /// ``` #[inline] #[stable(feature = "rust1", since = "1.0.0")] -#[cfg_attr(not(stage0), rustc_promotable)] +#[rustc_promotable] pub const fn null_mut<T>() -> *mut T { 0 as *mut T } /// Swaps the values at two mutable locations of the same type, without diff --git a/src/libcore/tests/lib.rs b/src/libcore/tests/lib.rs index d340924aab1..5ac89912268 100644 --- a/src/libcore/tests/lib.rs +++ b/src/libcore/tests/lib.rs @@ -19,7 +19,6 @@ #![feature(flt2dec)] #![feature(fmt_internals)] #![feature(hashmap_internals)] -#![cfg_attr(stage0, feature(impl_header_lifetime_elision))] #![feature(pattern)] #![feature(range_is_empty)] #![feature(raw)] diff --git a/src/libcore/time.rs b/src/libcore/time.rs index 81ae8ade12d..cfbd431aef0 100644 --- a/src/libcore/time.rs +++ b/src/libcore/time.rs @@ -109,7 +109,7 @@ impl Duration { /// ``` #[stable(feature = "duration", since = "1.3.0")] #[inline] - #[cfg_attr(not(stage0), rustc_promotable)] + #[rustc_promotable] pub const fn from_secs(secs: u64) -> Duration { Duration { secs, nanos: 0 } } @@ -128,7 +128,7 @@ impl Duration { /// ``` #[stable(feature = "duration", since = "1.3.0")] #[inline] - #[cfg_attr(not(stage0), rustc_promotable)] + #[rustc_promotable] pub const fn from_millis(millis: u64) -> Duration { Duration { secs: millis / MILLIS_PER_SEC, @@ -150,7 +150,7 @@ impl Duration { /// ``` #[stable(feature = "duration_from_micros", since = "1.27.0")] #[inline] - #[cfg_attr(not(stage0), rustc_promotable)] + #[rustc_promotable] pub const fn from_micros(micros: u64) -> Duration { Duration { secs: micros / MICROS_PER_SEC, @@ -172,7 +172,7 @@ impl Duration { /// ``` #[stable(feature = "duration_extras", since = "1.27.0")] #[inline] - #[cfg_attr(not(stage0), rustc_promotable)] + #[rustc_promotable] pub const fn from_nanos(nanos: u64) -> Duration { Duration { secs: nanos / (NANOS_PER_SEC as u64), |
