Merge pull request #1 from servo/m5e

markup5ever followups

Author: Ygg01

html5ever/Cargo.toml

@@ -31,25 +31,18 @@ harness = false
 
 [features]
 unstable = ["tendril/unstable"]
-heap_size = ["heapsize", "heapsize_derive", "markup5ever/heap_size"]
+heap_size = ["markup5ever/heap_size"]
 
 [dependencies]
 log = "0"
-phf = "0.7"
 mac = "0"
 tendril = "0.2.2"
-heapsize = { version = "0.3", optional = true }
-heapsize_derive = { version = "0.1", optional = true }
 markup5ever = { version = "0.1", path = "../markup5ever" }
 
 [dev-dependencies]
 rustc-serialize = "0.3.15"
 rustc-test = "0.1.3"
 
 [build-dependencies]
-phf_codegen = "0.7.3"
 quote = "0.3.3"
-rustc-serialize = "0.3.15"
 syn = { version = "0.11", features = ["full", "visit"] }
-
-

html5ever/build.rs

@@ -7,7 +7,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern crate phf_codegen;
 #[macro_use] extern crate quote;
 extern crate syn;
 
@@ -26,4 +25,4 @@ fn main() {
         &Path::new(&env::var("OUT_DIR").unwrap()).join("rules.rs"));
 
     println!("cargo:rerun-if-changed={}", rules_rs.display());
-}
+}

html5ever/examples/noop-tree-builder.rs

@@ -7,19 +7,16 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[macro_use] 
-extern crate markup5ever;
-
-extern crate html5ever;
+#[macro_use] extern crate html5ever;
 
 use std::io;
 use std::default::Default;
 use std::collections::HashMap;
 use std::borrow::Cow;
 
-use html5ever::{Attribute, QualName};
+use html5ever::{Attribute, QualName, ExpandedName};
 use html5ever::parse_document;
