Skip to content

Commit cd64446

Browse files
borsbors
committed
Auto merge of rust-lang#82076 - jyn514:update-bootstrap, r=Mark-Simulacrum
Update the bootstrap compiler This updates the bootstrap compiler, notably leaving out a change to enable semicolon in macro expressions lint, because stdarch still depends on the old behavior.
2 parents a4e595d + b1a4bca commit cd64446

File tree

16 files changed

+49
-115
lines changed

16 files changed

+49
-115
lines changed

‎compiler/rustc_arena/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#![feature(dropck_eyepatch)]
1515
#![feature(new_uninit)]
1616
#![feature(maybe_uninit_slice)]
17-
#![cfg_attr(bootstrap, feature(min_const_generics))]
1817
#![feature(min_specialization)]
1918
#![cfg_attr(test, feature(test))]
2019

‎compiler/rustc_data_structures/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#![feature(thread_id_value)]
2727
#![feature(extend_one)]
2828
#![feature(const_panic)]
29-
#![cfg_attr(bootstrap, feature(min_const_generics))]
3029
#![feature(new_uninit)]
3130
#![feature(once_cell)]
3231
#![feature(maybe_uninit_uninit_array)]

‎compiler/rustc_serialize/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ Core encoding and decoding interfaces.
1313
#![feature(never_type)]
1414
#![feature(nll)]
1515
#![feature(associated_type_bounds)]
16-
#![cfg_attr(bootstrap, feature(min_const_generics))]
1716
#![feature(min_specialization)]
1817
#![feature(vec_spare_capacity)]
1918
#![feature(core_intrinsics)]

‎library/alloc/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@
117117
#![feature(ptr_internals)]
118118
#![feature(rustc_attrs)]
119119
#![feature(receiver_trait)]
120-
#![cfg_attr(bootstrap, feature(min_const_generics))]
121120
#![feature(min_specialization)]
122121
#![feature(set_ptr_value)]
123122
#![feature(slice_ptr_get)]

‎library/alloc/src/task.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,6 @@ pub trait Wake {
8585
}
8686
}
8787

88-
#[cfg_attr(bootstrap, allow(rustc::ineffective_unstable_trait_impl))]
89-
#[cfg_attr(not(bootstrap), allow(ineffective_unstable_trait_impl))]
9088
#[stable(feature = "wake_trait", since = "1.51.0")]
9189
impl<W: Wake + Send + Sync + 'static> From<Arc<W>> for Waker {
9290
fn from(waker: Arc<W>) -> Waker {
@@ -96,8 +94,6 @@ impl<W: Wake + Send + Sync + 'static> From<Arc<W>> for Waker {
9694
}
9795
}
9896

