Skip to content

Commit f6e9a6e

Browse files
borsbors
committed
Auto merge of #55548 - alexcrichton:bump, r=Mark-Simulacrum
Bump nightly to 1.32.0 * Also update the bootstrap compiler * Update cargo to 1.32.0 * Clean out stage0 annotations
2 parents c613d26 + d0060d7 commit f6e9a6e

File tree

20 files changed

+20
-39
lines changed

20 files changed

+20
-39
lines changed

Diff for: ‎src/Cargo.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -198,14 +198,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
198198

199199
[[package]]
200200
name = "cargo"
201-
version = "0.32.0"
201+
version = "0.33.0"
202202
dependencies = [
203203
"atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
204204
"bufstream 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
205205
"bytesize 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
206206
"clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
207207
"core-foundation 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
208-
"crates-io 0.20.0",
208+
"crates-io 0.21.0",
209209
"crossbeam-utils 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
210210
"crypto-hash 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
211211
"curl 0.4.18 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -483,7 +483,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
483483

484484
[[package]]
485485
name = "crates-io"
486-
version = "0.20.0"
486+
version = "0.21.0"
487487
dependencies = [
488488
"curl 0.4.18 (registry+https://github.com/rust-lang/crates.io-index)",
489489
"failure 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1784,7 +1784,7 @@ dependencies = [
17841784
name = "rls"
17851785
version = "0.130.5"
17861786
dependencies = [
1787-
"cargo 0.32.0",
1787+
"cargo 0.33.0",
17881788
"cargo_metadata 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
17891789
"clippy_lints 0.0.212",
17901790
"crossbeam-channel 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",

Diff for: ‎src/bootstrap/channel.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ use Build;
2424
use config::Config;
2525

2626
// The version number
27-
pub const CFG_RELEASE_NUM: &str = "1.31.0";
27+
pub const CFG_RELEASE_NUM: &str = "1.32.0";
2828

2929
pub struct GitInfo {
3030
inner: Option<Info>,

Diff for: ‎src/liballoc/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@
8686
#![feature(box_syntax)]
8787
#![feature(cfg_target_has_atomic)]
8888
#![feature(coerce_unsized)]
89-
#![cfg_attr(stage0, feature(min_const_fn))]
9089
#![feature(core_intrinsics)]
9190
#![feature(custom_attribute)]
9291
#![feature(dropck_eyepatch)]

Diff for: ‎src/liballoc/rc.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ struct RcBox<T: ?Sized> {
282282
/// type `T`.
283283
///
284284
/// [get_mut]: #method.get_mut
285-
#[cfg_attr(all(not(stage0), not(test)), lang = "rc")]
285+
#[cfg_attr(not(test), lang = "rc")]
286286
#[stable(feature = "rust1", since = "1.0.0")]
287287
pub struct Rc<T: ?Sized> {
288288
ptr: NonNull<RcBox<T>>,

Diff for: ‎src/liballoc/sync.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ const MAX_REFCOUNT: usize = (isize::MAX) as usize;
199199
/// counting in general.
200200
///
201201
/// [rc_examples]: ../../std/rc/index.html#examples
202-
#[cfg_attr(all(not(stage0), not(test)), lang = "arc")]
202+
#[cfg_attr(not(test), lang = "arc")]
203203
#[stable(feature = "rust1", since = "1.0.0")]
204204
pub struct Arc<T: ?Sized> {
205205
ptr: NonNull<ArcInner<T>>,

Diff for: ‎src/liballoc/tests/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#![feature(allocator_api)]
1212
#![feature(alloc_system)]
1313
#![feature(box_syntax)]
14-
#![cfg_attr(stage0, feature(min_const_fn))]
1514
#![feature(drain_filter)]
1615
#![feature(exact_size_is_empty)]
1716
#![feature(pattern)]

Diff for: ‎src/libcore/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@
8888
#![feature(doc_spotlight)]
8989
#![feature(extern_types)]
9090
#![feature(fundamental)]
91-
#![cfg_attr(stage0, feature(impl_header_lifetime_elision))]
9291
#![feature(intrinsics)]
9392
#![feature(lang_items)]
9493
#![feature(link_llvm_intrinsics)]

Diff for: ‎src/libcore/mem.rs

+2-11
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ pub fn forget<T>(t: T) {
285285
/// [alignment]: ./fn.align_of.html
286286
#[inline]
287287
#[stable(feature = "rust1", since = "1.0.0")]
288-
#[cfg_attr(not(stage0), rustc_promotable)]
288+
#[rustc_promotable]
289289
pub const fn size_of<T>() -> usize {
290290
intrinsics::size_of::<T>()
291291
}
@@ -377,7 +377,7 @@ pub fn min_align_of_val<T: ?Sized>(val: &T) -> usize {
377377
/// ```
378378
#[inline]
379379
#[stable(feature = "rust1", since = "1.0.0")]
380-
#[cfg_attr(not(stage0), rustc_promotable)]
380+
#[rustc_promotable]
381381
pub const fn align_of<T>() -> usize {
382382
intrinsics::min_align_of::<T>()
383383
}
@@ -458,19 +458,10 @@ pub fn align_of_val<T: ?Sized>(val: &T) -> usize {
458458
#[inline]
459459
#[stable(feature = "needs_drop", since = "1.21.0")]
460460
#[rustc_const_unstable(feature = "const_needs_drop")]
461-
#[cfg(not(stage0))]
462461
pub const fn needs_drop<T>() -> bool {
463462
intrinsics::needs_drop::<T>()
464463
}
465464

466-
#[inline]
467-
#[stable(feature = "needs_drop", since = "1.21.0")]
468-
#[cfg(stage0)]
469-
/// Ceci n'est pas la documentation
470-
pub fn needs_drop<T>() -> bool {
471-
unsafe { intrinsics::needs_drop::<T>() }
472-
}
473-
474465
/// Creates a value whose bytes are all zero.
475466
///
476467
/// This has the same effect as allocating space with

Diff for: ‎src/libcore/num/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ $EndFeature, "
216216
```"),
217217
#[stable(feature = "rust1", since = "1.0.0")]
218218
#[inline]
219-
#[cfg_attr(not(stage0), rustc_promotable)]
219+
#[rustc_promotable]
220220
pub const fn min_value() -> Self {
221221
!0 ^ ((!0 as $UnsignedT) >> 1) as Self
222222
}
@@ -235,7 +235,7 @@ $EndFeature, "
235235
```"),
236236
#[stable(feature = "rust1", since = "1.0.0")]
237237
#[inline]
238-
#[cfg_attr(not(stage0), rustc_promotable)]
238+
#[rustc_promotable]
239239
pub const fn max_value() -> Self {
240240
!Self::min_value()
241241
}

Diff for: ‎src/libcore/ops/range.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ impl<Idx> RangeInclusive<Idx> {
391391
/// ```
392392
#[stable(feature = "inclusive_range_methods", since = "1.27.0")]
393393
#[inline]
394-
#[cfg_attr(not(stage0), rustc_promotable)]
394+
#[rustc_promotable]
395395
pub const fn new(start: Idx, end: Idx) -> Self {
396396
Self { start, end, is_empty: None }
397397
}

Diff for: ‎src/libcore/ptr.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ pub unsafe fn drop_in_place<T: ?Sized>(to_drop: *mut T) {
209209
/// ```
210210
#[inline]
211211
#[stable(feature = "rust1", since = "1.0.0")]
212-
#[cfg_attr(not(stage0), rustc_promotable)]
212+
#[rustc_promotable]
213213
pub const fn null<T>() -> *const T { 0 as *const T }
214214

215215
/// Creates a null mutable raw pointer.
@@ -224,7 +224,7 @@ pub const fn null<T>() -> *const T { 0 as *const T }
224224
/// ```
225225
#[inline]
226226
#[stable(feature = "rust1", since = "1.0.0")]
227-
#[cfg_attr(not(stage0), rustc_promotable)]
227+
#[rustc_promotable]
228228
pub const fn null_mut<T>() -> *mut T { 0 as *mut T }
229229

230230
/// Swaps the values at two mutable locations of the same type, without

Diff for: ‎src/libcore/tests/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#![feature(flt2dec)]
2020
#![feature(fmt_internals)]
2121
#![feature(hashmap_internals)]
22-
#![cfg_attr(stage0, feature(impl_header_lifetime_elision))]
2322
#![feature(pattern)]
2423
#![feature(range_is_empty)]
2524
#![feature(raw)]

Diff for: ‎src/libcore/time.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ impl Duration {
109109
/// ```
110110
#[stable(feature = "duration", since = "1.3.0")]
111111
#[inline]
112-
#[cfg_attr(not(stage0), rustc_promotable)]
112+
#[rustc_promotable]
113113
pub const fn from_secs(secs: u64) -> Duration {
114114
Duration { secs, nanos: 0 }
115115
}
@@ -128,7 +128,7 @@ impl Duration {
128128
/// ```
129129
#[stable(feature = "duration", since = "1.3.0")]
130130
#[inline]
131-
#[cfg_attr(not(stage0), rustc_promotable)]
131+
#[rustc_promotable]
132132
pub const fn from_millis(millis: u64) -> Duration {
133133
Duration {
134134
secs: millis / MILLIS_PER_SEC,
@@ -150,7 +150,7 @@ impl Duration {
150150
/// ```
151151
#[stable(feature = "duration_from_micros", since = "1.27.0")]
152152
#[inline]
153-
#[cfg_attr(not(stage0), rustc_promotable)]
153+
#[rustc_promotable]
154154
pub const fn from_micros(micros: u64) -> Duration {
155155
Duration {
156156
secs: micros / MICROS_PER_SEC,
@@ -172,7 +172,7 @@ impl Duration {
172172
/// ```
173173
#[stable(feature = "duration_extras", since = "1.27.0")]
174174
#[inline]
175-
#[cfg_attr(not(stage0), rustc_promotable)]
175+
#[rustc_promotable]
176176
pub const fn from_nanos(nanos: u64) -> Duration {
177177
Duration {
178178
secs: nanos / (NANOS_PER_SEC as u64),

Diff for: ‎src/librustc/lib.rs

-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242

4343
#![feature(box_patterns)]
4444
#![feature(box_syntax)]
45-
#![cfg_attr(stage0, feature(min_const_fn))]
4645
#![feature(core_intrinsics)]
4746
#![feature(drain_filter)]
4847
#![cfg_attr(windows, feature(libc))]
@@ -67,7 +66,6 @@
6766
#![feature(step_trait)]
6867
#![feature(integer_atomics)]
6968
#![feature(test)]
70-
#![cfg_attr(stage0, feature(impl_header_lifetime_elision))]
7169
#![feature(in_band_lifetimes)]
7270
#![feature(macro_at_most_once_rep)]
7371
#![feature(crate_visibility_modifier)]

Diff for: ‎src/librustc_data_structures/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
html_root_url = "https://doc.rust-lang.org/nightly/")]
2222

2323
#![feature(in_band_lifetimes)]
24-
#![cfg_attr(stage0, feature(impl_header_lifetime_elision))]
2524
#![feature(unboxed_closures)]
2625
#![feature(fn_traits)]
2726
#![feature(unsize)]

Diff for: ‎src/librustc_mir/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ Rust MIR: a lowered representation of Rust. Also: an experiment!
1616

1717
#![feature(nll)]
1818
#![feature(in_band_lifetimes)]
19-
#![cfg_attr(stage0, feature(impl_header_lifetime_elision))]
2019
#![feature(slice_patterns)]
2120
#![feature(slice_sort_by_cached_key)]
2221
#![feature(box_patterns)]

Diff for: ‎src/librustc_target/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
html_root_url = "https://doc.rust-lang.org/nightly/")]
2323

2424
#![feature(box_syntax)]
25-
#![cfg_attr(stage0, feature(min_const_fn))]
2625
#![feature(nll)]
2726
#![feature(slice_patterns)]
2827

Diff for: ‎src/libstd/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,6 @@
250250
#![feature(cfg_target_vendor)]
251251
#![feature(char_error_internals)]
252252
#![feature(compiler_builtins_lib)]
253-
#![cfg_attr(stage0, feature(min_const_fn))]
254253
#![feature(const_int_ops)]
255254
#![feature(const_ip)]
256255
#![feature(const_raw_ptr_deref)]

Diff for: ‎src/stage0.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# source tarball for a stable release you'll likely see `1.x.0` for rustc and
1313
# `0.x.0` for Cargo where they were released on `date`.
1414

15-
date: 2018-10-13
15+
date: 2018-10-30
1616
rustc: beta
1717
cargo: beta
1818

Diff for: ‎src/tools/cargo

0 commit comments

Comments
 (0)