Skip to content

Commit be7ebdd

Browse files
committed
Bump version and stage0 compiler
1 parent 0414594 commit be7ebdd

File tree

47 files changed

+24
-283
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+24
-283
lines changed

src/Cargo.lock

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/bootstrap/bin/rustc.rs

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,6 @@ fn main() {
118118
cmd.arg("-Cprefer-dynamic");
119119
}
120120

121-
// Pass the `rustbuild` feature flag to crates which rustbuild is
122-
// building. See the comment in bootstrap/lib.rs where this env var is
123-
// set for more details.
124-
if env::var_os("RUSTBUILD_UNSTABLE").is_some() {
125-
cmd.arg("--cfg").arg("rustbuild");
126-
}
127-
128121
// Help the libc crate compile by assisting it in finding the MUSL
129122
// native libraries.
130123
if let Some(s) = env::var_os("MUSL_ROOT") {
@@ -218,11 +211,7 @@ fn main() {
218211
// do that we pass a weird flag to the compiler to get it to do
219212
// so. Note that this is definitely a hack, and we should likely
220213
// flesh out rpath support more fully in the future.
221-
//
222-
// FIXME: remove condition after next stage0
223-
if stage != "0" {
224-
cmd.arg("-Z").arg("osx-rpath-install-name");
225-
}
214+
cmd.arg("-Z").arg("osx-rpath-install-name");
226215
Some("-Wl,-rpath,@loader_path/../lib")
227216
} else if !target.contains("windows") {
228217
Some("-Wl,-rpath,$ORIGIN/../lib")
@@ -242,12 +231,8 @@ fn main() {
242231
// Force all crates compiled by this compiler to (a) be unstable and (b)
243232
// allow the `rustc_private` feature to link to other unstable crates
244233
// also in the sysroot.
245-
//
246-
// FIXME: remove condition after next stage0
247234
if env::var_os("RUSTC_FORCE_UNSTABLE").is_some() {
248-
if stage != "0" {
249-
cmd.arg("-Z").arg("force-unstable-if-unmarked");
250-
}
235+
cmd.arg("-Z").arg("force-unstable-if-unmarked");
251236
}
252237
}
253238

src/bootstrap/bootstrap.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,7 @@ def build_bootstrap(self):
385385
if self.clean and os.path.exists(build_dir):
386386
shutil.rmtree(build_dir)
387387
env = os.environ.copy()
388+
env["RUSTC_BOOTSTRAP"] = '1'
388389
env["CARGO_TARGET_DIR"] = build_dir
389390
env["RUSTC"] = self.rustc()
390391
env["LD_LIBRARY_PATH"] = os.path.join(self.bin_root(), "lib") + \

src/bootstrap/channel.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use build_helper::output;
2323
use Build;
2424

2525
// The version number
26-
pub const CFG_RELEASE_NUM: &'static str = "1.19.0";
26+
pub const CFG_RELEASE_NUM: &'static str = "1.20.0";
2727

2828
// An optional number to put after the label, e.g. '.2' -> '-beta.2'
2929
// Be sure to make this starts with a dot to conform to semver pre-release

src/bootstrap/check.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -672,6 +672,7 @@ pub fn bootstrap(build: &Build) {
672672
cmd.arg("test")
673673
.current_dir(build.src.join("src/bootstrap"))
674674
.env("CARGO_TARGET_DIR", build.out.join("bootstrap"))
675+
.env("RUSTC_BOOTSTRAP", "1")
675676
.env("RUSTC", &build.rustc);
676677
if build.flags.cmd.no_fail_fast() {
677678
cmd.arg("--no-fail-fast");

src/bootstrap/lib.rs

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -429,29 +429,6 @@ impl Build {
429429
.env("RUSTC_SNAPSHOT_LIBDIR", self.rustc_libdir(compiler));
430430
}
431431

432-
// There are two invariants we must maintain:
433-
// * stable crates cannot depend on unstable crates (general Rust rule),
434-
// * crates that end up in the sysroot must be unstable (rustbuild rule).
435-
//
436-
// In order to do enforce the latter, we pass the env var
437-
// `RUSTBUILD_UNSTABLE` down the line for any crates which will end up
438-
// in the sysroot. We read this in bootstrap/bin/rustc.rs and if it is
439-
// set, then we pass the `rustbuild` feature to rustc when building the
440-
// the crate.
441-
//
442-
// In turn, crates that can be used here should recognise the `rustbuild`
443-
// feature and opt-in to `rustc_private`.
444-
//
445-
// We can't always pass `rustbuild` because crates which are outside of
446-
// the compiler, libs, and tests are stable and we don't want to make
447-
// their deps unstable (since this would break the first invariant
448-
// above).
449-
//
450-
// FIXME: remove this after next stage0
451-
if mode != Mode::Tool && stage == 0 {
452-
cargo.env("RUSTBUILD_UNSTABLE", "1");
453-
}
454-
455432
// Ignore incremental modes except for stage0, since we're
456433
// not guaranteeing correctness across builds if the compiler
457434
// is changing under your feet.`

src/doc/unstable-book/src/library-features/question-mark-carrier.md

Lines changed: 0 additions & 13 deletions
This file was deleted.

src/liballoc_jemalloc/build.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,11 @@ fn main() {
154154
make.current_dir(&native.out_dir)
155155
.arg("build_lib_static");
156156

157+
// These are intended for mingw32-make which we don't use
158+
if cfg!(windows) {
159+
make.env_remove("MAKEFLAGS").env_remove("MFLAGS");
160+
}
161+
157162
// mingw make seems... buggy? unclear...
158163
if !host.contains("windows") {
159164
make.arg("-j")

src/libarena/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
//! objects of a single type.
2020
2121
#![crate_name = "arena"]
22-
#![cfg_attr(stage0, unstable(feature = "rustc_private", issue = "27812"))]
2322
#![crate_type = "rlib"]
2423
#![crate_type = "dylib"]
2524
#![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
@@ -33,7 +32,6 @@
3332
#![feature(dropck_eyepatch)]
3433
#![feature(generic_param_attrs)]
3534
#![feature(needs_drop)]
36-
#![cfg_attr(stage0, feature(staged_api))]
3735
#![cfg_attr(test, feature(test))]
3836

3937
#![allow(deprecated)]

src/libcore/intrinsics.rs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,6 @@ extern "rust-intrinsic" {
572572
///
573573
/// The `locality` argument must be a constant integer and is a temporal locality specifier
574574
/// ranging from (0) - no locality, to (3) - extremely local keep in cache
575-
#[cfg(not(stage0))]
576575
pub fn prefetch_read_data<T>(data: *const T, locality: i32);
577576
/// The `prefetch` intrinsic is a hint to the code generator to insert a prefetch instruction
578577
/// if supported; otherwise, it is a noop.
@@ -581,7 +580,6 @@ extern "rust-intrinsic" {
581580
///
582581
/// The `locality` argument must be a constant integer and is a temporal locality specifier
583582
/// ranging from (0) - no locality, to (3) - extremely local keep in cache
584-
#[cfg(not(stage0))]
585583
pub fn prefetch_write_data<T>(data: *const T, locality: i32);
586584
/// The `prefetch` intrinsic is a hint to the code generator to insert a prefetch instruction
587585
/// if supported; otherwise, it is a noop.
@@ -590,7 +588,6 @@ extern "rust-intrinsic" {
590588
///
591589
/// The `locality` argument must be a constant integer and is a temporal locality specifier
592590
/// ranging from (0) - no locality, to (3) - extremely local keep in cache
593-
#[cfg(not(stage0))]
594591
pub fn prefetch_read_instruction<T>(data: *const T, locality: i32);
595592
/// The `prefetch` intrinsic is a hint to the code generator to insert a prefetch instruction
596593
/// if supported; otherwise, it is a noop.
@@ -599,20 +596,9 @@ extern "rust-intrinsic" {
599596
///
600597
/// The `locality` argument must be a constant integer and is a temporal locality specifier
601598
/// ranging from (0) - no locality, to (3) - extremely local keep in cache
602-
#[cfg(not(stage0))]
603599
pub fn prefetch_write_instruction<T>(data: *const T, locality: i32);
604600
}
605601

606-
// Empty bootstrap implementations for stage0 compilation
607-
#[cfg(stage0)]
608-
pub fn prefetch_read_data<T>(_data: *const T, _locality: i32) { /* EMPTY */ }
609-
#[cfg(stage0)]
610-
pub fn prefetch_write_data<T>(_data: *const T, _locality: i32) { /* EMPTY */ }
611-
#[cfg(stage0)]
612-
pub fn prefetch_read_instruction<T>(_data: *const T, _locality: i32) { /* EMPTY */ }
613-
#[cfg(stage0)]
614-
pub fn prefetch_write_instruction<T>(_data: *const T, _locality: i32) { /* EMPTY */ }
615-
616602
extern "rust-intrinsic" {
617603

618604
pub fn atomic_fence();

0 commit comments

Comments
 (0)