Fix examples and benches

Author: Ygg01

html5ever/benches/tokenizer.rs

@@ -8,7 +8,6 @@
 // except according to those terms.
 
 extern crate test;
-extern crate tendril;
 extern crate html5ever;
 
 use std::{fs, env, cmp};
@@ -19,9 +18,8 @@ use test::{black_box, Bencher, TestDesc, TestDescAndFn};
 use test::{DynTestName, DynBenchFn, TDynBenchFn};
 use test::ShouldPanic::No;
 
-use tendril::{ByteTendril, StrTendril, ReadExt, SliceExt};
-use html5ever::tokenizer::{TokenSink, Token, Tokenizer, TokenizerOpts, TokenSinkResult};
-use html5ever::tokenizer::buffer_queue::BufferQueue;
+use html5ever::tokenizer::{BufferQueue, TokenSink, Token, Tokenizer, TokenizerOpts, TokenSinkResult};
+use html5ever::tendril::*;
 
 struct Sink;
 

html5ever/examples/noop-tokenize.rs

@@ -10,15 +10,12 @@
 // Run a single benchmark once.  For use with profiling tools.
 
 extern crate html5ever;
-extern crate tendril;
 
 use std::io;
 use std::default::Default;
 
-use tendril::{ByteTendril, ReadExt};
-
-use html5ever::tokenizer::{TokenSinkResult, TokenSink, Token, Tokenizer};
-use html5ever::tokenizer::buffer_queue::BufferQueue;
+use html5ever::tokenizer::{BufferQueue, TokenSinkResult, TokenSink, Token, Tokenizer};
+use html5ever::tendril::*;
 
 struct Sink(Vec<Token>);
 

html5ever/examples/noop-tree-builder.rs

@@ -11,19 +11,16 @@
 extern crate markup5ever;
 
 extern crate html5ever;
-extern crate tendril;
 
 use std::io;
 use std::default::Default;
 use std::collections::HashMap;
 use std::borrow::Cow;
 
-use tendril::{StrTendril, TendrilSink};
-
-use html5ever::QualName;
+use html5ever::{Attribute, QualName};
 use html5ever::parse_document;
-use html5ever::tokenizer::Attribute;
 use html5ever::tree_builder::{TreeSink, QuirksMode, NodeOrText};
+use html5ever::tendril::*;
 
 struct Sink {
     next_id: usize,
@@ -59,6 +56,10 @@ impl TreeSink for Sink {
         x == y
     }
 
+    fn same_node_ref(&self, x: &usize, y: &usize) -> bool {
+        x == y
+    }
+
     fn same_tree(&self, _x: usize, _y: usize) -> bool {
         true
     }
@@ -67,6 +68,10 @@ impl TreeSink for Sink {
         self.names.get(&target).expect("not an element").clone()
     }
 
+    fn elem_name_ref(&self, target: &usize) -> QualName {
+        self.names.get(target).expect("not an element").clone()
+    }
+
     fn create_element(&mut self, name: QualName, _attrs: Vec<Attribute>) -> usize {
         let id = self.get_id();
         self.names.insert(id, name);
@@ -77,6 +82,11 @@ impl TreeSink for Sink {
         self.get_id()
     }
 
+    #[allow(unused_variables)]
+    fn create_pi(&mut self, target: StrTendril, value: StrTendril) -> usize {
+        unimplemented!()
+    }
+
     fn has_parent_node(&self, _node: usize) -> bool {
         // `node` will have a parent unless a script moved it, and we're
         // not running scripts.  Therefore we can aways return true.

html5ever/examples/print-tree-actions.rs

@@ -11,19 +11,16 @@
 extern crate markup5ever;
 
 extern crate html5ever;
-extern crate tendril;
 
 use std::io;
 use std::default::Default;
 use std::collections::HashMap;
 use std::borrow::Cow;
 
-use tendril::{StrTendril, TendrilSink};
-
-use html5ever::QualName;
-use html5ever::tokenizer::Attribute;
+use html5ever::{QualName, Attribute};
 use html5ever::tree_builder::{TreeSink, QuirksMode, NodeOrText, AppendNode, AppendText};
 use html5ever::parse_document;
+use html5ever::tendril::*;
 
 struct Sink {
     next_id: usize,
@@ -67,10 +64,19 @@ impl TreeSink for Sink {
         x == y
     }
 
+    fn same_node_ref(&self, x: &usize, y: &usize) -> bool {
+        x == y
+    }
+
     fn elem_name(&self, target: usize) -> QualName {
         self.names.get(&target).expect("not an element").clone()
     }
 
+    fn elem_name_ref(&self, target: &usize) -> QualName {
+        self.names.get(target).expect("not an element").clone()
+    }
+
+
     fn create_element(&mut self, name: QualName, _attrs: Vec<Attribute>) -> usize {
         let id = self.get_id();
         println!("Created {:?} as {}", name, id);
@@ -84,6 +90,11 @@ impl TreeSink for Sink {
         id
     }
 
+    #[allow(unused_variables)]
+    fn create_pi(&mut self, target: StrTendril, value: StrTendril) -> usize {
+        unimplemented!()
+    }
+
     fn has_parent_node(&self, _node: usize) -> bool  {
         // `node` will have a parent unless a script moved it, and we're
         // not running scripts.  Therefore we can aways return true

html5ever/examples/tokenize.rs

@@ -7,17 +7,15 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern crate tendril;
 extern crate html5ever;
 
 use std::io;
 use std::default::Default;
 
-use tendril::{ByteTendril, ReadExt};
-
 use html5ever::tokenizer::{TokenSink, Tokenizer, Token, TokenizerOpts, ParseError, TokenSinkResult};
 use html5ever::tokenizer::{CharacterTokens, NullCharacterToken, TagToken, StartTag, EndTag};
-use html5ever::tokenizer::buffer_queue::BufferQueue;
+use html5ever::tokenizer::BufferQueue;
+use html5ever::tendril::*;
 
 #[derive(Copy, Clone)]
 struct TokenPrinter {

xml5ever/examples/hello_xml.rs

@@ -31,7 +31,7 @@ fn main() {
     let doc = &dom.document;
 
     let hello_node = &doc.borrow().children[0];
-    let hello_tag = &*dom.elem_name(hello_node).local;
+    let hello_tag = &*dom.elem_name_ref(hello_node).local;
     let text_node = &hello_node.borrow().children[0];
 
     let xml = {

xml5ever/examples/xml_tree_printer.rs

@@ -30,7 +30,7 @@ fn walk(prefix: &str, handle: Handle) {
             println!("#text {}", escape_default(text))
         },
 
-        Element(ref name, _) => {
+        Element(ref name, ..) => {
             println!("{}", name.local);
         },
 
@@ -47,7 +47,7 @@ fn walk(prefix: &str, handle: Handle) {
 
     for child in node.children.iter()
         .filter(|child| match child.borrow().node {
-            Text(_) | Element (_, _) => true,
+            Text(_) | Element (_, _, _) => true,
             _ => false,
         }
     ) {