about summary refs log tree commit diff
path: root/src/tools
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-04-29 20:38:15 +0000
committerbors <bors@rust-lang.org>2017-04-29 20:38:15 +0000
commitafa1240e57330d85a372db4e28cd8bc8fa528ccb (patch)
tree196d279b28389512c66dd2facdf615604ac51d1f /src/tools
parentb4d3ed64ec7f6d7a9fa0530377a29520a90a451f (diff)
parent5daf557a77391f14a26038d7ab70d424cfe5b040 (diff)
downloadrust-afa1240e57330d85a372db4e28cd8bc8fa528ccb.tar.gz
rust-afa1240e57330d85a372db4e28cd8bc8fa528ccb.zip
Auto merge of #41544 - alexcrichton:bump-bootstrap, r=brson
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.
Diffstat (limited to 'src/tools')
m---------src/tools/cargo0
m---------src/tools/rls0
-rw-r--r--src/tools/tidy/src/main.rs2
3 files changed, 2 insertions, 0 deletions
diff --git a/src/tools/cargo b/src/tools/cargo
new file mode 160000
+Subproject fa7584c1495c2d9c04a6416f8e7b546abfa88a5
diff --git a/src/tools/rls b/src/tools/rls
new file mode 160000
+Subproject 67babd2d63710444a3071dfd9184648fd85a6a3
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))
 }