Skip to content

Commit

Permalink
Upgrade to rustc 1.24.0-nightly (5a2465e2b 2017-12-06)
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonSapin committed Dec 7, 2017
1 parent e646471 commit 1a950d2
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
4 changes: 4 additions & 0 deletions components/dom_struct/lib.rs
Expand Up @@ -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()
}
3 changes: 3 additions & 0 deletions python/servo/testing_commands.py
Expand Up @@ -254,6 +254,9 @@ def test_unit(self, test_name=None, package=None, bench=False, nocapture=False):
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.
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
@@ -1 +1 @@
nightly-2017-11-14
nightly-2017-12-07

0 comments on commit 1a950d2

Please sign in to comment.