diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | appveyor.yml | 4 | ||||
| -rw-r--r-- | python/servo/bootstrap_commands.py | 5 | ||||
| -rw-r--r-- | python/servo/command_base.py | 2 | ||||
| -rw-r--r-- | rust-commit-hash | 1 | ||||
| -rw-r--r-- | rust-nightly-date | 1 | ||||
| -rw-r--r-- | tests/compiletest/plugin/compile-fail/ban-domrefcell.rs | 2 | ||||
| -rw-r--r-- | tests/compiletest/plugin/compile-fail/ban.rs | 2 | ||||
| -rw-r--r-- | tests/compiletest/plugin/compile-fail/privatize.rs | 2 |
9 files changed, 11 insertions, 10 deletions
diff --git a/README.md b/README.md index b1a73eade57..b733d912523 100644 --- a/README.md +++ b/README.md @@ -149,7 +149,7 @@ Servo's build system automatically downloads a Rust compiler to build itself. This is normally a specific revision of Rust upstream, but sometimes has a backported patch or two. If you'd like to know which nightly build of Rust we use, see -[`rust-nightly-date`](https://github.com/servo/servo/blob/master/rust-nightly-date). +[`rust-commit-hash`](https://github.com/servo/servo/blob/master/rust-commit-hash). ## Building diff --git a/appveyor.yml b/appveyor.yml index 782ce173da1..a81c576d4b8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -37,8 +37,8 @@ branches: - master cache: - - .servo -> rust-nightly-date, cargo-commit-hash - - .cargo -> rust-nightly-date, cargo-commit-hash + - .servo -> rust-commit-hash, cargo-commit-hash + - .cargo -> rust-commit-hash, cargo-commit-hash - .ccache install: diff --git a/python/servo/bootstrap_commands.py b/python/servo/bootstrap_commands.py index 8975f174d84..ee29bce06db 100644 --- a/python/servo/bootstrap_commands.py +++ b/python/servo/bootstrap_commands.py @@ -86,9 +86,10 @@ class MachCommands(CommandBase): # in that directory). if stable: tarball = "rustc-%s-%s.tar.gz" % (version, host_triple()) + rustc_url = "https://static-rust-lang-org.s3.amazonaws.com/dist/" + tarball else: tarball = "%s/rustc-nightly-%s.tar.gz" % (version, host_triple()) - rustc_url = "https://static-rust-lang-org.s3.amazonaws.com/dist/" + tarball + rustc_url = "https://s3.amazonaws.com/rust-lang-ci/rustc-builds/" + tarball tgz_file = rust_dir + '-rustc.tar.gz' download_file("Rust compiler", rustc_url, tgz_file) @@ -126,7 +127,7 @@ class MachCommands(CommandBase): % (version, target_triple)) tgz_file = install_dir + ('rust-std-%s-%s.tar.gz' % (version, target_triple)) else: - std_url = ("https://static-rust-lang-org.s3.amazonaws.com/dist/%s/rust-std-nightly-%s.tar.gz" + std_url = ("https://s3.amazonaws.com/rust-lang-ci/rustc-builds/%s/rust-std-nightly-%s.tar.gz" % (version, target_triple)) tgz_file = install_dir + ('rust-std-nightly-%s.tar.gz' % target_triple) diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 3169e9c9d6a..d533fa44bb8 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -303,7 +303,7 @@ class CommandBase(object): def rust_version(self): if self._rust_version is None or self._use_stable_rust != self._rust_version_is_stable: filename = path.join(self.context.topdir, - "rust-stable-version" if self._use_stable_rust else "rust-nightly-date") + "rust-stable-version" if self._use_stable_rust else "rust-commit-hash") with open(filename) as f: self._rust_version = f.read().strip() return self._rust_version diff --git a/rust-commit-hash b/rust-commit-hash new file mode 100644 index 00000000000..88ae055e46e --- /dev/null +++ b/rust-commit-hash @@ -0,0 +1 @@ +025c328bf5ab336ff708e62a59292298dc1bc089 diff --git a/rust-nightly-date b/rust-nightly-date deleted file mode 100644 index 59e27d02131..00000000000 --- a/rust-nightly-date +++ /dev/null @@ -1 +0,0 @@ -2017-02-05 diff --git a/tests/compiletest/plugin/compile-fail/ban-domrefcell.rs b/tests/compiletest/plugin/compile-fail/ban-domrefcell.rs index 4ec48545361..e68c3b9bc9b 100644 --- a/tests/compiletest/plugin/compile-fail/ban-domrefcell.rs +++ b/tests/compiletest/plugin/compile-fail/ban-domrefcell.rs @@ -13,7 +13,7 @@ use script::test::Node; struct Foo { bar: DOMRefCell<JS<Node>> - //~^ ERROR Banned type DOMRefCell<JS<T>> detected. Use MutJS<JS<T>> instead, + //~^ ERROR Banned type DOMRefCell<JS<T>> detected. Use MutJS<JS<T>> instead } fn main() {} diff --git a/tests/compiletest/plugin/compile-fail/ban.rs b/tests/compiletest/plugin/compile-fail/ban.rs index b0ea769b4a8..ebcedffce31 100644 --- a/tests/compiletest/plugin/compile-fail/ban.rs +++ b/tests/compiletest/plugin/compile-fail/ban.rs @@ -12,7 +12,7 @@ use std::cell::Cell; struct Foo { bar: Cell<JSVal> - //~^ ERROR Banned type Cell<JSVal> detected. Use MutJS<JSVal> instead, + //~^ ERROR Banned type Cell<JSVal> detected. Use MutJS<JSVal> instead } fn main() {} diff --git a/tests/compiletest/plugin/compile-fail/privatize.rs b/tests/compiletest/plugin/compile-fail/privatize.rs index ef185c2169c..c907a7fa4b3 100644 --- a/tests/compiletest/plugin/compile-fail/privatize.rs +++ b/tests/compiletest/plugin/compile-fail/privatize.rs @@ -8,7 +8,7 @@ extern crate deny_public_fields; #[derive(DenyPublicFields)] -//~^ ERROR custom derive attribute panicked +//~^ ERROR proc-macro derive panicked struct Foo { pub v1: i32, v2: i32 |