Skip to content

Commit

Permalink
Auto merge of #21872 - servo:rustup, r=nox
Browse files Browse the repository at this point in the history
Upgrade to rustc 1.31.0-nightly (8c4ad4e9e 2018-10-04)

CC rust-lang/rust#54846

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21872)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo authored Oct 5, 2018

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents caa4d19 + a846ed1 commit ba82eaa
Showing 2 changed files with 9 additions and 2 deletions.
9 changes: 8 additions & 1 deletion components/script/dom/bindings/codegen/CodegenRust.py
Original file line number Diff line number Diff line change
@@ -2278,7 +2278,14 @@ def define(self):
return """\
static INTERFACE_OBJECT_CLASS: NonCallbackInterfaceObjectClass =
NonCallbackInterfaceObjectClass::new(
&%(constructorBehavior)s,
{
// Intermediate `const` because as of nightly-2018-10-05,
// rustc is conservative in promotion to `'static` of the return values of `const fn`s:
// https://github.com/rust-lang/rust/issues/54846
// https://github.com/rust-lang/rust/pull/53851
const BEHAVIOR: InterfaceConstructorBehavior = %(constructorBehavior)s;
&BEHAVIOR
},
%(representation)s,
PrototypeList::ID::%(id)s,
%(depth)s);
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nightly-2018-08-29
nightly-2018-10-05

0 comments on commit ba82eaa

Please sign in to comment.