diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-08-31 07:47:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-31 07:47:34 -0500 |
| commit | c4800a6c83e6fdabaf7c4eff70a24487d16f18ff (patch) | |
| tree | 6155ae297d32ae63e217edab3f5d128c1ed1d978 /components/script_plugins/utils.rs | |
| parent | ed9fb55366845fdcfae9a7418acd73052a0d4757 (diff) | |
| parent | 56b4f3ae70a217834f88a4233eb9989ff9cfec92 (diff) | |
| download | servo-c4800a6c83e6fdabaf7c4eff70a24487d16f18ff.tar.gz servo-c4800a6c83e6fdabaf7c4eff70a24487d16f18ff.zip | |
Auto merge of #18325 - servo:rustup-toolchain, r=nox
Switch back to pinning Rust by Nightly date instead of commit hash…
… this time using a `rust-toolchain` file compatible with rustup: https://github.com/rust-lang-nursery/rustup.rs/#the-toolchain-file
And upgrade to rustc 1.21.0-nightly (c11f689d2 2017-08-29)
----
Now if both `system-rust` and `system-cargo` are set to `true` in `.servobuild`’s `[tools]` section, and the corresponding `rustc` and `cargo` binaries are in fact rustup’s wrappers, then rustup will use the correct version based on `rust-toolchain`.
CC https://github.com/servo/servo/issues/11361
Unlike https://github.com/servo/servo/pull/17927, this does not make mach use rustup directly. That should wait until https://github.com/rust-lang-nursery/rustup.rs/issues/1099 is fixed.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/18325)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script_plugins/utils.rs')
0 files changed, 0 insertions, 0 deletions