mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update the bootstrap compiler

Browse Source 
Note this does not change `core::derive` since it was merged after the
beta bump.
This commit is contained in:
Joshua Nelson 2021-02-13 18:05:07 -05:00 committed by Mark Rousskov
parent 83b30a639d
commit 3733275854
17 changed files with 48 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
compiler/rustc_arena/src/lib.rs
View File

@ -14,7 +14,6 @@
#![feature(dropck_eyepatch)] #![feature(dropck_eyepatch)]
#![feature(new_uninit)] #![feature(new_uninit)]
#![feature(maybe_uninit_slice)] #![feature(maybe_uninit_slice)]
#![cfg_attr(bootstrap, feature(min_const_generics))]
#![feature(min_specialization)] #![feature(min_specialization)]
#![cfg_attr(test, feature(test))] #![cfg_attr(test, feature(test))]

1
compiler/rustc_data_structures/src/lib.rs
View File

@ -26,7 +26,6 @@
#![feature(thread_id_value)] #![feature(thread_id_value)]
#![feature(extend_one)] #![feature(extend_one)]
#![feature(const_panic)] #![feature(const_panic)]
#![cfg_attr(bootstrap, feature(min_const_generics))]
#![feature(new_uninit)] #![feature(new_uninit)]
#![feature(once_cell)] #![feature(once_cell)]
#![feature(maybe_uninit_uninit_array)] #![feature(maybe_uninit_uninit_array)]

1
compiler/rustc_serialize/src/lib.rs
View File

@ -13,7 +13,6 @@
#![feature(never_type)] #![feature(never_type)]
#![feature(nll)] #![feature(nll)]
#![feature(associated_type_bounds)] #![feature(associated_type_bounds)]
#![cfg_attr(bootstrap, feature(min_const_generics))]
#![feature(min_specialization)] #![feature(min_specialization)]
#![feature(vec_spare_capacity)] #![feature(vec_spare_capacity)]
#![feature(core_intrinsics)] #![feature(core_intrinsics)]

1
library/alloc/src/lib.rs
View File

@ -118,7 +118,6 @@
#![feature(range_bounds_assert_len)] #![feature(range_bounds_assert_len)]
#![feature(rustc_attrs)] #![feature(rustc_attrs)]
#![feature(receiver_trait)] #![feature(receiver_trait)]
#![cfg_attr(bootstrap, feature(min_const_generics))]
#![feature(min_specialization)] #![feature(min_specialization)]
#![feature(set_ptr_value)] #![feature(set_ptr_value)]
#![feature(slice_ptr_get)] #![feature(slice_ptr_get)]

4
library/alloc/src/task.rs
View File