-use html5ever::tree_builder::{TreeSink, QuirksMode, NodeOrText};
+use html5ever::tree_builder::{TreeSink, QuirksMode, NodeOrText, ElementFlags};
 use html5ever::tendril::*;
 
 struct Sink {
@@ -44,35 +41,27 @@ impl TreeSink for Sink {
         0
     }
 
-    fn get_template_contents(&mut self, target: usize) -> usize {
-        if let Some(&qualname!(html, "template")) = self.names.get(&target) {
+    fn get_template_contents(&mut self, target: &usize) -> usize {
+        if let Some(expanded_name!(html "template")) = self.names.get(&target).map(|n| n.expanded()) {
             target + 1
         } else {
             panic!("not a template element")
         }
     }
 
-    fn same_node(&self, x: usize, y: usize) -> bool {
-        x == y
-    }
-
-    fn same_node_ref(&self, x: &usize, y: &usize) -> bool {
+    fn same_node(&self, x: &usize, y: &usize) -> bool {
         x == y
     }
 
-    fn same_tree(&self, _x: usize, _y: usize) -> bool {
+    fn same_tree(&self, _x: &usize, _y: &usize) -> bool {
         true
     }
 
-    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 elem_name(&self, target: &usize) -> ExpandedName {
+        self.names.get(target).expect("not an element").expanded()
     }
 
-    fn create_element(&mut self, name: QualName, _attrs: Vec<Attribute>) -> usize {
+    fn create_element(&mut self, name: QualName, _: Vec<Attribute>, _: ElementFlags) -> usize {
         let id = self.get_id();
         self.names.insert(id, name);
         id
@@ -87,27 +76,27 @@ impl TreeSink for Sink {
         unimplemented!()
     }
 
-    fn has_parent_node(&self, _node: usize) -> bool {
+    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.
         true
     }
 
     fn append_before_sibling(&mut self,
-            _sibling: usize,
+            _sibling: &usize,
             _new_node: NodeOrText<usize>) { }
 
     fn parse_error(&mut self, _msg: Cow<'static, str>) { }
     fn set_quirks_mode(&mut self, _mode: QuirksMode) { }
-    fn append(&mut self, _parent: usize, _child: NodeOrText<usize>) { }
+    fn append(&mut self, _parent: &usize, _child: NodeOrText<usize>) { }
 
     fn append_doctype_to_document(&mut self, _: StrTendril, _: StrTendril, _: StrTendril) { }
-    fn add_attrs_if_missing(&mut self, target: usize, _attrs: Vec<Attribute>) {
+    fn add_attrs_if_missing(&mut self, target: &usize, _attrs: Vec<Attribute>) {
         assert!(self.names.contains_key(&target), "not an element");
     }
-    fn remove_from_parent(&mut self, _target: usize) { }
-    fn reparent_children(&mut self, _node: usize, _new_parent: usize) { }
-    fn mark_script_already_started(&mut self, _node: usize) { }
+    fn remove_from_parent(&mut self, _target: &usize) { }
+    fn reparent_children(&mut self, _node: &usize, _new_parent: &usize) { }
+    fn mark_script_already_started(&mut self, _node: &usize) { }
 }
 
 fn main() {

html5ever/examples/print-rcdom.rs

@@ -7,10 +7,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[macro_use] 
-extern crate markup5ever;
-
-extern crate html5ever;
+#[macro_use] extern crate html5ever;
 extern crate tendril;
 
 use std::io;
@@ -20,39 +17,41 @@ use std::string::String;
 
 use tendril::TendrilSink;
 use html5ever::parse_document;
-use html5ever::rcdom::{Document, Doctype, Text, Comment, Element, RcDom, Handle};
+use html5ever::rcdom::{NodeData, RcDom, Handle};
 
 // This is not proper HTML serialization, of course.
 
 fn walk(indent: usize, handle: Handle) {
-    let node = handle.borrow();
+    let node = handle;
     // FIXME: don't allocate
     print!("{}", repeat(" ").take(indent).collect::<String>());
-    match node.node {
-        Document
+    match node.data {
+        NodeData::Document
             => println!("#Document"),
 
-        Doctype(ref name, ref public, ref system)
-            => println!("<!DOCTYPE {} \"{}\" \"{}\">", *name, *public, *system),
+        NodeData::Doctype { ref name, ref public_id, ref system_id }
+            => println!("<!DOCTYPE {} \"{}\" \"{}\">", name, public_id, system_id),
 
-        Text(ref text)
-            => println!("#text: {}", escape_default(text)),
+        NodeData::Text { ref contents }
+            => println!("#text: {}", escape_default(&contents.borrow())),
 
-        Comment(ref text)
-            => println!("<!-- {} -->", escape_default(text)),
+        NodeData::Comment { ref contents }
+            => println!("<!-- {} -->", escape_default(contents)),
 
-        Element(ref name, _, ref attrs) => {
+        NodeData::Element { ref name, ref attrs, .. } => {
             assert!(name.ns == ns!(html));
             print!("<{}", name.local);
-            for attr in attrs.iter() {
+            for attr in attrs.borrow().iter() {
                 assert!(attr.name.ns == ns!());
                 print!(" {}=\"{}\"", attr.name.local, attr.value);
             }
             println!(">");
         }
+
+        NodeData::ProcessingInstruction { .. } => unreachable!()
     }
 
-    for child in node.children.iter() {
+    for child in node.children.borrow().iter() {
         walk(indent+4, child.clone());
     }
 }

html5ever/examples/print-tree-actions.rs

@@ -7,18 +7,15 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[macro_use] 
-extern crate markup5ever;
-
-extern crate html5ever;
+#[macro_use] extern crate html5ever;
 
 use std::io;
 use std::default::Default;
 use std::collections::HashMap;
 use std::borrow::Cow;
 
-use html5ever::{QualName, Attribute};
-use html5ever::tree_builder::{TreeSink, QuirksMode, NodeOrText, AppendNode, AppendText};
+use html5ever::{QualName, ExpandedName, Attribute};
+use html5ever::tree_builder::{TreeSink, QuirksMode, NodeOrText, AppendNode, AppendText, ElementFlags};
 use html5ever::parse_document;
 use html5ever::tendril::*;
 
@@ -48,8 +45,8 @@ impl TreeSink for Sink {
         0
     }
 
-    fn get_template_contents(&mut self, target: usize) -> usize {
-        if let Some(&qualname!(html, "template")) = self.names.get(&target) {
+    fn get_template_contents(&mut self, target: &usize) -> usize {
+        if let Some(expanded_name!(html "template")) = self.names.get(target).map(|n| n.expanded()) {
             target + 1
         } else {
             panic!("not a template element")
@@ -60,24 +57,15 @@ impl TreeSink for Sink {
         println!("Set quirks mode to {:?}", mode);
     }
 
-    fn same_node(&self, x: usize, y: usize) -> bool {
-        x == y
-    }
-
-    fn same_node_ref(&self, x: &usize, y: &usize) -> bool {
+    fn same_node(&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(&self, target: &usize) -> ExpandedName {
+        self.names.get(target).expect("not an element").expanded()
     }
 
-    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 {
+    fn create_element(&mut self, name: QualName, _: Vec<Attribute>, _: ElementFlags) -> usize {
         let id = self.get_id();
         println!("Created {:?} as {}", name, id);
         self.names.insert(id, name);
@@ -95,13 +83,13 @@ impl TreeSink for Sink {
         unimplemented!()
     }
 
-    fn has_parent_node(&self, _node: usize) -> bool  {
+    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
         true
     }
 
-    fn append(&mut self, parent: usize, child: NodeOrText<usize>) {
+    fn append(&mut self, parent: &usize, child: NodeOrText<usize>) {
         match child {
             AppendNode(n)
                 => println!("Append node {} to {}", n, parent),
@@ -111,7 +99,7 @@ impl TreeSink for Sink {
     }
 
     fn append_before_sibling(&mut self,
-            sibling: usize,
+            sibling: &usize,
             new_node: NodeOrText<usize>) {
         match new_node {
             AppendNode(n)
@@ -128,37 +116,37 @@ impl TreeSink for Sink {
         println!("Append doctype: {} {} {}", name, public_id, system_id);
     }
 
-    fn add_attrs_if_missing(&mut self, target: usize, attrs: Vec<Attribute>) {
-        assert!(self.names.contains_key(&target), "not an element");
+    fn add_attrs_if_missing(&mut self, target: &usize, attrs: Vec<Attribute>) {
+        assert!(self.names.contains_key(target), "not an element");
         println!("Add missing attributes to {}:", target);
         for attr in attrs.into_iter() {
             println!("    {:?} = {}", attr.name, attr.value);
         }
     }
 
-    fn associate_with_form(&mut self, _target: usize, _form: usize) {
+    fn associate_with_form(&mut self, _target: &usize, _form: &usize) {
         // No form owner support. Since same_tree always returns
         // true we cannot be sure that this associate_with_form call is
         // valid
     }
 
-    fn remove_from_parent(&mut self, target: usize) {
+    fn remove_from_parent(&mut self, target: &usize) {
         println!("Remove {} from parent", target);
     }
 
-    fn reparent_children(&mut self, node: usize, new_parent: usize) {
+    fn reparent_children(&mut self, node: &usize, new_parent: &usize) {
         println!("Move children from {} to {}", node, new_parent);
     }
 
-    fn mark_script_already_started(&mut self, node: usize) {
+    fn mark_script_already_started(&mut self, node: &usize) {
         println!("Mark script {} as already started", node);
     }
 
     fn set_current_line(&mut self, line_number: u64) {
         println!("Set current line to {}", line_number);
     }
 
-    fn pop(&mut self, elem: usize) {
+    fn pop(&mut self, elem: &usize) {
         println!("Popped element {}", elem);
     }
 }

html5ever/src/driver.rs

@@ -9,9 +9,10 @@
 
 //! High-level interface to the parser.
 
+use {Attribute, QualName};
+use buffer_queue::BufferQueue;
 use tokenizer::{Tokenizer, TokenizerOpts, TokenizerResult};
-use markup5ever::util::buffer_queue::BufferQueue;
-use tree_builder::{TreeBuilderOpts, TreeBuilder, TreeSink};
+use tree_builder::{TreeBuilderOpts, TreeBuilder, TreeSink, create_element};
 
 use std::borrow::Cow;
 use std::mem;
@@ -20,7 +21,6 @@ use encoding::{self, EncodingRef};
 use tendril;
 use tendril::{StrTendril, ByteTendril};
 use tendril::stream::{TendrilSink, Utf8LossyDecoder, LossyDecoder};
-use markup5ever::{Attribute, QualName};
 
 /// All-encompassing options struct for the parser.
 #[derive(Clone, Default)]
@@ -56,7 +56,7 @@ pub fn parse_fragment<Sink>(mut sink: Sink, opts: ParseOpts,
                             context_name: QualName, context_attrs: Vec<Attribute>)
                             -> Parser<Sink>
                             where Sink: TreeSink {
-    let context_elem = sink.create_element(context_name, context_attrs);
+    let context_elem = create_element(&mut sink, context_name, context_attrs);
     parse_fragment_for_element(sink, opts, context_elem, None)
 }
 

html5ever/src/lib.rs

@@ -13,16 +13,10 @@
 #![cfg_attr(test, deny(warnings))]
 #![allow(unused_parens)]
 
-#![cfg_attr(feature = "heap_size", feature(proc_macro))]
-#[cfg(feature = "heap_size")] #[macro_use] extern crate heapsize_derive;
-#[cfg(feature = "heap_size")] extern crate heapsize;
-
 #[macro_use] extern crate log;
 #[macro_use] extern crate markup5ever;
 #[macro_use] extern crate mac;
 
-extern crate phf;
-
 pub use markup5ever::*;
 pub use driver::{ParseOpts, parse_document, parse_fragment, Parser};
 
@@ -39,7 +33,6 @@ pub mod serialize;
 pub mod tokenizer;
 pub mod tree_builder;
 pub mod driver;
-pub mod rcdom;
 
 /// Re-export the tendril crate.
 pub mod tendril {