99-
#[cfg_attr(bootstrap, allow(rustc::ineffective_unstable_trait_impl))]
100-
#[cfg_attr(not(bootstrap), allow(ineffective_unstable_trait_impl))]
10197
#[stable(feature = "wake_trait", since = "1.51.0")]
10298
impl<W: Wake + Send + Sync + 'static> From<Arc<W>> for RawWaker {
10399
fn from(waker: Arc<W>) -> RawWaker {

‎library/alloc/tests/slice.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1798,7 +1798,7 @@ fn subslice_patterns() {
17981798

17991799
macro_rules! c {
18001800
($inp:expr, $typ:ty, $out:expr $(,)?) => {
1801-
assert_eq!($out, identity::<$typ>($inp));
1801+
assert_eq!($out, identity::<$typ>($inp))
18021802
};
18031803
}
18041804

‎library/core/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@
128128
#![feature(repr_simd, platform_intrinsics)]
129129
#![feature(rustc_attrs)]
130130
#![feature(simd_ffi)]
131-
#![cfg_attr(bootstrap, feature(min_const_generics))]
132131
#![feature(min_specialization)]
133132
#![feature(staged_api)]
134133
#![feature(std_internals)]

‎library/core/src/macros/mod.rs

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,3 @@
1-
#[cfg(bootstrap)]
2-
#[doc(include = "panic.md")]
3-
#[macro_export]
4-
#[allow_internal_unstable(core_panic)]
5-
#[stable(feature = "core", since = "1.6.0")]
6-
#[rustc_diagnostic_item = "core_panic_macro"]
7-
macro_rules! panic {
8-
() => (
9-
$crate::panic!("explicit panic")
10-
);
11-
($msg:literal $(,)?) => (
12-
$crate::panicking::panic($msg)
13-
);
14-
($msg:expr $(,)?) => (
15-
$crate::panicking::panic_str($msg)
16-
);
17-
($fmt:expr, $($arg:tt)+) => (
18-
$crate::panicking::panic_fmt($crate::format_args!($fmt, $($arg)+))
19-
);
20-
}
21-
22-
#[cfg(not(bootstrap))]
231
#[doc(include = "panic.md")]
242
#[macro_export]
253
#[rustc_builtin_macro = "core_panic"]

‎library/core/src/mem/mod.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
//! types, initializing and manipulating memory.
55
66
#![stable(feature = "rust1", since = "1.0.0")]
7-
#![cfg_attr(bootstrap, allow(unused_unsafe))]
87

98
use crate::clone;
109
use crate::cmp;
@@ -152,13 +151,6 @@ pub const fn forget<T>(t: T) {
152151
#[inline]
153152
#[unstable(feature = "forget_unsized", issue = "none")]
154153
pub fn forget_unsized<T: ?Sized>(t: T) {
155-
#[cfg(bootstrap)]
156-
// SAFETY: the forget intrinsic could be safe, but there's no point in making it safe since
157-
// we'll be implementing this function soon via `ManuallyDrop`
158-
unsafe {
159-
intrinsics::forget(t)
160-
}
161-
#[cfg(not(bootstrap))]
162154
intrinsics::forget(t)
163155
}
164156

‎library/core/tests/lib.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,7 @@ mod cell;
9494
mod char;
9595
mod clone;
9696
mod cmp;
97-
98-
#[cfg(not(bootstrap))]
9997
mod const_ptr;
100-
10198
mod fmt;
10299
mod hash;
103100
mod intrinsics;

‎library/core/tests/mem.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,6 @@ fn uninit_write_slice_cloned_no_drop() {
284284
}
285285

286286
#[test]
287-
#[cfg(not(bootstrap))]
288287
fn uninit_const_assume_init_read() {
289288
const FOO: u32 = unsafe { MaybeUninit::new(42).assume_init_read() };
290289
assert_eq!(FOO, 42);

‎library/std/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,8 @@
185185
//! [other]: #what-is-in-the-standard-library-documentation
186186
//! [primitive types]: ../book/ch03-02-data-types.html
187187
//! [rust-discord]: https://discord.gg/rust-lang
188-
#![cfg_attr(not(bootstrap), doc = "[array]: prim@array")]
189-
#![cfg_attr(not(bootstrap), doc = "[slice]: prim@slice")]
188+
//! [array]: prim@array
189+
//! [slice]: prim@slice
190190
#![cfg_attr(not(feature = "restricted-std"), stable(feature = "rust1", since = "1.0.0"))]
191191
#![cfg_attr(feature = "restricted-std", unstable(feature = "restricted_std", issue = "none"))]
192192
#![doc(

‎library/std/src/macros.rs

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,6 @@
44
//! library. Each macro is available for use when linking against the standard
55
//! library.
66
7-
#[cfg(bootstrap)]
8-
#[doc(include = "../../core/src/macros/panic.md")]
9-
#[macro_export]
10-
#[stable(feature = "rust1", since = "1.0.0")]
11-
#[allow_internal_unstable(libstd_sys_internals)]
12-
#[cfg_attr(not(test), rustc_diagnostic_item = "std_panic_macro")]
13-
macro_rules! panic {
14-
() => ({ $crate::panic!("explicit panic") });
15-
($msg:expr $(,)?) => ({ $crate::rt::begin_panic($msg) });
16-
($fmt:expr, $($arg:tt)+) => ({
17-
$crate::rt::begin_panic_fmt(&$crate::format_args!($fmt, $($arg)+))
18-
});
19-
}
20-
21-
#[cfg(not(bootstrap))]
227
#[doc(include = "../../core/src/macros/panic.md")]
238
#[macro_export]
249
#[rustc_builtin_macro = "std_panic"]

‎src/bootstrap/builder.rs

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1161,18 +1161,10 @@ impl<'a> Builder<'a> {
11611161
// itself, we skip it by default since we know it's safe to do so in that case.
11621162
// See https://github.com/rust-lang/rust/issues/79361 for more info on this flag.
11631163
if target.contains("apple") {
1164-
if stage == 0 {
1165-
if self.config.rust_run_dsymutil {
1166-
rustflags.arg("-Zrun-dsymutil=yes");
1167-
} else {
1168-
rustflags.arg("-Zrun-dsymutil=no");
1169-
}
1164+
if self.config.rust_run_dsymutil {
1165+
rustflags.arg("-Csplit-debuginfo=packed");
11701166
} else {
1171-
if self.config.rust_run_dsymutil {
1172-
rustflags.arg("-Csplit-debuginfo=packed");
1173-
} else {
1174-
rustflags.arg("-Csplit-debuginfo=unpacked");
1175-
}
1167+
rustflags.arg("-Csplit-debuginfo=unpacked");
11761168
}
11771169
}
11781170

‎src/stage0.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# stable release's version number. `date` is the date where the release we're
1313
# bootstrapping off was released.
1414

15-
date: 2020-12-30
15+
date: 2021-02-14
1616
rustc: beta
1717

1818
# We use a nightly rustfmt to format the source because it solves some

‎src/test/run-make-fulldeps/coverage-spanview/expected_mir_dump.closure/closure.main-{closure#5}.-------.InstrumentCoverage.0.html

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -69,47 +69,47 @@
6969
</style>
7070
</head>
7171
<body>
72-
<div class="code" style="counter-reset: line 110"><span class="line"> <span><span class="code even" style="--layer: 1" title="111:23-113:6: @0[5]: _15 = const main::{closure#5}::promoted[1]
73-
111:23-113:6: @0[6]: _7 = &amp;(*_15)
74-
111:23-113:6: @0[7]: _6 = &amp;(*_7)
75-
111:23-113:6: @0[8]: _5 = move _6 as &amp;[&amp;str] (Pointer(Unsize))
76-
112:28-112:61: @0[14]: _13 = ()
77-
112:28-112:61: @0[15]: FakeRead(ForMatchedPlace, _13)
78-
112:28-112:61: @0[16]: _14 = const main::{closure#5}::promoted[0]
79-
112:28-112:61: @0[17]: _11 = &amp;(*_14)
80-
112:28-112:61: @0[18]: _10 = &amp;(*_11)
81-
112:28-112:61: @0[19]: _9 = move _10 as &amp;[std::fmt::ArgumentV1] (Pointer(Unsize))
82-
112:28-112:61: @0.Call: _4 = std::fmt::Arguments::new_v1(move _5, move _9) -&gt; [return: bb1, unwind: bb3]
83-
112:9-112:62: @1.Call: _3 = std::io::_print(move _4) -&gt; [return: bb2, unwind: bb3]
84-
111:23-113:6: @2[5]: _0 = const ()
85-
111:23-113:6: @2.Return: return"><span class="annotation">@0,1,2⦊</span>{</span></span>
86-
<span class="line"><span class="code even" style="--layer: 1" title="111:23-113:6: @0[5]: _15 = const main::{closure#5}::promoted[1]
87-
111:23-113:6: @0[6]: _7 = &amp;(*_15)
88-
111:23-113:6: @0[7]: _6 = &amp;(*_7)
89-
111:23-113:6: @0[8]: _5 = move _6 as &amp;[&amp;str] (Pointer(Unsize))
90-
112:28-112:61: @0[14]: _13 = ()
91-
112:28-112:61: @0[15]: FakeRead(ForMatchedPlace, _13)
92-
112:28-112:61: @0[16]: _14 = const main::{closure#5}::promoted[0]
93-
112:28-112:61: @0[17]: _11 = &amp;(*_14)
94-
112:28-112:61: @0[18]: _10 = &amp;(*_11)
95-
112:28-112:61: @0[19]: _9 = move _10 as &amp;[std::fmt::ArgumentV1] (Pointer(Unsize))
96-
112:28-112:61: @0.Call: _4 = std::fmt::Arguments::new_v1(move _5, move _9) -&gt; [return: bb1, unwind: bb3]
97-
112:9-112:62: @1.Call: _3 = std::io::_print(move _4) -&gt; [return: bb2, unwind: bb3]
98-
111:23-113:6: @2[5]: _0 = const ()
99-
111:23-113:6: @2.Return: return"> $crate::io::_print($crate::format_args_nl!($($arg)*));</span></span>
100-
<span class="line"><span class="code even" style="--layer: 1" title="111:23-113:6: @0[5]: _15 = const main::{closure#5}::promoted[1]
101-
111:23-113:6: @0[6]: _7 = &amp;(*_15)
102-
111:23-113:6: @0[7]: _6 = &amp;(*_7)
103-
111:23-113:6: @0[8]: _5 = move _6 as &amp;[&amp;str] (Pointer(Unsize))
104-
112:28-112:61: @0[14]: _13 = ()
105-
112:28-112:61: @0[15]: FakeRead(ForMatchedPlace, _13)
106-
112:28-112:61: @0[16]: _14 = const main::{closure#5}::promoted[0]
107-
112:28-112:61: @0[17]: _11 = &amp;(*_14)
108-
112:28-112:61: @0[18]: _10 = &amp;(*_11)
109-
112:28-112:61: @0[19]: _9 = move _10 as &amp;[std::fmt::ArgumentV1] (Pointer(Unsize))
110-
112:28-112:61: @0.Call: _4 = std::fmt::Arguments::new_v1(move _5, move _9) -&gt; [return: bb1, unwind: bb3]
111-
112:9-112:62: @1.Call: _3 = std::io::_print(move _4) -&gt; [return: bb2, unwind: bb3]
112-
111:23-113:6: @2[5]: _0 = const ()
113-
111:23-113:6: @2.Return: return"> }<span class="annotation">⦉@0,1,2</span></span></span></span></div>
72+
<div class="code" style="counter-reset: line 95"><span class="line"> <span><span class="code even" style="--layer: 1" title="96:23-98:6: @0[5]: _15 = const main::{closure#5}::promoted[1]
73+
96:23-98:6: @0[6]: _7 = &amp;(*_15)
74+
96:23-98:6: @0[7]: _6 = &amp;(*_7)
75+
96:23-98:6: @0[8]: _5 = move _6 as &amp;[&amp;str] (Pointer(Unsize))
76+
97:28-97:61: @0[14]: _13 = ()
77+
97:28-97:61: @0[15]: FakeRead(ForMatchedPlace, _13)
78+
97:28-97:61: @0[16]: _14 = const main::{closure#5}::promoted[0]
79+
97:28-97:61: @0[17]: _11 = &amp;(*_14)
80+
97:28-97:61: @0[18]: _10 = &amp;(*_11)
81+
97:28-97:61: @0[19]: _9 = move _10 as &amp;[std::fmt::ArgumentV1] (Pointer(Unsize))
82+
97:28-97:61: @0.Call: _4 = std::fmt::Arguments::new_v1(move _5, move _9) -&gt; [return: bb1, unwind: bb3]
83+
97:9-97:62: @1.Call: _3 = std::io::_print(move _4) -&gt; [return: bb2, unwind: bb3]
84+
96:23-98:6: @2[5]: _0 = const ()
85+
96:23-98:6: @2.Return: return"><span class="annotation">@0,1,2⦊</span>{</span></span>
86+
<span class="line"><span class="code even" style="--layer: 1" title="96:23-98:6: @0[5]: _15 = const main::{closure#5}::promoted[1]
87+
96:23-98:6: @0[6]: _7 = &amp;(*_15)
88+
96:23-98:6: @0[7]: _6 = &amp;(*_7)
89+
96:23-98:6: @0[8]: _5 = move _6 as &amp;[&amp;str] (Pointer(Unsize))
90+
97:28-97:61: @0[14]: _13 = ()
91+
97:28-97:61: @0[15]: FakeRead(ForMatchedPlace, _13)
92+
97:28-97:61: @0[16]: _14 = const main::{closure#5}::promoted[0]
93+
97:28-97:61: @0[17]: _11 = &amp;(*_14)
94+
97:28-97:61: @0[18]: _10 = &amp;(*_11)
95+
97:28-97:61: @0[19]: _9 = move _10 as &amp;[std::fmt::ArgumentV1] (Pointer(Unsize))
96+
97:28-97:61: @0.Call: _4 = std::fmt::Arguments::new_v1(move _5, move _9) -&gt; [return: bb1, unwind: bb3]
97+
97:9-97:62: @1.Call: _3 = std::io::_print(move _4) -&gt; [return: bb2, unwind: bb3]
98+
96:23-98:6: @2[5]: _0 = const ()
99+
96:23-98:6: @2.Return: return"> $crate::io::_print($crate::format_args_nl!($($arg)*));</span></span>
100+
<span class="line"><span class="code even" style="--layer: 1" title="96:23-98:6: @0[5]: _15 = const main::{closure#5}::promoted[1]
101+
96:23-98:6: @0[6]: _7 = &amp;(*_15)
102+
96:23-98:6: @0[7]: _6 = &amp;(*_7)
103+
96:23-98:6: @0[8]: _5 = move _6 as &amp;[&amp;str] (Pointer(Unsize))
104+
97:28-97:61: @0[14]: _13 = ()
105+
97:28-97:61: @0[15]: FakeRead(ForMatchedPlace, _13)
106+
97:28-97:61: @0[16]: _14 = const main::{closure#5}::promoted[0]
107+
97:28-97:61: @0[17]: _11 = &amp;(*_14)
108+
97:28-97:61: @0[18]: _10 = &amp;(*_11)
109+
97:28-97:61: @0[19]: _9 = move _10 as &amp;[std::fmt::ArgumentV1] (Pointer(Unsize))
110+
97:28-97:61: @0.Call: _4 = std::fmt::Arguments::new_v1(move _5, move _9) -&gt; [return: bb1, unwind: bb3]
111+
97:9-97:62: @1.Call: _3 = std::io::_print(move _4) -&gt; [return: bb2, unwind: bb3]
112+
96:23-98:6: @2[5]: _0 = const ()
113+
96:23-98:6: @2.Return: return"> }<span class="annotation">⦉@0,1,2</span></span></span></span></div>
114114
</body>
115115
</html>

0 commit comments

Comments
 (0)