Skip to content

Commit f6e9a6e

Browse files
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

src/Cargo.lock

Lines changed: 4 additions & 4 deletions
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)",

src/bootstrap/channel.rs

Lines changed: 1 addition & 1 deletion
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>,

src/liballoc/lib.rs

Lines changed: 0 additions & 1 deletion
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)]

src/liballoc/rc.rs

Lines changed: 1 addition & 1 deletion
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>>,

src/liballoc/sync.rs

Lines changed: 1 addition & 1 deletion
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>>,

src/liballoc/tests/lib.rs

Lines changed: 0 additions & 1 deletion
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)]

src/libcore/lib.rs

Lines changed: 0 additions & 1 deletion
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)]

src/libcore/mem.rs

Lines changed: 2 additions & 11 deletions
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

src/libcore/num/mod.rs

Lines changed: 2 additions & 2 deletions
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
}

src/libcore/ops/range.rs

Lines changed: 1 addition & 1 deletion
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
}

0 commit comments

Comments
 (0)