@ -85,8 +85,6 @@ fn wake_by_ref(self: &Arc<Self>) {
} }
} }
#[cfg_attr(bootstrap, allow(rustc::ineffective_unstable_trait_impl))]
#[cfg_attr(not(bootstrap), allow(ineffective_unstable_trait_impl))]
#[stable(feature = "wake_trait", since = "1.51.0")] #[stable(feature = "wake_trait", since = "1.51.0")]
impl<W: Wake + Send + Sync + 'static> From<Arc<W>> for Waker { impl<W: Wake + Send + Sync + 'static> From<Arc<W>> for Waker {
fn from(waker: Arc<W>) -> Waker { fn from(waker: Arc<W>) -> Waker {
@ -96,8 +94,6 @@ fn from(waker: Arc<W>) -> Waker {
} }
} }
#[cfg_attr(bootstrap, allow(rustc::ineffective_unstable_trait_impl))]
#[cfg_attr(not(bootstrap), allow(ineffective_unstable_trait_impl))]
#[stable(feature = "wake_trait", since = "1.51.0")] #[stable(feature = "wake_trait", since = "1.51.0")]
impl<W: Wake + Send + Sync + 'static> From<Arc<W>> for RawWaker { impl<W: Wake + Send + Sync + 'static> From<Arc<W>> for RawWaker {
fn from(waker: Arc<W>) -> RawWaker { fn from(waker: Arc<W>) -> RawWaker {

2
library/alloc/tests/slice.rs
View File

@ -1798,7 +1798,7 @@ macro_rules! n {
macro_rules! c { macro_rules! c {
($inp:expr, $typ:ty, $out:expr $(,)?) => { ($inp:expr, $typ:ty, $out:expr $(,)?) => {
assert_eq!($out, identity::<$typ>($inp)); assert_eq!($out, identity::<$typ>($inp))
}; };
} }

1
library/core/src/lib.rs
View File

@ -128,7 +128,6 @@
#![feature(repr_simd, platform_intrinsics)] #![feature(repr_simd, platform_intrinsics)]
#![feature(rustc_attrs)] #![feature(rustc_attrs)]
#![feature(simd_ffi)] #![feature(simd_ffi)]
#![cfg_attr(bootstrap, feature(min_const_generics))]
#![feature(min_specialization)] #![feature(min_specialization)]
#![feature(staged_api)] #![feature(staged_api)]
#![feature(std_internals)] #![feature(std_internals)]

22
library/core/src/macros/mod.rs
View File

@ -1,25 +1,3 @@
#[cfg(bootstrap)]
#[doc(include = "panic.md")]
#[macro_export]
#[allow_internal_unstable(core_panic)]
#[stable(feature = "core", since = "1.6.0")]
#[rustc_diagnostic_item = "core_panic_macro"]
macro_rules! panic {
() => (
$crate::panic!("explicit panic")
);
($msg:literal $(,)?) => (
$crate::panicking::panic($msg)
);
($msg:expr $(,)?) => (
$crate::panicking::panic_str($msg)
);
($fmt:expr, $($arg:tt)+) => (
$crate::panicking::panic_fmt($crate::format_args!($fmt, $($arg)+))
);
}
#[cfg(not(bootstrap))]
#[doc(include = "panic.md")] #[doc(include = "panic.md")]
#[macro_export] #[macro_export]
#[rustc_builtin_macro = "core_panic"] #[rustc_builtin_macro = "core_panic"]

8
library/core/src/mem/mod.rs
View File

@ -4,7 +4,6 @@
//! types, initializing and manipulating memory. //! types, initializing and manipulating memory.
#![stable(feature = "rust1", since = "1.0.0")] #![stable(feature = "rust1", since = "1.0.0")]
#![cfg_attr(bootstrap, allow(unused_unsafe))]
use crate::clone; use crate::clone;
use crate::cmp; use crate::cmp;
@ -152,13 +151,6 @@ pub const fn forget<T>(t: T) {
#[inline] #[inline]
#[unstable(feature = "forget_unsized", issue = "none")] #[unstable(feature = "forget_unsized", issue = "none")]
pub fn forget_unsized<T: ?Sized>(t: T) { pub fn forget_unsized<T: ?Sized>(t: T) {
#[cfg(bootstrap)]
// SAFETY: the forget intrinsic could be safe, but there's no point in making it safe since
// we'll be implementing this function soon via `ManuallyDrop`
unsafe {
intrinsics::forget(t)
}
#[cfg(not(bootstrap))]
intrinsics::forget(t) intrinsics::forget(t)
} }

3
library/core/tests/lib.rs
View File

@ -94,10 +94,7 @@
mod char; mod char;
mod clone; mod clone;
mod cmp; mod cmp;
#[cfg(not(bootstrap))]
mod const_ptr; mod const_ptr;
mod fmt; mod fmt;
mod hash; mod hash;
mod intrinsics; mod intrinsics;

1
library/core/tests/mem.rs
View File

@ -284,7 +284,6 @@ fn drop(&mut self) {
} }
#[test] #[test]
#[cfg(not(bootstrap))]
fn uninit_const_assume_init_read() { fn uninit_const_assume_init_read() {
const FOO: u32 = unsafe { MaybeUninit::new(42).assume_init_read() }; const FOO: u32 = unsafe { MaybeUninit::new(42).assume_init_read() };
assert_eq!(FOO, 42); assert_eq!(FOO, 42);

4
library/std/src/lib.rs
View File

@ -185,8 +185,8 @@
//! [other]: #what-is-in-the-standard-library-documentation //! [other]: #what-is-in-the-standard-library-documentation
//! [primitive types]: ../book/ch03-02-data-types.html //! [primitive types]: ../book/ch03-02-data-types.html
//! [rust-discord]: https://discord.gg/rust-lang //! [rust-discord]: https://discord.gg/rust-lang
#![cfg_attr(not(bootstrap), doc = "[array]: prim@array")] //! [array]: prim@array
#![cfg_attr(not(bootstrap), doc = "[slice]: prim@slice")] //! [slice]: prim@slice
#![cfg_attr(not(feature = "restricted-std"), stable(feature = "rust1", since = "1.0.0"))] #![cfg_attr(not(feature = "restricted-std"), stable(feature = "rust1", since = "1.0.0"))]
#![cfg_attr(feature = "restricted-std", unstable(feature = "restricted_std", issue = "none"))] #![cfg_attr(feature = "restricted-std", unstable(feature = "restricted_std", issue = "none"))]
#![doc( #![doc(

15
library/std/src/macros.rs
View File

@ -4,21 +4,6 @@
//! library. Each macro is available for use when linking against the standard //! library. Each macro is available for use when linking against the standard
//! library. //! library.
#[cfg(bootstrap)]
#[doc(include = "../../core/src/macros/panic.md")]
#[macro_export]
#[stable(feature = "rust1", since = "1.0.0")]
#[allow_internal_unstable(libstd_sys_internals)]
#[cfg_attr(not(test), rustc_diagnostic_item = "std_panic_macro")]
macro_rules! panic {
() => ({ $crate::panic!("explicit panic") });
($msg:expr $(,)?) => ({ $crate::rt::begin_panic($msg) });
($fmt:expr, $($arg:tt)+) => ({
$crate::rt::begin_panic_fmt(&$crate::format_args!($fmt, $($arg)+))
});
}
#[cfg(not(bootstrap))]
#[doc(include = "../../core/src/macros/panic.md")] #[doc(include = "../../core/src/macros/panic.md")]
#[macro_export] #[macro_export]
#[rustc_builtin_macro = "std_panic"] #[rustc_builtin_macro = "std_panic"]

3
src/bootstrap/bootstrap.py
View File

@ -877,8 +877,7 @@ class RustBuild(object):
target_linker = self.get_toml("linker", build_section) target_linker = self.get_toml("linker", build_section)
if target_linker is not None: if target_linker is not None:
env["RUSTFLAGS"] += " -C linker=" + target_linker env["RUSTFLAGS"] += " -C linker=" + target_linker
# cfg(bootstrap): Add `-Wsemicolon_in_expressions_from_macros` after the next beta bump env["RUSTFLAGS"] += " -Wrust_2018_idioms -Wunused_lifetimes -Wsemicolon_in_expressions_from_macros"
env["RUSTFLAGS"] += " -Wrust_2018_idioms -Wunused_lifetimes"
if self.get_toml("deny-warnings", "rust") != "false": if self.get_toml("deny-warnings", "rust") != "false":
env["RUSTFLAGS"] += " -Dwarnings" env["RUSTFLAGS"] += " -Dwarnings"

7
src/bootstrap/builder.rs
View File

@ -1279,12 +1279,7 @@ pub fn cargo(
// some code doesn't go through this `rustc` wrapper. // some code doesn't go through this `rustc` wrapper.
lint_flags.push("-Wrust_2018_idioms"); lint_flags.push("-Wrust_2018_idioms");
lint_flags.push("-Wunused_lifetimes"); lint_flags.push("-Wunused_lifetimes");
// cfg(bootstrap): unconditionally enable this warning after the next beta bump lint_flags.push("-Wsemicolon_in_expressions_from_macros");
// This is currently disabled for the stage1 libstd, since build scripts
// will end up using the bootstrap compiler (which doesn't yet support this lint)
if compiler.stage != 0 && mode != Mode::Std {
lint_flags.push("-Wsemicolon_in_expressions_from_macros");
}
if self.config.deny_warnings { if self.config.deny_warnings {
lint_flags.push("-Dwarnings"); lint_flags.push("-Dwarnings");

2
src/stage0.txt
View File

@ -12,7 +12,7 @@
# stable release's version number. `date` is the date where the release we're # stable release's version number. `date` is the date where the release we're
# bootstrapping off was released. # bootstrapping off was released.
date: 2020-12-30 date: 2021-02-14
rustc: beta rustc: beta
# We use a nightly rustfmt to format the source because it solves some # We use a nightly rustfmt to format the source because it solves some

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

@ -69,47 +69,47 @@ For revisions in Pull Requests (PR):
</style> </style>
</head> </head>
<body> <body>
<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] <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]
111:23-113:6: @0[6]: _7 = &amp;(*_15) 96:23-98:6: @0[6]: _7 = &amp;(*_15)
111:23-113:6: @0[7]: _6 = &amp;(*_7) 96:23-98:6: @0[7]: _6 = &amp;(*_7)
111:23-113:6: @0[8]: _5 = move _6 as &amp;[&amp;str] (Pointer(Unsize)) 96:23-98:6: @0[8]: _5 = move _6 as &amp;[&amp;str] (Pointer(Unsize))
112:28-112:61: @0[14]: _13 = () 97:28-97:61: @0[14]: _13 = ()
112:28-112:61: @0[15]: FakeRead(ForMatchedPlace, _13) 97:28-97:61: @0[15]: FakeRead(ForMatchedPlace, _13)
112:28-112:61: @0[16]: _14 = const main::{closure#5}::promoted[0] 97:28-97:61: @0[16]: _14 = const main::{closure#5}::promoted[0]
112:28-112:61: @0[17]: _11 = &amp;(*_14) 97:28-97:61: @0[17]: _11 = &amp;(*_14)
112:28-112:61: @0[18]: _10 = &amp;(*_11) 97:28-97:61: @0[18]: _10 = &amp;(*_11)
112:28-112:61: @0[19]: _9 = move _10 as &amp;[std::fmt::ArgumentV1] (Pointer(Unsize)) 97:28-97:61: @0[19]: _9 = move _10 as &amp;[std::fmt::ArgumentV1] (Pointer(Unsize))
112:28-112:61: @0.Call: _4 = std::fmt::Arguments::new_v1(move _5, move _9) -&gt; [return: bb1, unwind: bb3] 97:28-97:61: @0.Call: _4 = std::fmt::Arguments::new_v1(move _5, move _9) -&gt; [return: bb1, unwind: bb3]
112:9-112:62: @1.Call: _3 = std::io::_print(move _4) -&gt; [return: bb2, unwind: bb3] 97:9-97:62: @1.Call: _3 = std::io::_print(move _4) -&gt; [return: bb2, unwind: bb3]
111:23-113:6: @2[5]: _0 = const () 96:23-98:6: @2[5]: _0 = const ()
111:23-113:6: @2.Return: return"><span class="annotation">@0,1,2⦊</span>{</span></span> 96:23-98:6: @2.Return: return"><span class="annotation">@0,1,2⦊</span>{</span></span>
<span class="line"><span class="code even" style="--layer: 1" title="111:23-113:6: @0[5]: _15 = const main::{closure#5}::promoted[1] <span class="line"><span class="code even" style="--layer: 1" title="96:23-98:6: @0[5]: _15 = const main::{closure#5}::promoted[1]
111:23-113:6: @0[6]: _7 = &amp;(*_15) 96:23-98:6: @0[6]: _7 = &amp;(*_15)
111:23-113:6: @0[7]: _6 = &amp;(*_7) 96:23-98:6: @0[7]: _6 = &amp;(*_7)
111:23-113:6: @0[8]: _5 = move _6 as &amp;[&amp;str] (Pointer(Unsize)) 96:23-98:6: @0[8]: _5 = move _6 as &amp;[&amp;str] (Pointer(Unsize))
112:28-112:61: @0[14]: _13 = () 97:28-97:61: @0[14]: _13 = ()
112:28-112:61: @0[15]: FakeRead(ForMatchedPlace, _13) 97:28-97:61: @0[15]: FakeRead(ForMatchedPlace, _13)
112:28-112:61: @0[16]: _14 = const main::{closure#5}::promoted[0] 97:28-97:61: @0[16]: _14 = const main::{closure#5}::promoted[0]
112:28-112:61: @0[17]: _11 = &amp;(*_14) 97:28-97:61: @0[17]: _11 = &amp;(*_14)
112:28-112:61: @0[18]: _10 = &amp;(*_11) 97:28-97:61: @0[18]: _10 = &amp;(*_11)
112:28-112:61: @0[19]: _9 = move _10 as &amp;[std::fmt::ArgumentV1] (Pointer(Unsize)) 97:28-97:61: @0[19]: _9 = move _10 as &amp;[std::fmt::ArgumentV1] (Pointer(Unsize))
112:28-112:61: @0.Call: _4 = std::fmt::Arguments::new_v1(move _5, move _9) -&gt; [return: bb1, unwind: bb3] 97:28-97:61: @0.Call: _4 = std::fmt::Arguments::new_v1(move _5, move _9) -&gt; [return: bb1, unwind: bb3]
112:9-112:62: @1.Call: _3 = std::io::_print(move _4) -&gt; [return: bb2, unwind: bb3] 97:9-97:62: @1.Call: _3 = std::io::_print(move _4) -&gt; [return: bb2, unwind: bb3]
111:23-113:6: @2[5]: _0 = const () 96:23-98:6: @2[5]: _0 = const ()
111:23-113:6: @2.Return: return"> $crate::io::_print($crate::format_args_nl!($($arg)*));</span></span> 96:23-98:6: @2.Return: return"> $crate::io::_print($crate::format_args_nl!($($arg)*));</span></span>
<span class="line"><span class="code even" style="--layer: 1" title="111:23-113:6: @0[5]: _15 = const main::{closure#5}::promoted[1] <span class="line"><span class="code even" style="--layer: 1" title="96:23-98:6: @0[5]: _15 = const main::{closure#5}::promoted[1]
111:23-113:6: @0[6]: _7 = &amp;(*_15) 96:23-98:6: @0[6]: _7 = &amp;(*_15)
111:23-113:6: @0[7]: _6 = &amp;(*_7) 96:23-98:6: @0[7]: _6 = &amp;(*_7)
111:23-113:6: @0[8]: _5 = move _6 as &amp;[&amp;str] (Pointer(Unsize)) 96:23-98:6: @0[8]: _5 = move _6 as &amp;[&amp;str] (Pointer(Unsize))
112:28-112:61: @0[14]: _13 = () 97:28-97:61: @0[14]: _13 = ()
112:28-112:61: @0[15]: FakeRead(ForMatchedPlace, _13) 97:28-97:61: @0[15]: FakeRead(ForMatchedPlace, _13)
112:28-112:61: @0[16]: _14 = const main::{closure#5}::promoted[0] 97:28-97:61: @0[16]: _14 = const main::{closure#5}::promoted[0]
112:28-112:61: @0[17]: _11 = &amp;(*_14) 97:28-97:61: @0[17]: _11 = &amp;(*_14)
112:28-112:61: @0[18]: _10 = &amp;(*_11) 97:28-97:61: @0[18]: _10 = &amp;(*_11)
112:28-112:61: @0[19]: _9 = move _10 as &amp;[std::fmt::ArgumentV1] (Pointer(Unsize)) 97:28-97:61: @0[19]: _9 = move _10 as &amp;[std::fmt::ArgumentV1] (Pointer(Unsize))
112:28-112:61: @0.Call: _4 = std::fmt::Arguments::new_v1(move _5, move _9) -&gt; [return: bb1, unwind: bb3] 97:28-97:61: @0.Call: _4 = std::fmt::Arguments::new_v1(move _5, move _9) -&gt; [return: bb1, unwind: bb3]
112:9-112:62: @1.Call: _3 = std::io::_print(move _4) -&gt; [return: bb2, unwind: bb3] 97:9-97:62: @1.Call: _3 = std::io::_print(move _4) -&gt; [return: bb2, unwind: bb3]
111:23-113:6: @2[5]: _0 = const () 96:23-98:6: @2[5]: _0 = const ()
111:23-113:6: @2.Return: return"> }<span class="annotation">⦉@0,1,2</span></span></span></span></div> 96:23-98:6: @2.Return: return"> }<span class="annotation">⦉@0,1,2</span></span></span></span></div>
</body> </body>
</html> </html>