Skip to content

Commit ba82eaa

Browse files
author
bors-servo
authored
Auto merge of #21872 - servo:rustup, r=nox
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 -->
2 parents caa4d19 + a846ed1 commit ba82eaa

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

components/script/dom/bindings/codegen/CodegenRust.py

+8-1
Original file line numberDiff line numberDiff line change
@@ -2278,7 +2278,14 @@ def define(self):
22782278
return """\
22792279
static INTERFACE_OBJECT_CLASS: NonCallbackInterfaceObjectClass =
22802280
NonCallbackInterfaceObjectClass::new(
2281-
&%(constructorBehavior)s,
2281+
{
2282+
// Intermediate `const` because as of nightly-2018-10-05,
2283+
// rustc is conservative in promotion to `'static` of the return values of `const fn`s:
2284+
// https://github.com/rust-lang/rust/issues/54846
2285+
// https://github.com/rust-lang/rust/pull/53851
2286+
const BEHAVIOR: InterfaceConstructorBehavior = %(constructorBehavior)s;
2287+
&BEHAVIOR
2288+
},
22822289
%(representation)s,
22832290
PrototypeList::ID::%(id)s,
22842291
%(depth)s);

rust-toolchain

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nightly-2018-08-29
1+
nightly-2018-10-05

0 commit comments

Comments
 (0)