Skip to content

Commit 86c0b85

Browse files
committed
Auto merge of #74395 - Mark-Simulacrum:stage0-next, r=pietroalbini
Bump version to 1.47 This also bumps to a more recent rustfmt version, just to keep us relatively up to date (though almost nothing has changed in rustfmt we use beyond bumps to the parser infra). No formatting changes as a result of this. r? @pietroalbini
2 parents 8534be7 + 8321b3f commit 86c0b85

File tree

35 files changed

+20
-80
lines changed

35 files changed

+20
-80
lines changed

src/bootstrap/channel.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use build_helper::output;
1313
use crate::Build;
1414

1515
// The version number
16-
pub const CFG_RELEASE_NUM: &str = "1.46.0";
16+
pub const CFG_RELEASE_NUM: &str = "1.47.0";
1717

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

src/bootstrap/compile.rs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -159,13 +159,7 @@ fn copy_self_contained_objects(
159159
compiler: &Compiler,
160160
target: Interned<String>,
161161
) -> Vec<(PathBuf, DependencyType)> {
162-
// cfg(bootstrap)
163-
// Remove when upgrading bootstrap compiler.
164-
let libdir_self_contained = if compiler.stage == 0 {
165-
builder.sysroot_libdir(*compiler, target).to_path_buf()
166-
} else {
167-
builder.sysroot_libdir(*compiler, target).join("self-contained")
168-
};
162+
let libdir_self_contained = builder.sysroot_libdir(*compiler, target).join("self-contained");
169163
t!(fs::create_dir_all(&libdir_self_contained));
170164
let mut target_deps = vec![];
171165

src/ci/docker/host-x86_64/i686-gnu-nopt/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1111
cmake \
1212
sudo \
1313
gdb \
14+
zlib1g-dev \
15+
lib32z1-dev \
1416
xz-utils
1517

1618

src/ci/docker/host-x86_64/i686-gnu/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1111
cmake \
1212
sudo \
1313
gdb \
14+
zlib1g-dev \
15+
lib32z1-dev \
1416
xz-utils
1517

1618

src/liballoc/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@
8787
#![feature(const_generic_impls_guard)]
8888
#![feature(const_generics)]
8989
#![feature(const_in_array_repeat_expressions)]
90-
#![cfg_attr(bootstrap, feature(const_if_match))]
9190
#![feature(cow_is_borrowed)]
9291
#![feature(deque_range)]
9392
#![feature(dispatch_from_dyn)]

src/libcore/intrinsics.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1927,7 +1927,6 @@ extern "rust-intrinsic" {
19271927
/// The to-be-stabilized version of this intrinsic is
19281928
/// [`std::mem::variant_count`](../../std/mem/fn.variant_count.html)
19291929
#[rustc_const_unstable(feature = "variant_count", issue = "73662")]
1930-
#[cfg(not(bootstrap))]
19311930
pub fn variant_count<T>() -> usize;
19321931

19331932
/// Rust's "try catch" construct which invokes the function pointer `try_fn`
@@ -1958,7 +1957,6 @@ extern "rust-intrinsic" {
19581957
/// Internal placeholder for injecting code coverage counters when the "instrument-coverage"
19591958
/// option is enabled. The placeholder is replaced with `llvm.instrprof.increment` during code
19601959
/// generation.
1961-
#[cfg(not(bootstrap))]
19621960
#[lang = "count_code_region"]
19631961
pub fn count_code_region(index: u32, start_byte_pos: u32, end_byte_pos: u32);
19641962

@@ -1968,7 +1966,6 @@ extern "rust-intrinsic" {
19681966
/// "coverage map", which is injected into the generated code, as additional data.
19691967
/// This marker identifies a code region and two other counters or counter expressions
19701968
/// whose sum is the number of times the code region was executed.
1971-
#[cfg(not(bootstrap))]
19721969
pub fn coverage_counter_add(
19731970
index: u32,
19741971
left_index: u32,
@@ -1980,7 +1977,6 @@ extern "rust-intrinsic" {
19801977
/// This marker identifies a code region and two other counters or counter expressions
19811978
/// whose difference is the number of times the code region was executed.
19821979
/// (See `coverage_counter_add` for more information.)
1983-
#[cfg(not(bootstrap))]
19841980
pub fn coverage_counter_subtract(
19851981
index: u32,
19861982
left_index: u32,
@@ -1992,17 +1988,14 @@ extern "rust-intrinsic" {
19921988
/// This marker identifies a code region to be added to the "coverage map" to indicate source
19931989
/// code that can never be reached.
19941990
/// (See `coverage_counter_add` for more information.)
1995-
#[cfg(not(bootstrap))]
19961991
pub fn coverage_unreachable(start_byte_pos: u32, end_byte_pos: u32);
19971992

19981993
/// See documentation of `<*const T>::guaranteed_eq` for details.
19991994
#[rustc_const_unstable(feature = "const_raw_ptr_comparison", issue = "53020")]
2000-
#[cfg(not(bootstrap))]
20011995
pub fn ptr_guaranteed_eq<T>(ptr: *const T, other: *const T) -> bool;
20021996

20031997
/// See documentation of `<*const T>::guaranteed_ne` for details.
20041998
#[rustc_const_unstable(feature = "const_raw_ptr_comparison", issue = "53020")]
2005-
#[cfg(not(bootstrap))]
20061999
pub fn ptr_guaranteed_ne<T>(ptr: *const T, other: *const T) -> bool;
20072000
}
20082001

src/libcore/lib.rs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,6 @@
7373
#![feature(const_ascii_ctype_on_intrinsics)]
7474
#![feature(const_alloc_layout)]
7575
#![feature(const_discriminant)]
76-
#![cfg_attr(bootstrap, feature(const_if_match))]
77-
#![cfg_attr(bootstrap, feature(const_loop))]
7876
#![feature(const_checked_int_methods)]
7977
#![feature(const_euclidean_int_methods)]
8078
#![feature(const_overflowing_int_methods)]
@@ -87,7 +85,7 @@
8785
#![feature(const_generics)]
8886
#![feature(const_ptr_offset)]
8987
#![feature(const_ptr_offset_from)]
90-
#![cfg_attr(not(bootstrap), feature(const_raw_ptr_comparison))]
88+
#![feature(const_raw_ptr_comparison)]
9189
#![feature(const_result)]
9290
#![feature(const_slice_from_raw_parts)]
9391
#![feature(const_slice_ptr_len)]
@@ -121,13 +119,12 @@
121119
#![feature(staged_api)]
122120
#![feature(std_internals)]
123121
#![feature(stmt_expr_attributes)]
124-
#![cfg_attr(bootstrap, feature(track_caller))]
125122
#![feature(transparent_unions)]
126123
#![feature(unboxed_closures)]
127124
#![feature(unsized_locals)]
128125
#![feature(untagged_unions)]
129126
#![feature(unwind_attributes)]
130-
#![cfg_attr(not(bootstrap), feature(variant_count))]
127+
#![feature(variant_count)]
131128
#![feature(doc_alias)]
132129
#![feature(mmx_target_feature)]
133130
#![feature(tbm_target_feature)]
@@ -142,7 +139,7 @@
142139
#![feature(rtm_target_feature)]
143140
#![feature(f16c_target_feature)]
144141
#![feature(hexagon_target_feature)]
145-
#![cfg_attr(not(bootstrap), feature(const_fn_transmute))]
142+
#![feature(const_fn_transmute)]
146143
#![feature(abi_unadjusted)]
147144
#![feature(adx_target_feature)]
148145
#![feature(maybe_uninit_slice)]
@@ -293,7 +290,7 @@ pub mod primitive;
293290
)]
294291
// FIXME: This annotation should be moved into rust-lang/stdarch after clashing_extern_declarations is
295292
// merged. It currently cannot because bootstrap fails as the lint hasn't been defined yet.
296-
#[cfg_attr(not(bootstrap), allow(clashing_extern_declarations))]
293+
#[allow(clashing_extern_declarations)]
297294
#[unstable(feature = "stdsimd", issue = "48556")]
298295
mod core_arch;
299296

src/libcore/mem/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1037,7 +1037,6 @@ pub const fn discriminant<T>(v: &T) -> Discriminant<T> {
10371037
/// assert_eq!(mem::variant_count::<Result<!, !>>(), 2);
10381038
/// ```
10391039
#[inline(always)]
1040-
#[cfg(not(bootstrap))]
10411040
#[unstable(feature = "variant_count", issue = "73662")]
10421041
#[rustc_const_unstable(feature = "variant_count", issue = "73662")]
10431042
pub const fn variant_count<T>() -> usize {

src/libcore/num/mod.rs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,6 @@ macro_rules! try_opt {
2121
};
2222
}
2323

24-
#[cfg(bootstrap)]
25-
macro_rules! unlikely {
26-
($e: expr) => {
27-
$e
28-
};
29-
}
30-
31-
#[cfg(not(bootstrap))]
3224
#[allow_internal_unstable(const_likely)]
3325
macro_rules! unlikely {
3426
($e: expr) => {
@@ -1600,7 +1592,6 @@ $EndFeature, "
16001592
#[stable(feature = "no_panic_abs", since = "1.13.0")]
16011593
#[rustc_const_stable(feature = "const_int_methods", since = "1.32.0")]
16021594
#[allow(unused_attributes)]
1603-
#[cfg_attr(bootstrap, allow_internal_unstable(const_if_match))]
16041595
#[inline]
16051596
pub const fn wrapping_abs(self) -> Self {
16061597
if self.is_negative() {
@@ -1889,7 +1880,6 @@ assert_eq!(", stringify!($SelfT), "::MIN.overflowing_neg(), (", stringify!($Self
18891880
#[stable(feature = "wrapping", since = "1.7.0")]
18901881
#[rustc_const_stable(feature = "const_int_methods", since = "1.32.0")]
18911882
#[allow(unused_attributes)]
1892-
#[cfg_attr(bootstrap, allow_internal_unstable(const_if_match))]
18931883
pub const fn overflowing_neg(self) -> (Self, bool) {
18941884
if unlikely!(self == Self::MIN) {
18951885
(Self::MIN, true)
@@ -2182,7 +2172,6 @@ $EndFeature, "
21822172
#[stable(feature = "rust1", since = "1.0.0")]
21832173
#[rustc_const_stable(feature = "const_int_methods", since = "1.32.0")]
21842174
#[allow(unused_attributes)]
2185-
#[cfg_attr(bootstrap, allow_internal_unstable(const_if_match))]
21862175
#[inline]
21872176
#[rustc_inherit_overflow_checks]
21882177
pub const fn abs(self) -> Self {

src/libcore/ops/function.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ pub trait FnMut<Args>: FnOnce<Args> {
224224
#[must_use = "closures are lazy and do nothing unless called"]
225225
pub trait FnOnce<Args> {
226226
/// The returned type after the call operator is used.
227-
#[cfg_attr(not(bootstrap), lang = "fn_once_output")]
227+
#[lang = "fn_once_output"]
228228
#[stable(feature = "fn_once_output", since = "1.12.0")]
229229
type Output;
230230

0 commit comments

Comments
 (0)