More Rust upgrade misc

Author: kmcallister

bench/tokenizer.rs

@@ -40,7 +40,7 @@ impl Bench {
         path.push("../data/bench/");
         path.push(name);
         let mut file = io::File::open(&path).ok().expect("can't open file");
-        let file_input = file.read_to_str().ok().expect("can't read file");
+        let file_input = file.read_to_string().ok().expect("can't read file");
 
         let input = match size {
             None => file_input,

examples/html2html.rs

@@ -26,7 +26,7 @@ use html5ever::tree_builder::TreeBuilderOpts;
 use html5ever::{parse, one_input, serialize};
 
 fn main() {
-    let input = io::stdin().read_to_str().unwrap();
+    let input = io::stdin().read_to_string().unwrap();
     let dom: RcDom = parse(one_input(input), ParseOpts {
         tree_builder: TreeBuilderOpts {
             drop_doctype: true,

examples/noop-tokenize.rs

@@ -33,10 +33,10 @@ impl TokenSink for Sink {
 fn main() {
     let mut path = os::self_exe_path().expect("can't get exe path");
     path.push("../data/bench/");
-    path.push(os::args().get(1).as_slice());
+    path.push(os::args()[1].as_slice());
 
     let mut file = io::File::open(&path).ok().expect("can't open file");
-    let file_input = file.read_to_str().ok().expect("can't read file");
+    let file_input = file.read_to_string().ok().expect("can't read file");
 
     let mut sink = Sink;
     tokenize_to(&mut sink, one_input(file_input), TokenizerOpts {

examples/noop-tree-builder.rs

@@ -81,6 +81,6 @@ fn main() {
         names: HashMap::new(),
     };
 
-    let input = io::stdin().read_to_str().unwrap();
+    let input = io::stdin().read_to_string().unwrap();
     parse_to(&mut sink, one_input(input), Default::default());
 }

examples/print-rcdom.rs

@@ -51,7 +51,7 @@ fn walk(indent: uint, handle: Handle) {
 }
 
 fn main() {
-    let input = io::stdin().read_to_str().unwrap();
+    let input = io::stdin().read_to_string().unwrap();
     let dom: RcDom = parse(one_input(input), Default::default());
     walk(0, dom.document);
 

examples/print-tree-actions.rs

@@ -118,6 +118,6 @@ fn main() {
         names: HashMap::new(),
     };
 
-    let input = io::stdin().read_to_str().unwrap();
+    let input = io::stdin().read_to_string().unwrap();
     parse_to(&mut sink, one_input(input), Default::default());
 }

examples/tokenize.rs

@@ -79,7 +79,7 @@ fn main() {
     let mut sink = TokenPrinter {
         in_char_run: false,
     };
-    let input = io::stdin().read_to_str().unwrap();
+    let input = io::stdin().read_to_string().unwrap();
     tokenize_to(&mut sink, one_input(input), TokenizerOpts {
         profile: true,
         .. Default::default()

src/sink/owned_dom.rs

@@ -225,8 +225,8 @@ impl TreeSink<Handle> for Sink {
 
             // Look for a text node before the insertion point.
             (AppendText(text), i) => {
-                let prev = parent.children.get(i-1);
-                if append_to_existing_text(*prev, text.as_slice()) {
+                let prev = parent.children[i-1];
+                if append_to_existing_text(prev, text.as_slice()) {
                     return Ok(());
                 }
                 self.new_node(Text(text))

src/sink/rcdom.rs

@@ -177,7 +177,7 @@ impl TreeSink<Handle> for RcDom {
             // Look for a text node before the insertion point.
             (AppendText(text), i) => {
                 let parent = parent.borrow();
-                let prev = parent.children.get(i-1);
+                let prev = &parent.children[i-1];
                 if append_to_existing_text(prev, text.as_slice()) {
                     return Ok(());
                 }

src/tokenizer/buffer_queue.rs

@@ -67,7 +67,7 @@ impl BufferQueue {
             return;
         }
         self.account_new(buf.as_slice());
-        self.buffers.push_back(Buffer {
+        self.buffers.push(Buffer {
             pos: pos,
             buf: buf,
         });

src/tree_builder/actions.rs

@@ -191,7 +191,7 @@ impl<'sink, Handle: Clone, Sink: TreeSink<Handle>>
                     // If last_table has no parent, we regain ownership of the child.
                     // Insert "inside previous element, after its last child (if any)"
                     Err(child) => {
-                        let previous_element = self.open_elems.get(idx-1).clone();
+                        let previous_element = self.open_elems[idx-1].clone();
                         self.sink.append(previous_element, child);
                     }
                 }
@@ -227,7 +227,7 @@ impl<'sink, Handle: Clone, Sink: TreeSink<Handle>>
 
     /// Get the first element on the stack, which will be the <html> element.
     fn html_elem(&self) -> Handle {
-         self.open_elems.get(0).clone()
+         self.open_elems[0].clone()
     }
 
     /// Get the second element on the stack, if it's a HTML body element.
@@ -236,7 +236,7 @@ impl<'sink, Handle: Clone, Sink: TreeSink<Handle>>
             return None;
         }
 
-        let node = self.open_elems.get(1).clone();
+        let node = self.open_elems[1].clone();
         if self.html_elem_named(node.clone(), atom!(body)) {
             Some(node)
         } else {

src/tree_builder/mod.rs

@@ -195,7 +195,7 @@ impl<'sink, Handle: Clone, Sink: TreeSink<Handle>> TreeBuilder<'sink, Handle, Si
                         buf.slice_to(len).to_string());
 
                     if len < buf.len() {
-                        more_tokens.push_back(
+                        more_tokens.push(
                             CharacterTokens(NotSplit, buf.slice_from(len).to_string()));
                     }
                 }

src/tree_builder/rules.rs

@@ -703,7 +703,7 @@ impl<'sink, Handle: Clone, Sink: TreeSink<Handle>>
                         }
 
                         if self.elem_in(elem.clone(), special_tag) {
-                            self.unexpected(&tag);
+                            self.sink.parse_error(Slice("Found special tag while closing generic tag"));
                             return Done;
                         }
                     }