diff --git a/src/components/main/layout/layout_task.rs b/src/components/main/layout/layout_task.rs index 1652365f93b..1a9b685a2a8 100644 --- a/src/components/main/layout/layout_task.rs +++ b/src/components/main/layout/layout_task.rs @@ -754,7 +754,7 @@ impl LayoutTask { ContentBoxesQuery(node, reply_chan) => { let node: OpaqueNode = OpaqueNodeMethods::from_script_node(node); - fn add_boxes_for_node(accumulator: &mut ~[Rect], + fn add_boxes_for_node(accumulator: &mut Vec>, mut iter: DisplayItemIterator, node: OpaqueNode) { for item in iter { @@ -765,7 +765,7 @@ impl LayoutTask { } } - let mut boxes = ~[]; + let mut boxes = vec!(); match self.display_list { None => fail!("no display list!"), Some(ref display_list) => { diff --git a/src/components/script/dom/node.rs b/src/components/script/dom/node.rs index 37cc1553324..d5e4654e254 100644 --- a/src/components/script/dom/node.rs +++ b/src/components/script/dom/node.rs @@ -288,7 +288,7 @@ pub trait NodeHelpers { fn to_trusted_node_address(&self) -> TrustedNodeAddress; fn get_bounding_content_box(&self) -> Rect; - fn get_content_boxes(&self) -> ~[Rect]; + fn get_content_boxes(&self) -> Vec>; } impl NodeHelpers for JS { @@ -581,7 +581,7 @@ impl NodeHelpers for JS { rect } - fn get_content_boxes(&self) -> ~[Rect] { + fn get_content_boxes(&self) -> Vec> { let window = window_from_node(self); let page = window.get().page(); let (chan, port) = channel(); diff --git a/src/components/script/layout_interface.rs b/src/components/script/layout_interface.rs index 9249d39b051..876d37f43af 100644 --- a/src/components/script/layout_interface.rs +++ b/src/components/script/layout_interface.rs @@ -83,7 +83,7 @@ impl, E> Encodable for TrustedNodeAddress { pub type UntrustedNodeAddress = *c_void; pub struct ContentBoxResponse(pub Rect); -pub struct ContentBoxesResponse(pub ~[Rect]); +pub struct ContentBoxesResponse(pub Vec>); pub struct HitTestResponse(pub UntrustedNodeAddress); pub struct MouseOverResponse(pub Vec);