summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Fischer <martin@push-f.com>2021-04-08 09:13:47 +0200
committerMartin Fischer <martin@push-f.com>2021-04-08 15:40:48 +0200
commit6133f17a178c0b746a124f52df36fe98d7d2db7a (patch)
treeb3fdb9a789ef3d87d28387a88882ddfc5784f0a8
parent2ade35bf1030e4eb4ccf7c02ceba04124669743c (diff)
make dependencies on markup5ever explicit
-rw-r--r--src/lib.rs3
-rw-r--r--src/tokenizer/char_ref/mod.rs6
-rw-r--r--src/tokenizer/interface.rs6
-rw-r--r--src/tokenizer/mod.rs10
4 files changed, 13 insertions, 12 deletions
diff --git a/src/lib.rs b/src/lib.rs
index 1817bb1..488a311 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -12,7 +12,8 @@
#![cfg_attr(test, deny(warnings))]
#![allow(unused_parens)]
-pub use markup5ever::*;
+pub use markup5ever;
+pub use markup5ever::tendril;
#[macro_use]
mod macros;
diff --git a/src/tokenizer/char_ref/mod.rs b/src/tokenizer/char_ref/mod.rs
index a52485d..2840c73 100644
--- a/src/tokenizer/char_ref/mod.rs
+++ b/src/tokenizer/char_ref/mod.rs
@@ -8,9 +8,9 @@
// except according to those terms.
use super::{TokenSink, Tokenizer};
-use crate::buffer_queue::BufferQueue;
-use crate::data;
-use crate::tendril::StrTendril;
+use markup5ever::buffer_queue::BufferQueue;
+use markup5ever::data;
+use markup5ever::tendril::StrTendril;
use crate::util::str::is_ascii_alnum;
use log::debug;
diff --git a/src/tokenizer/interface.rs b/src/tokenizer/interface.rs
index 22d11be..99e3b58 100644
--- a/src/tokenizer/interface.rs
+++ b/src/tokenizer/interface.rs
@@ -7,10 +7,10 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
-use crate::interface::Attribute;
-use crate::tendril::StrTendril;
+use markup5ever::interface::Attribute;
+use markup5ever::tendril::StrTendril;
use crate::tokenizer::states;
-use crate::LocalName;
+use markup5ever::LocalName;
use std::borrow::Cow;
pub use self::TagKind::{EndTag, StartTag};
diff --git a/src/tokenizer/mod.rs b/src/tokenizer/mod.rs
index 267fdf3..6f97e7f 100644
--- a/src/tokenizer/mod.rs
+++ b/src/tokenizer/mod.rs
@@ -31,9 +31,9 @@ use std::collections::BTreeMap;
use std::default::Default;
use std::mem::replace;
-pub use crate::buffer_queue::{BufferQueue, FromSet, NotFromSet, SetResult};
-use crate::tendril::StrTendril;
-use crate::{Attribute, LocalName, QualName, SmallCharSet};
+pub use markup5ever::buffer_queue::{BufferQueue, FromSet, NotFromSet, SetResult};
+use markup5ever::tendril::StrTendril;
+use markup5ever::{Attribute, LocalName, QualName, SmallCharSet};
mod char_ref;
mod interface;
@@ -1527,7 +1527,7 @@ impl<Sink: TokenSink> Tokenizer<Sink> {
#[allow(non_snake_case)]
mod test {
use super::option_push; // private items
- use crate::tendril::{SliceExt, StrTendril};
+ use markup5ever::tendril::{SliceExt, StrTendril};
use super::{TokenSink, TokenSinkResult, Tokenizer, TokenizerOpts};
@@ -1538,7 +1538,7 @@ mod test {
use markup5ever::buffer_queue::BufferQueue;
use std::mem::replace;
- use crate::LocalName;
+ use markup5ever::LocalName;
// LinesMatch implements the TokenSink trait. It is used for testing to see
// if current_line is being updated when process_token is called. The lines