diff --git a/src/components/script/dom/document.rs b/src/components/script/dom/document.rs index 4b026fdf1b9..442f07a29d1 100644 --- a/src/components/script/dom/document.rs +++ b/src/components/script/dom/document.rs @@ -386,10 +386,9 @@ impl Document { } }); }); - let v: ~[&str] = title.words().collect(); - title = v.connect(" "); - title = title.trim().to_owned(); - title + let v: Vec<&str> = title.words().collect(); + let title = v.connect(" "); + title.trim().to_owned() } // http://www.whatwg.org/specs/web-apps/current-work/#document.title diff --git a/src/components/script/dom/element.rs b/src/components/script/dom/element.rs index 54aa1206efa..0e94f3663a0 100644 --- a/src/components/script/dom/element.rs +++ b/src/components/script/dom/element.rs @@ -651,8 +651,8 @@ pub fn get_attribute_parts(name: DOMString) -> (Option<~str>, ~str) { //FIXME: Throw for XML-invalid names //FIXME: Throw for XMLNS-invalid names let (prefix, local_name) = if name.contains(":") { - let parts: ~[&str] = name.splitn(':', 1).collect(); - (Some(parts[0].to_owned()), parts[1].to_owned()) + let mut parts = name.splitn(':', 1); + (Some(parts.next().unwrap().to_owned()), parts.next().unwrap().to_owned()) } else { (None, name) }; diff --git a/src/components/script/dom/htmlcollection.rs b/src/components/script/dom/htmlcollection.rs index 5d5f7de0ae0..48b523e4fc2 100644 --- a/src/components/script/dom/htmlcollection.rs +++ b/src/components/script/dom/htmlcollection.rs @@ -94,7 +94,7 @@ impl HTMLCollection { pub fn by_class_name(window: &JS, root: &JS, classes: DOMString) -> JS { struct ClassNameFilter { - classes: ~[DOMString] + classes: Vec } impl CollectionFilter for ClassNameFilter { fn filter(&self, elem: &JS, _root: &JS) -> bool { diff --git a/src/components/script/html/hubbub_html_parser.rs b/src/components/script/html/hubbub_html_parser.rs index e6347f459ae..13cececb86a 100644 --- a/src/components/script/html/hubbub_html_parser.rs +++ b/src/components/script/html/hubbub_html_parser.rs @@ -50,7 +50,7 @@ pub struct JSFile { pub url: Url } -pub type JSResult = ~[JSFile]; +pub type JSResult = Vec; enum CSSMessage { CSSTaskNewFile(StylesheetProvenance), @@ -105,7 +105,7 @@ spawned, collates them, and sends them to the given result channel. */ fn css_link_listener(to_parent: Sender, from_parent: Receiver) { - let mut result_vec = ~[]; + let mut result_vec = vec!(); loop { match from_parent.recv_opt() { @@ -128,7 +128,7 @@ fn css_link_listener(to_parent: Sender, fn js_script_listener(to_parent: Sender, from_parent: Receiver, resource_task: ResourceTask) { - let mut result_vec = ~[]; + let mut result_vec = vec!(); loop { match from_parent.recv_opt() { @@ -465,7 +465,7 @@ pub fn parse_html(page: &Page, js_chan2.send(JSTaskNewFile(new_url)); } None => { - let mut data = ~[]; + let mut data = vec!(); let scriptnode: JS = NodeCast::from(&script); debug!("iterating over children {:?}", scriptnode.first_child()); for child in scriptnode.children() { diff --git a/src/components/script/script_task.rs b/src/components/script/script_task.rs index 49b26affa63..43d1fd49b26 100644 --- a/src/components/script/script_task.rs +++ b/src/components/script/script_task.rs @@ -647,7 +647,7 @@ impl ScriptTask { fn handle_msgs(&self) -> bool { // Handle pending resize events. // Gather them first to avoid a double mut borrow on self. - let mut resizes = ~[]; + let mut resizes = vec!(); { let mut page_tree = self.page_tree.borrow_mut(); @@ -669,7 +669,7 @@ impl ScriptTask { } // Store new resizes, and gather all other events. - let mut sequential = ~[]; + let mut sequential = vec!(); // Receive at least one message so we don't spinloop. let mut event = self.port.recv();