Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade to rustc 1.24.0-nightly (5a2465e2b 2017-12-06)

Browse source
This commit is contained in:
Simon Sapin 2017-12-04 10:54:32 +01:00
parent e646471888
commit 1a950d263a
3 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/dom_struct/lib.rs
View file

@ -19,5 +19,9 @@ pub fn dom_struct(args: TokenStream, input: TokenStream) -> TokenStream {
#[must_root] #[must_root]
#[repr(C)] #[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() iter::once(attributes).chain(iter::once(input)).collect()
} }

3
python/servo/testing_commands.py
View file

@ -254,6 +254,9 @@ class MachCommands(CommandBase):
env = self.build_env() env = self.build_env()
env["RUST_BACKTRACE"] = "1" env["RUST_BACKTRACE"] = "1"
# Work around https://github.com/rust-lang/cargo/issues/4790
del env["RUSTDOCFLAGS"]
if "msvc" in host_triple(): if "msvc" in host_triple():
# on MSVC, we need some DLLs in the path. They were copied # 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. # in to the servo.exe build dir, so just point PATH to that.

2
rust-toolchain
View file

@ -1 +1 @@
nightly-2017-11-14 nightly-2017-12-07