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

Keep pace with some Rust changes

Browse source 
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.
This commit is contained in:
Keegan McAllister 2013-08-21 11:44:36 -07:00
parent d0e47f427e
commit 02662f882e
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/components/script/dom/bindings/codegen/CodegenRust.py
View file

@ -3451,7 +3451,7 @@ class CGXrayHelper(CGAbstractExternMethod):
methods = self.properties.methods methods = self.properties.methods
if methods.hasNonChromeOnly() or methods.hasChromeOnly(): 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" setup += "let method_ids = (*page).js_info.get_ref().dom_static.method_ids.get(&(PrototypeList::id::ClientRect as uint));\n"
else: else:
methodArgs = "None" methodArgs = "None"
@ -3459,7 +3459,7 @@ class CGXrayHelper(CGAbstractExternMethod):
attrs = self.properties.attrs attrs = self.properties.attrs
if attrs.hasNonChromeOnly() or attrs.hasChromeOnly(): 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" setup += "let attr_ids = (*page).js_info.get_ref().dom_static.attribute_ids.get(&(PrototypeList::id::ClientRect as uint));\n"
else: else:
attrArgs = "None" attrArgs = "None"
@ -3467,7 +3467,7 @@ class CGXrayHelper(CGAbstractExternMethod):
consts = self.properties.consts consts = self.properties.consts
if consts.hasNonChromeOnly() or consts.hasChromeOnly(): 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" setup += "let const_ids = (*page).js_info.get_ref().dom_static.constant_ids.get(&(PrototypeList::id::ClientRect as uint));\n"
else: else:
constArgs = "None" constArgs = "None"
@ -4656,6 +4656,7 @@ class CGBindingRoot(CGThing):
'script_task::{JSPageInfo, page_from_context}', 'script_task::{JSPageInfo, page_from_context}',
'dom::bindings::utils::EnumEntry', 'dom::bindings::utils::EnumEntry',
'dom::node::ScriptView', 'dom::node::ScriptView',
'servo_util::vec::zip_copies',
'std::cast', 'std::cast',
'std::libc', 'std::libc',
'std::ptr', 'std::ptr',

6
src/components/util/vec.rs
View file

@ -64,6 +64,12 @@ fn test_match<T: Eq>(b: &T, a: Option<&T>) -> bool {
} }
} }
pub fn zip_copies<A: Clone, B: Clone>(avec: &[A], bvec: &[B]) -> ~[(A,B)] {
avec.iter().map(|x| x.clone())
.zip(bvec.iter().map(|x| x.clone()))
.collect()
}
fn should_find_all_elements() { fn should_find_all_elements() {
#[test]; #[test];