removed TreeBuilderStep and moved its impl into TreeBuilder

Author: jbg

html5ever/src/tree_builder/mod.rs

@@ -16,7 +16,6 @@ pub use interface::{NodeOrText, AppendNode, AppendText, Attribute};
 pub use interface::{TreeSink, Tracer, NextParserState, create_element, ElementFlags};
 
 use self::types::*;
-use self::rules::TreeBuilderStep;
 
 use {ExpandedName, QualName, LocalName, Namespace};
 use tendril::StrTendril;
@@ -47,11 +46,7 @@ pub use self::PushFlag::*;
 mod data;
 mod types;
 
-mod rules {
-    //! The tree builder rules, as a single, enormous nested match expression.
-
-    include!(concat!(env!("OUT_DIR"), "/rules.rs"));
-}
+include!(concat!(env!("OUT_DIR"), "/rules.rs"));
 
 /// Tree builder options, with an impl for Default.
 #[derive(Copy, Clone)]

html5ever/src/tree_builder/rules.rs

@@ -9,40 +9,25 @@
 
 // The tree builder rules, as a single, enormous nested match expression.
 
-use {ExpandedName, QualName};
-use interface::{Attribute, TreeSink, Quirks, AppendNode, create_element};
 use tree_builder::types::*;
 use tree_builder::tag_sets::*;
-use tree_builder::{NoPush, Push, html_elem};
-use tokenizer::{EndTag, StartTag, Tag};
 use tokenizer::states::{Rcdata, Rawtext, ScriptData, Plaintext};
-use util::str::is_ascii_whitespace;
 
-use std::ascii::AsciiExt;
-use std::mem::replace;
-use std::borrow::Cow::Borrowed;
 use std::borrow::ToOwned;
 
-use tendril::{StrTendril, SliceExt};
+use tendril::SliceExt;
 
 fn any_not_whitespace(x: &StrTendril) -> bool {
     // FIXME: this might be much faster as a byte scan
     x.chars().any(|c| !is_ascii_whitespace(c))
 }
 
-// This goes in a trait so that we can control visibility.
-pub trait TreeBuilderStep<Handle> {
-    fn step(&mut self, mode: InsertionMode, token: Token) -> ProcessResult<Handle>;
-    fn step_foreign(&mut self, token: Token) -> ProcessResult<Handle>;
-}
-
 fn current_node<Handle>(open_elems: &[Handle]) -> &Handle {
     open_elems.last().expect("no current element")
 }
 
 #[doc(hidden)]
-impl<Handle, Sink> TreeBuilderStep<Handle>
-    for super::TreeBuilder<Handle, Sink>
+impl<Handle, Sink> TreeBuilder<Handle, Sink>
     where Handle: Clone,
           Sink: TreeSink<Handle=Handle>,
 {