From 5daf557a77391f14a26038d7ab70d424cfe5b040 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Thu, 20 Apr 2017 14:32:54 -0700
Subject: Update stage0 bootstrap compiler

We've got a freshly minted beta compiler, let's update to use that on nightly!
This has a few other changes associated with it as well

* A bump to the rustc version number (to 1.19.0)
* Movement of the `cargo` and `rls` submodules to their "proper" location in
  `src/tools/{cargo,rls}`. Now that Cargo workspaces support the `exclude`
  option this can work.
* Updates of the `cargo` and `rls` submodules to their master branches.
* Tweak to the `src/stage0.txt` format to be more amenable for Cargo version
  numbers. On the beta channel Cargo will bootstrap from a different version
  than rustc (e.g. the version numbers are different), so we need different
  configuration for this.
* Addition of `dev` as a readable key in the `src/stage0.txt` format. If present
  then stage0 compilers are downloaded from `dev-static.rust-lang.org` instead
  of `static.rust-lang.org`. This is added to accomodate our updated release
  process with Travis and AppVeyor.
---
 src/tools/cargo            | 1 +
 src/tools/rls              | 1 +
 src/tools/tidy/src/main.rs | 2 ++
 3 files changed, 4 insertions(+)
 create mode 160000 src/tools/cargo
 create mode 160000 src/tools/rls

(limited to 'src/tools')

diff --git a/src/tools/cargo b/src/tools/cargo
new file mode 160000
index 00000000000..fa7584c1495
--- /dev/null
+++ b/src/tools/cargo
@@ -0,0 +1 @@
+Subproject commit fa7584c1495c2d9c04a6416f8e7b546abfa88a52
diff --git a/src/tools/rls b/src/tools/rls
new file mode 160000
index 00000000000..67babd2d637
--- /dev/null
+++ b/src/tools/rls
@@ -0,0 +1 @@
+Subproject commit 67babd2d63710444a3071dfd9184648fd85a6a3d
diff --git a/src/tools/tidy/src/main.rs b/src/tools/tidy/src/main.rs
index 3e7046d05f4..f14a6a03893 100644
--- a/src/tools/tidy/src/main.rs
+++ b/src/tools/tidy/src/main.rs
@@ -85,6 +85,8 @@ fn filter_dirs(path: &Path) -> bool {
         "src/liblibc",
         "src/vendor",
         "src/rt/hoedown",
+        "src/tools/cargo",
+        "src/tools/rls",
     ];
     skip.iter().any(|p| path.ends_with(p))
 }
-- 
cgit 1.4.1-3-g733a5