refactor: move utils module under tokenizer::machine

4 files changed, 8 insertions, 7 deletions

diff --git a/src/lib.rs b/src/lib.rs
index baacb38..3c7e77b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -13,7 +13,6 @@ mod entities;
 mod error;
 mod naive_parser;
 mod tokenizer;
-mod utils;
 
 /// Types for HTML attributes.
 pub mod attr {
@@ -33,7 +32,7 @@ pub use token::{Comment, Doctype, EndTag, StartTag, Token};
 pub use tokenizer::{CdataAction, Event, State, Tokenizer};
 
 #[cfg(feature = "integration-tests")]
-pub use utils::State as InternalState;
+pub use tokenizer::InternalState;
 
 /// Relative links in the README.md don't work in rustdoc, so we have to override them.
 macro_rules! file_url {
diff --git a/src/tokenizer.rs b/src/tokenizer.rs
index 7e05477..6f698f6 100644
--- a/src/tokenizer.rs
+++ b/src/tokenizer.rs
@@ -3,12 +3,12 @@ mod machine;
 use crate::naive_parser::naive_next_state;
 use crate::offset::{Offset, Position};
 use crate::reader::{IntoReader, Reader};
-use crate::utils::{control_pat, noncharacter_pat, surrogate_pat};
 use crate::{Emitter, Error};
+use machine::utils::{control_pat, noncharacter_pat, surrogate_pat};
 use machine::ControlToken;
 
 #[cfg(feature = "integration-tests")]
-use crate::utils::State as InternalState;
+pub use machine::State as InternalState;
 
 // this is a stack that can hold 0 to 2 Ts
 #[derive(Debug, Default, Clone, Copy)]
diff --git a/src/tokenizer/machine.rs b/src/tokenizer/machine.rs
index 07d4c05..fc31a42 100644
--- a/src/tokenizer/machine.rs
+++ b/src/tokenizer/machine.rs
@@ -1,13 +1,15 @@
+pub(super) mod utils;
+
 use crate::entities::try_read_character_reference;
 use crate::offset::{Offset, Position};
 use crate::token::AttrValueSyntax;
 use crate::tokenizer::CdataAction;
-use crate::utils::{
+use crate::{reader::Reader, Emitter, Error, Tokenizer};
+use utils::{
     ascii_digit_pat, control_pat, ctostr, noncharacter_pat, surrogate_pat, whitespace_pat,
 };
-use crate::{reader::Reader, Emitter, Error, Tokenizer};
 
-pub use crate::utils::State;
+pub use utils::State;
 
 pub enum ControlToken {
     Eof,
diff --git a/src/utils.rs b/src/tokenizer/machine/utils.rs
index 7d220cf..7d220cf 100644
--- a/src/utils.rs
+++ b/src/tokenizer/machine/utils.rs