Avoid importing things directly from markup5ever

Author: SimonSapin

html5ever/src/driver.rs

@@ -9,8 +9,9 @@
 
 //! 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 std::borrow::Cow;
@@ -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)]

html5ever/src/tokenizer/char_ref/mod.rs

@@ -8,20 +8,17 @@
 // except according to those terms.
 
 use super::{Tokenizer, TokenSink};
-use markup5ever::util::buffer_queue::BufferQueue;
-
-use util::str::{is_ascii_alnum};
-
+use buffer_queue::BufferQueue;
+use data;
 use tendril::StrTendril;
+use util::str::{is_ascii_alnum};
 
 use std::char::from_u32;
 use std::borrow::Cow::Borrowed;
 
 pub use self::Status::*;
 use self::State::*;
 
-use markup5ever::data;
-
 //§ tokenizing-character-references
 pub struct CharRef {
     /// The resulting character(s)

html5ever/src/tokenizer/interface.rs

@@ -7,13 +7,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use tokenizer::states;
-
+use LocalName;
+use interface::Attribute;
 use std::borrow::Cow;
-
-use {LocalName};
 use tendril::StrTendril;
-use markup5ever::interface::Attribute;
+use tokenizer::states;
 
 pub use self::TagKind::{StartTag, EndTag};
 pub use self::Token::{DoctypeToken, TagToken, CommentToken, CharacterTokens};

html5ever/src/tokenizer/mod.rs

@@ -29,11 +29,9 @@ use std::default::Default;
 use std::borrow::Cow::{self, Borrowed};
 use std::collections::BTreeMap;
 
-use {LocalName, QualName};
+use {LocalName, QualName, Attribute, SmallCharSet};
 use tendril::StrTendril;
-use markup5ever::{SmallCharSet};
-use markup5ever::interface::{Attribute};
-pub use markup5ever::util::buffer_queue::{BufferQueue, SetResult, FromSet, NotFromSet};
+pub use buffer_queue::{BufferQueue, SetResult, FromSet, NotFromSet};
 
 pub mod states;
 mod interface;
@@ -1415,7 +1413,7 @@ mod test {
     use super::interface::{CharacterTokens, NullCharacterToken, EOFToken, ParseError};
     use super::interface::{TagKind, StartTag, EndTag, Tag};
 
-    use markup5ever::util::buffer_queue::{BufferQueue};
+    use markup5ever::buffer_queue::{BufferQueue};
     use std::mem::replace;
 
     use {LocalName};

html5ever/src/tree_builder/actions.rs

@@ -12,14 +12,14 @@
 //! Many of these are named within the spec, e.g. "reset the insertion
 //! mode appropriately".
 
+use {LocalName, Namespace, QualName, ExpandedName};
+use interface::{Attribute, TreeSink, QuirksMode, NodeOrText, AppendNode, AppendText};
+use tendril::StrTendril;
+use tokenizer::{Tag, StartTag, EndTag};
+use tokenizer::states::{RawData, RawKind};
 use tree_builder::types::*;
 use tree_builder::tag_sets::*;
-use markup5ever::interface::{Attribute, TreeSink, QuirksMode, NodeOrText, AppendNode, AppendText};
 use tree_builder::rules::TreeBuilderStep;
-
-use tokenizer::{Tag, StartTag, EndTag};
-use tokenizer::states::{RawData, RawKind};
-
 use util::str::to_escaped_string;
 
 use std::ascii::AsciiExt;
@@ -28,9 +28,6 @@ use std::mem::replace;
 use std::iter::{Rev, Enumerate};
 use std::borrow::Cow::Borrowed;
 
-use {LocalName, Namespace, QualName, ExpandedName};
-use tendril::StrTendril;
-
 pub use self::PushFlag::*;
 
 pub struct ActiveFormattingIter<'a, Handle: 'a> {

html5ever/src/tree_builder/data.rs

@@ -7,11 +7,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use interface::{QuirksMode, Quirks, LimitedQuirks, NoQuirks};
+use tendril::StrTendril;
 use tokenizer::Doctype;
-use markup5ever::interface::{QuirksMode, Quirks, LimitedQuirks, NoQuirks};
-
 use std::ascii::AsciiExt;
-use tendril::StrTendril;
 
 // These should all be lowercase, for ASCII-case-insensitive matching.
 static QUIRKY_PUBLIC_PREFIXES: &'static [&'static str] = &[

html5ever/src/tree_builder/mod.rs

@@ -11,9 +11,9 @@
 
 //! The HTML5 tree builder.
 
-pub use markup5ever::interface::{QuirksMode, Quirks, LimitedQuirks, NoQuirks};
-pub use markup5ever::interface::{NodeOrText, AppendNode, AppendText};
-pub use markup5ever::interface::{TreeSink, Tracer};
+pub use interface::{QuirksMode, Quirks, LimitedQuirks, NoQuirks};
+pub use interface::{NodeOrText, AppendNode, AppendText};
+pub use interface::{TreeSink, Tracer, NextParserState};
 
 use self::types::*;
 use self::actions::TreeBuilderActions;

html5ever/src/tree_builder/rules.rs

@@ -10,12 +10,12 @@
 // The tree builder rules, as a single, enormous nested match expression.
 
 use {ExpandedName, QualName};
+use interface::{Attribute, TreeSink, Quirks, AppendNode};
 use tree_builder::types::*;
 use tree_builder::tag_sets::*;
 use tree_builder::actions::{NoPush, Push, TreeBuilderActions, html_elem};
 use tokenizer::{EndTag, StartTag, Tag};
 use tokenizer::states::{Rcdata, Rawtext, ScriptData, Plaintext};
-
 use util::str::is_ascii_whitespace;
 
 use std::ascii::AsciiExt;
@@ -24,7 +24,6 @@ use std::borrow::Cow::Borrowed;
 use std::borrow::ToOwned;
 
 use tendril::{StrTendril, SliceExt};
-use markup5ever::interface::{Attribute, TreeSink, Quirks, AppendNode};
 
 fn any_not_whitespace(x: &StrTendril) -> bool {
     // FIXME: this might be much faster as a byte scan

markup5ever/lib.rs

@@ -28,11 +28,12 @@ pub mod data;
 #[macro_use] pub mod interface;
 pub mod rcdom;
 pub mod serialize;
-pub mod util {
+mod util {
     pub mod smallcharset;
     pub mod buffer_queue;
 }
 
+pub use util::*;
 pub use interface::{ExpandedName, QualName, Attribute};
 pub use util::smallcharset::SmallCharSet;
 

xml5ever/src/serialize/mod.rs

@@ -7,11 +7,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use QualName;
 pub use markup5ever::serialize::{Serialize, Serializer, TraversalScope, AttrRef};
 use std::io::{self, Write};
-
-use markup5ever::{QualName};
-
 use tree_builder::NamespaceMap;
 
 #[derive(Copy, Clone)]