diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2017-12-04 10:54:32 +0100 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2017-12-07 13:50:09 +0100 |
| commit | 1a950d263a631c59534eb2c97e92348321e42d63 (patch) | |
| tree | a05cae198a4c4e6eabdc7a4fd0a447cf8eb4724e | |
| parent | e64647188879b8269b62c1d5c8aa05732ab9d96d (diff) | |
| download | servo-1a950d263a631c59534eb2c97e92348321e42d63.tar.gz servo-1a950d263a631c59534eb2c97e92348321e42d63.zip | |
Upgrade to rustc 1.24.0-nightly (5a2465e2b 2017-12-06)
| -rw-r--r-- | components/dom_struct/lib.rs | 4 | ||||
| -rw-r--r-- | python/servo/testing_commands.py | 3 | ||||
| -rw-r--r-- | rust-toolchain | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/components/dom_struct/lib.rs b/components/dom_struct/lib.rs index a955f00ce87..41cf4a67527 100644 --- a/components/dom_struct/lib.rs +++ b/components/dom_struct/lib.rs @@ -19,5 +19,9 @@ pub fn dom_struct(args: TokenStream, input: TokenStream) -> TokenStream { #[must_root] #[repr(C)] }; + + // Work around https://github.com/rust-lang/rust/issues/46489 + let attributes = attributes.to_string().parse().unwrap(); + iter::once(attributes).chain(iter::once(input)).collect() } diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py index a72b6ef8f70..e0b9a4e7b28 100644 --- a/python/servo/testing_commands.py +++ b/python/servo/testing_commands.py @@ -254,6 +254,9 @@ class MachCommands(CommandBase): env = self.build_env() env["RUST_BACKTRACE"] = "1" + # Work around https://github.com/rust-lang/cargo/issues/4790 + del env["RUSTDOCFLAGS"] + if "msvc" in host_triple(): # on MSVC, we need some DLLs in the path. They were copied # in to the servo.exe build dir, so just point PATH to that. diff --git a/rust-toolchain b/rust-toolchain index 45c170f9e3f..3e5d257a285 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2017-11-14 +nightly-2017-12-07 |