New upstream version 1.53.0+dfsg1

[rustc.git] / src / stage0.txt

diff --git a/src/stage0.txt b/src/stage0.txt
index ea53c719bf0464c8ed22fc84cc4ae45fcd4cde05..231e66719d00a35f4566f9ca600166499c529af7 100644 (file)
--- a/src/stage0.txt
+++ b/src/stage0.txt
@@ -1,6 +1,5 @@
 # This file describes the stage0 compiler that's used to then bootstrap the Rust
-# compiler itself. For the rustbuild build system, this also describes the
-# relevant Cargo revision that we're using.
+# compiler itself.
 #
 # Currently Rust always bootstraps from the previous stable release, and in our
 # train model this means that the master branch bootstraps from beta, beta
@@ -8,13 +7,19 @@
 # release.
 #
 # If you're looking at this file on the master branch, you'll likely see that
-# rustc and cargo are configured to `beta`, whereas if you're looking at a
-# source tarball for a stable release you'll likely see `1.x.0` for rustc and
-# `0.x.0` for Cargo where they were released on `date`.
+# rustc is configured to `beta`, whereas if you're looking at a source tarball
+# for a stable release you'll likely see `1.x.0` for rustc, with the previous
+# stable release's version number. `date` is the date where the release we're
+# bootstrapping off was released.
 
-date: 2017-06-08
-rustc: 1.18.0
-cargo: 0.19.0
+date: 2021-05-06
+rustc: 1.52.0
+
+# We use a nightly rustfmt to format the source because it solves some
+# bootstrapping issues with use of new syntax in this repo. If you're looking at
+# the beta/stable branch, this key should be omitted, as we don't want to depend
+# on rustfmt from nightly there.
+#rustfmt: nightly-2021-03-25
 
 # When making a stable release the process currently looks like:
 #
@@ -25,9 +30,9 @@ cargo: 0.19.0
 #
 # This means that there's a small window of time (a few days) where artifacts
 # are downloaded from dev-static.rust-lang.org instead of static.rust-lang.org.
-# In order to ease this transition we have an extra key is in this configuration
-# file below. When uncommented this will instruct the bootstrap.py script to
-# download from dev-static.rust-lang.org.
+# In order to ease this transition we have an extra key which is in the
+# configuration file below. When uncommented this will instruct the bootstrap.py
+# script to download from dev-static.rust-lang.org.
 #
 # This key is typically commented out at all times. If you're looking at a
 # stable release tarball it should *definitely* be commented out. If you're