Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #21872 - servo:rustup, r=nox

Browse source 
Upgrade to rustc 1.31.0-nightly (8c4ad4e9e 2018-10-04)

CC https://github.com/rust-lang/rust/issues/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 -->
This commit is contained in:
bors-servo 2018-10-05 09:16:34 -04:00 • committed by GitHub
commit ba82eaa10e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
components/script/dom/bindings/codegen/CodegenRust.py
View file

@ -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);

2
rust-toolchain
View file

@ -1 +1 @@
nightly-2018-08-29 nightly-2018-10-05