mirror of
https://github.com/servo/servo.git
synced 2025-06-06 16:45:39 +00:00
Upgrade to rustc 1.31.0-nightly (8c4ad4e9e 2018-10-04)
CC https://github.com/rust-lang/rust/issues/54846
This commit is contained in:
parent
caa4d190af
commit
a846ed1654
2 changed files with 9 additions and 2 deletions
|
@ -2278,7 +2278,14 @@ static NAMESPACE_OBJECT_CLASS: NamespaceObjectClass = unsafe {
|
||||||
return """\
|
return """\
|
||||||
static INTERFACE_OBJECT_CLASS: NonCallbackInterfaceObjectClass =
|
static INTERFACE_OBJECT_CLASS: NonCallbackInterfaceObjectClass =
|
||||||
NonCallbackInterfaceObjectClass::new(
|
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,
|
%(representation)s,
|
||||||
PrototypeList::ID::%(id)s,
|
PrototypeList::ID::%(id)s,
|
||||||
%(depth)s);
|
%(depth)s);
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
nightly-2018-08-29
|
nightly-2018-10-05
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue