From 948daf242278b22d7a15c1c594129785d1cff538 Mon Sep 17 00:00:00 2001 From: Lars Bergstrom Date: Sat, 5 Apr 2014 10:11:38 +0200 Subject: This batch of changes upgrades Servo to work with the Rust upgrade as of April 10, 2014. The main changes are to privacy, to work around the issues with incorrect bounds on the libstd `Arc>`, and the various API changes strewn throughout the libraries. --- src/components/script/dom/bindings/codegen/CodegenRust.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/components/script/dom/bindings/codegen/CodegenRust.py') diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py index c0b1a230bcf..cc56c606e0b 100644 --- a/src/components/script/dom/bindings/codegen/CodegenRust.py +++ b/src/components/script/dom/bindings/codegen/CodegenRust.py @@ -1394,7 +1394,7 @@ class CGImports(CGWrapper): 'dead_code', ] - statements = ['#[allow(%s)];' % ','.join(ignored_warnings)] + statements = ['#![allow(%s)]' % ','.join(ignored_warnings)] statements.extend('use %s;' % i for i in sorted(imports)) CGWrapper.__init__(self, child, @@ -4076,11 +4076,11 @@ class CGDictionary(CGThing): def struct(self): d = self.dictionary if d.parent: - inheritance = " parent: %s::%s,\n" % (self.makeModuleName(d.parent), + inheritance = " pub parent: %s::%s,\n" % (self.makeModuleName(d.parent), self.makeClassName(d.parent)) else: inheritance = "" - memberDecls = [" %s: %s," % + memberDecls = [" pub %s: %s," % (self.makeMemberName(m[0].identifier.name), self.getMemberType(m)) for m in self.memberInfo] @@ -4344,11 +4344,11 @@ class CGBindingRoot(CGThing): 'dom::bindings::proxyhandler::{_obj_toString, defineProperty}', 'dom::bindings::proxyhandler::{FillPropertyDescriptor, GetExpandoObject}', 'dom::bindings::proxyhandler::{getPropertyDescriptor}', + 'libc', 'servo_util::str::DOMString', 'servo_util::vec::zip_copies', 'std::cast', 'std::cmp', - 'std::libc', 'std::ptr', 'std::slice', 'std::str', @@ -5282,7 +5282,7 @@ class GlobalGenRoots(): def InheritTypes(config): descriptors = config.getDescriptors(register=True, hasInterfaceObject=True) - allprotos = [CGGeneric("#[allow(unused_imports)];\n"), + allprotos = [CGGeneric("#![allow(unused_imports)]\n"), CGGeneric("use dom::types::*;\n"), CGGeneric("use dom::bindings::js::JS;\n"), CGGeneric("use dom::bindings::trace::JSTraceable;\n"), -- cgit v1.2.3