Rollup merge of #56285 - Keruspe:stage0, r=alexcrichton

move stage0.txt to toplevel directory

This way all files needed by packagers now reside in toplevel

Author: pietroalbini

config.toml.example

@@ -112,11 +112,11 @@
 # for each target triple.
 #target = ["x86_64-unknown-linux-gnu"] # defaults to just the build triple
 
-# Instead of downloading the src/stage0.txt version of Cargo specified, use
+# Instead of downloading the stage0.txt version of Cargo specified, use
 # this Cargo binary instead to build all Rust code
 #cargo = "/path/to/bin/cargo"
 
-# Instead of downloading the src/stage0.txt version of the compiler
+# Instead of downloading the stage0.txt version of the compiler
 # specified, use this rustc binary instead as the stage0 snapshot compiler.
 #rustc = "/path/to/bin/rustc"
 

src/bootstrap/bootstrap.py

@@ -154,7 +154,7 @@ def run(args, verbose=False, exception=False, **kwargs):
 
 def stage0_data(rust_root):
     """Build a dictionary from stage0.txt"""
-    nightlies = os.path.join(rust_root, "src/stage0.txt")
+    nightlies = os.path.join(rust_root, "stage0.txt")
     with open(nightlies, 'r') as nightlies:
         lines = [line.rstrip() for line in nightlies
                  if not line.startswith("#")]

src/bootstrap/bootstrap_test.py

@@ -28,8 +28,7 @@ class Stage0DataTestCase(unittest.TestCase):
     def setUp(self):
         self.rust_root = tempfile.mkdtemp()
         os.mkdir(os.path.join(self.rust_root, "src"))
-        with open(os.path.join(self.rust_root, "src",
-                               "stage0.txt"), "w") as stage0:
+        with open(os.path.join(self.rust_root, "stage0.txt"), "w") as stage0:
             stage0.write("#ignore\n\ndate: 2017-06-15\nrustc: beta\ncargo: beta")
 
     def tearDown(self):

src/bootstrap/lib.rs

@@ -41,7 +41,7 @@
 //! When you execute `x.py build`, the steps which are executed are:
 //!
 //! * First, the python script is run. This will automatically download the
-//!   stage0 rustc and cargo according to `src/stage0.txt`, or use the cached
+//!   stage0 rustc and cargo according to `stage0.txt`, or use the cached
 //!   versions if they're available. These are then used to compile rustbuild
 //!   itself (using Cargo). Finally, control is then transferred to rustbuild.
 //!

src/bootstrap/sanity.rs

@@ -236,7 +236,7 @@ $ pacman -R cmake && pacman -S mingw-w64-x86_64-cmake
 
     if build.config.channel == "stable" {
         let mut stage0 = String::new();
-        t!(t!(File::open(build.src.join("src/stage0.txt")))
+        t!(t!(File::open(build.src.join("stage0.txt")))
             .read_to_string(&mut stage0));
         if stage0.contains("\ndev:") {
             panic!("bootstrapping from a dev compiler in a stable release, but \