Skip to content

Commit ea31a08

Browse files
Bump bootstrap compiler to 1.33 beta
1 parent 9323499 commit ea31a08

File tree

19 files changed

+16
-168
lines changed

19 files changed

+16
-168
lines changed

src/bootstrap/channel.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use crate::Build;
1414
use crate::config::Config;
1515

1616
// The version number
17-
pub const CFG_RELEASE_NUM: &str = "1.33.0";
17+
pub const CFG_RELEASE_NUM: &str = "1.34.0";
1818

1919
pub struct GitInfo {
2020
inner: Option<Info>,

src/bootstrap/dist.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ fn make_win_dist(
226226
let trim_chars: &[_] = &[' ', '='];
227227
let value =
228228
line[(idx + 1)..]
229-
.trim_left_matches(trim_chars)
229+
.trim_start_matches(trim_chars)
230230
.split(';')
231231
.map(PathBuf::from);
232232

src/bootstrap/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ impl Build {
423423
Command::new(&build.initial_rustc).arg("--version").arg("--verbose"));
424424
let local_release = local_version_verbose
425425
.lines().filter(|x| x.starts_with("release:"))
426-
.next().unwrap().trim_left_matches("release:").trim();
426+
.next().unwrap().trim_start_matches("release:").trim();
427427
let my_version = channel::CFG_RELEASE_NUM;
428428
if local_release.split('.').take(2).eq(my_version.split('.').take(2)) {
429429
build.verbose(&format!("auto-detected local-rebuild {}", local_release));

src/liballoc/benches/vec_deque_append.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#![cfg_attr(stage0, feature(duration_as_u128))]
21
use std::{collections::VecDeque, time::Instant};
32

43
const VECDEQUE_LEN: i32 = 100000;

src/libcore/intrinsics.rs

-1
Original file line numberDiff line numberDiff line change
@@ -692,7 +692,6 @@ extern "rust-intrinsic" {
692692

693693
/// A guard for unsafe functions that cannot ever be executed if `T` is uninhabited:
694694
/// This will statically either panic, or do nothing.
695-
#[cfg(not(stage0))]
696695
pub fn panic_if_uninhabited<T>();
697696

698697
/// Creates a value initialized to zero.

src/libcore/lib.rs

+2-5
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@
7171
#![feature(cfg_target_has_atomic)]
7272
#![feature(concat_idents)]
7373
#![feature(const_fn)]
74-
#![cfg_attr(stage0, feature(const_int_ops))]
7574
#![feature(const_fn_union)]
7675
#![feature(custom_attribute)]
7776
#![feature(doc_cfg)]
@@ -111,19 +110,17 @@
111110
#![feature(aarch64_target_feature)]
112111
#![feature(wasm_target_feature)]
113112
#![feature(avx512_target_feature)]
114-
#![cfg_attr(not(stage0), feature(cmpxchg16b_target_feature))]
113+
#![feature(cmpxchg16b_target_feature)]
115114
#![feature(const_slice_len)]
116115
#![feature(const_str_as_bytes)]
117116
#![feature(const_str_len)]
118-
#![cfg_attr(stage0, feature(const_let))]
119-
#![cfg_attr(stage0, feature(const_int_rotate))]
120117
#![feature(const_int_conversion)]
121118
#![feature(const_transmute)]
122119
#![feature(reverse_bits)]
123120
#![feature(non_exhaustive)]
124121
#![feature(structural_match)]
125122
#![feature(abi_unadjusted)]
126-
#![cfg_attr(not(stage0), feature(adx_target_feature))]
123+
#![feature(adx_target_feature)]
127124

128125
#[prelude_import]
129126
#[allow(unused)]

src/libcore/mem.rs

-3
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,6 @@ pub const fn needs_drop<T>() -> bool {
492492
#[rustc_deprecated(since = "2.0.0", reason = "use `mem::MaybeUninit::zeroed` instead")]
493493
#[stable(feature = "rust1", since = "1.0.0")]
494494
pub unsafe fn zeroed<T>() -> T {
495-
#[cfg(not(stage0))]
496495
intrinsics::panic_if_uninhabited::<T>();
497496
intrinsics::init()
498497
}
@@ -626,7 +625,6 @@ pub unsafe fn zeroed<T>() -> T {
626625
#[rustc_deprecated(since = "2.0.0", reason = "use `mem::MaybeUninit::uninitialized` instead")]
627626
#[stable(feature = "rust1", since = "1.0.0")]
628627
pub unsafe fn uninitialized<T>() -> T {
629-
#[cfg(not(stage0))]
630628
intrinsics::panic_if_uninhabited::<T>();
631629
intrinsics::uninit()
632630
}
@@ -1132,7 +1130,6 @@ impl<T> MaybeUninit<T> {
11321130
#[unstable(feature = "maybe_uninit", issue = "53491")]
11331131
#[inline(always)]
11341132
pub unsafe fn into_inner(self) -> T {
1135-
#[cfg(not(stage0))]
11361133
intrinsics::panic_if_uninhabited::<T>();
11371134
ManuallyDrop::into_inner(self.value)
11381135
}

src/libcore/num/bignum.rs

-11
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,6 @@ macro_rules! impl_full_ops {
4646
($($ty:ty: add($addfn:path), mul/div($bigty:ident);)*) => (
4747
$(
4848
impl FullOps for $ty {
49-
#[cfg(stage0)]
50-
fn full_add(self, other: $ty, carry: bool) -> (bool, $ty) {
51-
// This cannot overflow; the output is between `0` and `2 * 2^nbits - 1`.
52-
// FIXME: will LLVM optimize this into ADC or similar?
53-
let (v, carry1) = unsafe { intrinsics::add_with_overflow(self, other) };
54-
let (v, carry2) = unsafe {
55-
intrinsics::add_with_overflow(v, if carry {1} else {0})
56-
};
57-
(carry1 || carry2, v)
58-
}
59-
#[cfg(not(stage0))]
6049
fn full_add(self, other: $ty, carry: bool) -> (bool, $ty) {
6150
// This cannot overflow; the output is between `0` and `2 * 2^nbits - 1`.
6251
// FIXME: will LLVM optimize this into ADC or similar?

0 commit comments

Comments
 (0)