diff --git a/src/components/main/constellation.rs b/src/components/main/constellation.rs index 4de6ca19820..237107027f5 100644 --- a/src/components/main/constellation.rs +++ b/src/components/main/constellation.rs @@ -133,7 +133,7 @@ impl FrameTreeTraversal for Rc { fn iter(&self) -> FrameTreeIterator { FrameTreeIterator { - stack: ~[self.clone()], + stack: vec!(self.clone()), } } } @@ -151,7 +151,7 @@ impl ChildFrameTree { /// Note that this iterator should _not_ be used to mutate nodes _during_ /// iteration. Mutating nodes once the iterator is out of scope is OK. struct FrameTreeIterator { - stack: ~[Rc], + stack: Vec>, } impl Iterator> for FrameTreeIterator { @@ -220,7 +220,7 @@ impl NavigationContext { } /// Returns the frame trees whose keys are pipeline_id. - fn find_all(&mut self, pipeline_id: PipelineId) -> ~[Rc] { + fn find_all(&mut self, pipeline_id: PipelineId) -> Vec> { let from_current = self.current.iter().filter_map(|frame_tree| { frame_tree.find(pipeline_id) }); @@ -300,7 +300,7 @@ impl Constellation { } /// Returns both the navigation context and pending frame trees whose keys are pipeline_id. - fn find_all(&mut self, pipeline_id: PipelineId) -> ~[Rc] { + fn find_all(&mut self, pipeline_id: PipelineId) -> Vec> { let matching_navi_frames = self.navigation_context.find_all(pipeline_id); let matching_pending_frames = self.pending_frames.iter().filter_map(|frame_change| { frame_change.after.find(pipeline_id) @@ -548,7 +548,7 @@ impl Constellation { // or a new url entered. // Start by finding the frame trees matching the pipeline id, // and add the new pipeline to their sub frames. - let frame_trees: ~[Rc] = { + let frame_trees: Vec> = { let matching_navi_frames = self.navigation_context.find_all(source_pipeline_id); let matching_pending_frames = self.pending_frames.iter().filter_map(|frame_change| { frame_change.after.find(source_pipeline_id)