Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit ea31a08

Browse files
committedJan 20, 2019
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

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

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

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

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

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

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

Lines changed: 0 additions & 3 deletions
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

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

‎src/libcore/num/mod.rs

Lines changed: 5 additions & 129 deletions
Large diffs are not rendered by default.

‎src/libcore/ops/deref.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ impl<T: ?Sized> DerefMut for &mut T {
171171
/// Indicates that a struct can be used as a method receiver, without the
172172
/// `arbitrary_self_types` feature. This is implemented by stdlib pointer types like `Box<T>`,
173173
/// `Rc<T>`, `&T`, and `Pin<P>`.
174-
#[cfg_attr(not(stage0), lang = "receiver")]
174+
#[lang = "receiver"]
175175
#[unstable(feature = "receiver_trait", issue = "0")]
176176
#[doc(hidden)]
177177
pub trait Receiver {

‎src/libpanic_abort/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#![panic_runtime]
1313
#![allow(unused_features)]
1414

15-
#![cfg_attr(stage0, feature(cfg_target_vendor))]
1615
#![feature(core_intrinsics)]
1716
#![feature(libc)]
1817
#![feature(nll)]

‎src/librustc_mir/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,8 @@ Rust MIR: a lowered representation of Rust. Also: an experiment!
2424
#![feature(unicode_internals)]
2525
#![feature(step_trait)]
2626
#![feature(slice_concat_ext)]
27-
#![cfg_attr(stage0, feature(if_while_or_patterns))]
2827
#![feature(try_from)]
2928
#![feature(reverse_bits)]
30-
#![cfg_attr(stage0, feature(underscore_imports))]
3129

3230
#![recursion_limit="256"]
3331

‎src/libstd/lib.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -238,12 +238,9 @@
238238
#![feature(c_variadic)]
239239
#![feature(cfg_target_has_atomic)]
240240
#![feature(cfg_target_thread_local)]
241-
#![cfg_attr(stage0, feature(cfg_target_vendor))]
242241
#![feature(char_error_internals)]
243242
#![feature(compiler_builtins_lib)]
244243
#![feature(concat_idents)]
245-
#![cfg_attr(stage0, feature(const_int_ops))]
246-
#![cfg_attr(stage0, feature(const_ip))]
247244
#![feature(const_raw_ptr_deref)]
248245
#![feature(const_cstr_unchecked)]
249246
#![feature(core_intrinsics)]

‎src/libstd/net/ip.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,6 @@ impl Ipv4Addr {
328328
/// let addr = Ipv4Addr::new(127, 0, 0, 1);
329329
/// ```
330330
#[stable(feature = "rust1", since = "1.0.0")]
331-
#[cfg_attr(stage0, rustc_const_unstable(feature = "const_ip"))]
332331
pub const fn new(a: u8, b: u8, c: u8, d: u8) -> Ipv4Addr {
333332
Ipv4Addr {
334333
inner: c::in_addr {

‎src/libtest/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
2424
html_root_url = "https://doc.rust-lang.org/nightly/", test(attr(deny(warnings))))]
2525
#![feature(asm)]
26-
#![cfg_attr(stage0, feature(cfg_target_vendor))]
2726
#![feature(fnbox)]
2827
#![cfg_attr(any(unix, target_os = "cloudabi"), feature(libc))]
2928
#![feature(nll)]

‎src/libunwind/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#![no_std]
22
#![unstable(feature = "panic_unwind", issue = "32837")]
33

4-
#![cfg_attr(stage0, feature(cfg_target_vendor))]
54
#![feature(link_cfg)]
65
#![feature(nll)]
76
#![feature(staged_api)]

‎src/stage0.txt

Lines changed: 1 addition & 1 deletion
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: 2019-01-04
15+
date: 2019-01-18
1616
rustc: beta
1717
cargo: beta
1818

‎src/tools/linkchecker/main.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ impl FileEntry {
7878
fn parse_ids(&mut self, file: &Path, contents: &str, errors: &mut bool) {
7979
if self.ids.is_empty() {
8080
with_attrs_in_source(contents, " id", |fragment, i, _| {
81-
let frag = fragment.trim_left_matches("#").to_owned();
81+
let frag = fragment.trim_start_matches("#").to_owned();
8282
let encoded = small_url_encode(&frag);
8383
if !self.ids.insert(frag) {
8484
*errors = true;
@@ -343,7 +343,7 @@ fn with_attrs_in_source<F: FnMut(&str, usize, &str)>(contents: &str, attr: &str,
343343
Some(i) => i,
344344
None => continue,
345345
};
346-
if rest[..pos_equals].trim_left_matches(" ") != "" {
346+
if rest[..pos_equals].trim_start_matches(" ") != "" {
347347
continue;
348348
}
349349

@@ -355,7 +355,7 @@ fn with_attrs_in_source<F: FnMut(&str, usize, &str)>(contents: &str, attr: &str,
355355
};
356356
let quote_delim = rest.as_bytes()[pos_quote] as char;
357357

358-
if rest[..pos_quote].trim_left_matches(" ") != "" {
358+
if rest[..pos_quote].trim_start_matches(" ") != "" {
359359
continue;
360360
}
361361
let rest = &rest[pos_quote + 1..];

‎src/tools/tidy/src/features.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ pub fn collect_lang_features(base_src_path: &Path, bad: &mut bool) -> Features {
188188
}
189189

190190
let mut parts = line.split(',');
191-
let level = match parts.next().map(|l| l.trim().trim_left_matches('(')) {
191+
let level = match parts.next().map(|l| l.trim().trim_start_matches('(')) {
192192
Some("active") => Status::Unstable,
193193
Some("removed") => Status::Removed,
194194
Some("accepted") => Status::Stable,

0 commit comments

Comments
 (0)
Please sign in to comment.