diff options
| author | Keegan McAllister <kmcallister@mozilla.com> | 2013-08-21 11:44:36 -0700 |
|---|---|---|
| committer | Keegan McAllister <kmcallister@mozilla.com> | 2013-08-21 11:46:12 -0700 |
| commit | 02662f882e57e9715a7d6b7f2d84dad2400be355 (patch) | |
| tree | 7a6d9ed4de04d702cfab38ff8aadec63a03e1345 /src/components/script/dom/bindings/codegen | |
| parent | d0e47f427e190a0a06283ca6a17625c239b2ec91 (diff) | |
| download | servo-02662f882e57e9715a7d6b7f2d84dad2400be355.tar.gz servo-02662f882e57e9715a7d6b7f2d84dad2400be355.zip | |
Keep pace with some Rust changes
This doesn't actually include the Rust version update (to 6791021) because the
feature for which I wanted it (debug info) doesn't work, and there's no point
making everyone rebuild until it does.
Diffstat (limited to 'src/components/script/dom/bindings/codegen')
| -rw-r--r-- | src/components/script/dom/bindings/codegen/CodegenRust.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py index 8af1b473670..5d12b15fdc7 100644 --- a/src/components/script/dom/bindings/codegen/CodegenRust.py +++ b/src/components/script/dom/bindings/codegen/CodegenRust.py @@ -3451,7 +3451,7 @@ class CGXrayHelper(CGAbstractExternMethod): methods = self.properties.methods if methods.hasNonChromeOnly() or methods.hasChromeOnly(): - methodArgs = "Some(vec::zip_slice(%(methods)s, *method_ids))" % varNames + methodArgs = "Some(zip_copies(%(methods)s, *method_ids))" % varNames setup += "let method_ids = (*page).js_info.get_ref().dom_static.method_ids.get(&(PrototypeList::id::ClientRect as uint));\n" else: methodArgs = "None" @@ -3459,7 +3459,7 @@ class CGXrayHelper(CGAbstractExternMethod): attrs = self.properties.attrs if attrs.hasNonChromeOnly() or attrs.hasChromeOnly(): - attrArgs = "Some(vec::zip_slice(%(attrs)s, *attr_ids))" % varNames + attrArgs = "Some(zip_copies(%(attrs)s, *attr_ids))" % varNames setup += "let attr_ids = (*page).js_info.get_ref().dom_static.attribute_ids.get(&(PrototypeList::id::ClientRect as uint));\n" else: attrArgs = "None" @@ -3467,7 +3467,7 @@ class CGXrayHelper(CGAbstractExternMethod): consts = self.properties.consts if consts.hasNonChromeOnly() or consts.hasChromeOnly(): - constArgs = "Some(vec::zip_slice(%(consts)s, *const_ids))" % varNames + constArgs = "Some(zip_copies(%(consts)s, *const_ids))" % varNames setup += "let const_ids = (*page).js_info.get_ref().dom_static.constant_ids.get(&(PrototypeList::id::ClientRect as uint));\n" else: constArgs = "None" @@ -4656,6 +4656,7 @@ class CGBindingRoot(CGThing): 'script_task::{JSPageInfo, page_from_context}', 'dom::bindings::utils::EnumEntry', 'dom::node::ScriptView', + 'servo_util::vec::zip_copies', 'std::cast', 'std::libc', 'std::ptr', |