Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use workspace.default-members to specify default crates for cargo build #19476

Merged
merged 5 commits into from Dec 7, 2017
Next

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

  • Loading branch information
SimonSapin committed Dec 7, 2017
commit 1a950d263a631c59534eb2c97e92348321e42d63
@@ -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()
}
@@ -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.
@@ -1 +1 @@
nightly-2017-11-14
nightly-2017-12-07
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.