From 071a1bf860900482079c0f602430ebdc425e5fee Mon Sep 17 00:00:00 2001 From: Martin Fischer Date: Thu, 8 Apr 2021 09:41:07 +0200 Subject: depend on tendril directly (instead of markup5ever::tendril) --- Cargo.toml | 1 + src/lib.rs | 2 +- src/tokenizer/char_ref/mod.rs | 2 +- src/tokenizer/interface.rs | 2 +- src/tokenizer/mod.rs | 4 ++-- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 34617f6..01f3467 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,6 +14,7 @@ edition = "2018" log = "0.4" mac = "0.1" markup5ever = { version = "0.10" } +tendril = "0.4" [dev-dependencies] typed-arena = "1.3.0" diff --git a/src/lib.rs b/src/lib.rs index 488a311..1d6e2d1 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -13,7 +13,7 @@ #![allow(unused_parens)] pub use markup5ever; -pub use markup5ever::tendril; +pub use tendril; #[macro_use] mod macros; diff --git a/src/tokenizer/char_ref/mod.rs b/src/tokenizer/char_ref/mod.rs index 8f56efb..e0369c7 100644 --- a/src/tokenizer/char_ref/mod.rs +++ b/src/tokenizer/char_ref/mod.rs @@ -9,7 +9,7 @@ use super::{TokenSink, Tokenizer}; use markup5ever::buffer_queue::BufferQueue; -use markup5ever::tendril::StrTendril; +use 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 99e3b58..35ba9c5 100644 --- a/src/tokenizer/interface.rs +++ b/src/tokenizer/interface.rs @@ -8,7 +8,7 @@ // except according to those terms. use markup5ever::interface::Attribute; -use markup5ever::tendril::StrTendril; +use tendril::StrTendril; use crate::tokenizer::states; use markup5ever::LocalName; use std::borrow::Cow; diff --git a/src/tokenizer/mod.rs b/src/tokenizer/mod.rs index 6f97e7f..33c0a88 100644 --- a/src/tokenizer/mod.rs +++ b/src/tokenizer/mod.rs @@ -32,7 +32,7 @@ use std::default::Default; use std::mem::replace; pub use markup5ever::buffer_queue::{BufferQueue, FromSet, NotFromSet, SetResult}; -use markup5ever::tendril::StrTendril; +use tendril::StrTendril; use markup5ever::{Attribute, LocalName, QualName, SmallCharSet}; mod char_ref; @@ -1527,7 +1527,7 @@ impl Tokenizer { #[allow(non_snake_case)] mod test { use super::option_push; // private items - use markup5ever::tendril::{SliceExt, StrTendril}; + use tendril::{SliceExt, StrTendril}; use super::{TokenSink, TokenSinkResult, Tokenizer, TokenizerOpts}; -- cgit v1.2.3