Skip to content

Commit d9f1249

Browse files
committed
Auto merge of #45285 - alexcrichton:update-bootstrap, r=Mark-Simulacrum
Bump to 1.23 and update bootstrap This commit updates the bootstrap compiler, bumps the version to 1.23, updates Cargo, updates books, and updates crates.io dependencies
2 parents bed9a85 + 8ceacf4 commit d9f1249

File tree

26 files changed

+287
-287
lines changed

26 files changed

+287
-287
lines changed

src/Cargo.lock

Lines changed: 211 additions & 175 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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.22.0";
27+
pub const CFG_RELEASE_NUM: &str = "1.23.0";
2828

2929
// An optional number to put after the label, e.g. '.2' -> '-beta.2'
3030
// Be sure to make this starts with a dot to conform to semver pre-release

src/doc/nomicon

src/libcore/cell.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ impl<T> Cell<T> {
329329
/// let c = Cell::new(5);
330330
/// ```
331331
#[stable(feature = "rust1", since = "1.0.0")]
332-
#[cfg_attr(not(stage0), rustc_const_unstable(feature = "const_cell_new"))]
332+
#[rustc_const_unstable(feature = "const_cell_new")]
333333
#[inline]
334334
pub const fn new(value: T) -> Cell<T> {
335335
Cell {
@@ -544,7 +544,7 @@ impl<T> RefCell<T> {
544544
/// let c = RefCell::new(5);
545545
/// ```
546546
#[stable(feature = "rust1", since = "1.0.0")]
547-
#[cfg_attr(not(stage0), rustc_const_unstable(feature = "const_refcell_new"))]
547+
#[rustc_const_unstable(feature = "const_refcell_new")]
548548
#[inline]
549549
pub const fn new(value: T) -> RefCell<T> {
550550
RefCell {
@@ -1190,7 +1190,7 @@ impl<T> UnsafeCell<T> {
11901190
/// let uc = UnsafeCell::new(5);
11911191
/// ```
11921192
#[stable(feature = "rust1", since = "1.0.0")]
1193-
#[cfg_attr(not(stage0), rustc_const_unstable(feature = "const_unsafe_cell_new"))]
1193+
#[rustc_const_unstable(feature = "const_unsafe_cell_new")]
11941194
#[inline]
11951195
pub const fn new(value: T) -> UnsafeCell<T> {
11961196
UnsafeCell { value: value }

src/libcore/intrinsics.rs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1383,17 +1383,5 @@ extern "rust-intrinsic" {
13831383
/// }
13841384
/// # } }
13851385
/// ```
1386-
#[cfg(not(stage0))]
13871386
pub fn align_offset(ptr: *const (), align: usize) -> usize;
13881387
}
1389-
1390-
#[cfg(stage0)]
1391-
/// remove me after the next release
1392-
pub unsafe fn align_offset(ptr: *const (), align: usize) -> usize {
1393-
let offset = ptr as usize % align;
1394-
if offset == 0 {
1395-
0
1396-
} else {
1397-
align - offset
1398-
}
1399-
}

src/libcore/lib.rs

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -85,29 +85,28 @@
8585
#![feature(prelude_import)]
8686
#![feature(repr_simd, platform_intrinsics)]
8787
#![feature(rustc_attrs)]
88-
#![cfg_attr(not(stage0), feature(rustc_const_unstable))]
88+
#![feature(rustc_const_unstable)]
8989
#![feature(specialization)]
9090
#![feature(staged_api)]
9191
#![feature(unboxed_closures)]
9292
#![feature(untagged_unions)]
9393
#![feature(unwind_attributes)]
94-
95-
#![cfg_attr(not(stage0), feature(const_min_value))]
96-
#![cfg_attr(not(stage0), feature(const_max_value))]
97-
#![cfg_attr(not(stage0), feature(const_atomic_bool_new))]
98-
#![cfg_attr(not(stage0), feature(const_atomic_isize_new))]
99-
#![cfg_attr(not(stage0), feature(const_atomic_usize_new))]
100-
#![cfg_attr(not(stage0), feature(const_atomic_i8_new))]
101-
#![cfg_attr(not(stage0), feature(const_atomic_u8_new))]
102-
#![cfg_attr(not(stage0), feature(const_atomic_i16_new))]
103-
#![cfg_attr(not(stage0), feature(const_atomic_u16_new))]
104-
#![cfg_attr(not(stage0), feature(const_atomic_i32_new))]
105-
#![cfg_attr(not(stage0), feature(const_atomic_u32_new))]
106-
#![cfg_attr(not(stage0), feature(const_atomic_i64_new))]
107-
#![cfg_attr(not(stage0), feature(const_atomic_u64_new))]
108-
#![cfg_attr(not(stage0), feature(const_unsafe_cell_new))]
109-
#![cfg_attr(not(stage0), feature(const_cell_new))]
110-
#![cfg_attr(not(stage0), feature(const_nonzero_new))]
94+
#![feature(const_min_value)]
95+
#![feature(const_max_value)]
96+
#![feature(const_atomic_bool_new)]
97+
#![feature(const_atomic_isize_new)]
98+
#![feature(const_atomic_usize_new)]
99+
#![feature(const_atomic_i8_new)]
100+
#![feature(const_atomic_u8_new)]
101+
#![feature(const_atomic_i16_new)]
102+
#![feature(const_atomic_u16_new)]
103+
#![feature(const_atomic_i32_new)]
104+
#![feature(const_atomic_u32_new)]
105+
#![feature(const_atomic_i64_new)]
106+
#![feature(const_atomic_u64_new)]
107+
#![feature(const_unsafe_cell_new)]
108+
#![feature(const_cell_new)]
109+
#![feature(const_nonzero_new)]
111110

112111
#[prelude_import]
113112
#[allow(unused)]

src/libcore/mem.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ pub fn forget<T>(t: T) {
311311
/// [alignment]: ./fn.align_of.html
312312
#[inline]
313313
#[stable(feature = "rust1", since = "1.0.0")]
314-
#[cfg_attr(not(stage0), rustc_const_unstable(feature = "const_size_of"))]
314+
#[rustc_const_unstable(feature = "const_size_of")]
315315
pub const fn size_of<T>() -> usize {
316316
unsafe { intrinsics::size_of::<T>() }
317317
}
@@ -403,7 +403,7 @@ pub fn min_align_of_val<T: ?Sized>(val: &T) -> usize {
403403
/// ```
404404
#[inline]
405405
#[stable(feature = "rust1", since = "1.0.0")]
406-
#[cfg_attr(not(stage0), rustc_const_unstable(feature = "const_align_of"))]
406+
#[rustc_const_unstable(feature = "const_align_of")]
407407
pub const fn align_of<T>() -> usize {
408408
unsafe { intrinsics::min_align_of::<T>() }
409409
}

src/libcore/nonzero.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ impl<T: Zeroable> NonZero<T> {
7171
#[unstable(feature = "nonzero",
7272
reason = "needs an RFC to flesh out the design",
7373
issue = "27730")]
74-
#[cfg_attr(not(stage0), rustc_const_unstable(feature = "const_nonzero_new"))]
74+
#[rustc_const_unstable(feature = "const_nonzero_new")]
7575
#[inline]
7676
pub const unsafe fn new_unchecked(inner: T) -> Self {
7777
NonZero(inner)

src/libcore/num/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ macro_rules! int_impl {
109109
/// assert_eq!(i8::min_value(), -128);
110110
/// ```
111111
#[stable(feature = "rust1", since = "1.0.0")]
112-
#[cfg_attr(not(stage0), rustc_const_unstable(feature = "const_min_value"))]
112+
#[rustc_const_unstable(feature = "const_min_value")]
113113
#[inline]
114114
pub const fn min_value() -> Self {
115115
!0 ^ ((!0 as $UnsignedT) >> 1) as Self
@@ -123,7 +123,7 @@ macro_rules! int_impl {
123123
/// assert_eq!(i8::max_value(), 127);
124124
/// ```
125125
#[stable(feature = "rust1", since = "1.0.0")]
126-
#[cfg_attr(not(stage0), rustc_const_unstable(feature = "const_max_value"))]
126+
#[rustc_const_unstable(feature = "const_max_value")]
127127
#[inline]
128128
pub const fn max_value() -> Self {
129129
!Self::min_value()
@@ -1282,7 +1282,7 @@ macro_rules! uint_impl {
12821282
/// assert_eq!(u8::min_value(), 0);
12831283
/// ```
12841284
#[stable(feature = "rust1", since = "1.0.0")]
1285-
#[cfg_attr(not(stage0), rustc_const_unstable(feature = "const_min_value"))]
1285+
#[rustc_const_unstable(feature = "const_min_value")]
12861286
#[inline]
12871287
pub const fn min_value() -> Self { 0 }
12881288

@@ -1294,7 +1294,7 @@ macro_rules! uint_impl {
12941294
/// assert_eq!(u8::max_value(), 255);
12951295
/// ```
12961296
#[stable(feature = "rust1", since = "1.0.0")]
1297-
#[cfg_attr(not(stage0), rustc_const_unstable(feature = "const_max_value"))]
1297+
#[rustc_const_unstable(feature = "const_max_value")]
12981298
#[inline]
12991299
pub const fn max_value() -> Self { !0 }
13001300

0 commit comments

Comments
 (0)