From bd446b6123e0b077a48e9f1e836affac78822f44 Mon Sep 17 00:00:00 2001
From: Martin Fischer <martin@push-f.com>
Date: Mon, 4 Sep 2023 20:47:52 +0200
Subject: chore: rename internal states as well

See the previous commit.
---
 html5lib_tests/src/lib.rs                |  6 +++---
 integration_tests/tests/test_html5lib.rs |  6 +++---
 src/tokenizer.rs                         |  6 +++---
 src/tokenizer/machine.rs                 | 32 ++++++++++++++++----------------
 src/tokenizer/machine/utils.rs           | 12 ++++++------
 5 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/html5lib_tests/src/lib.rs b/html5lib_tests/src/lib.rs
index 6cf46db..c473eb1 100644
--- a/html5lib_tests/src/lib.rs
+++ b/html5lib_tests/src/lib.rs
@@ -13,11 +13,11 @@ pub enum InitialState {
     #[serde(rename = "Data state")]
     Data,
     #[serde(rename = "PLAINTEXT state")]
-    PlainText,
+    Plaintext,
     #[serde(rename = "RCDATA state")]
-    RcData,
+    Rcdata,
     #[serde(rename = "RAWTEXT state")]
-    RawText,
+    Rawtext,
     #[serde(rename = "Script data state")]
     ScriptData,
     #[serde(rename = "CDATA section state")]
diff --git a/integration_tests/tests/test_html5lib.rs b/integration_tests/tests/test_html5lib.rs
index 010fd44..2d3e4cb 100644
--- a/integration_tests/tests/test_html5lib.rs
+++ b/integration_tests/tests/test_html5lib.rs
@@ -135,9 +135,9 @@ fn run_test_inner<R, O, E, T>(
     println!("description: {}", test.description);
     tokenizer.set_internal_state(match state {
         InitialState::Data => InternalState::Data,
-        InitialState::PlainText => InternalState::PlainText,
-        InitialState::RcData => InternalState::RcData,
-        InitialState::RawText => InternalState::RawText,
+        InitialState::Plaintext => InternalState::Plaintext,
+        InitialState::Rcdata => InternalState::Rcdata,
+        InitialState::Rawtext => InternalState::Rawtext,
         InitialState::ScriptData => InternalState::ScriptData,
         InitialState::CdataSection => InternalState::CdataSection,
     });
diff --git a/src/tokenizer.rs b/src/tokenizer.rs
index 4d3c534..661214c 100644
--- a/src/tokenizer.rs
+++ b/src/tokenizer.rs
@@ -119,9 +119,9 @@ impl From<State> for machine::State {
     fn from(state: State) -> Self {
         match state {
             State::Data => machine::State::Data,
-            State::Plaintext => machine::State::PlainText,
-            State::Rcdata => machine::State::RcData,
-            State::Rawtext => machine::State::RawText,
+            State::Plaintext => machine::State::Plaintext,
+            State::Rcdata => machine::State::Rcdata,
+            State::Rawtext => machine::State::Rawtext,
             State::ScriptData => machine::State::ScriptData,
             State::ScriptDataEscaped => machine::State::ScriptDataEscaped,
             State::ScriptDataDoubleEscaped => machine::State::ScriptDataDoubleEscaped,
diff --git a/src/tokenizer/machine.rs b/src/tokenizer/machine.rs
index faf1ea8..944eb01 100644
--- a/src/tokenizer/machine.rs
+++ b/src/tokenizer/machine.rs
@@ -114,14 +114,14 @@ where
             }
             None => Ok(ControlToken::Eof),
         },
-        State::RcData => match slf.read_char()? {
+        State::Rcdata => match slf.read_char()? {
             Some('&') => {
-                slf.return_state = Some(State::RcData);
+                slf.return_state = Some(State::Rcdata);
                 slf.state = State::CharacterReference;
                 Ok(ControlToken::Continue)
             }
             Some('<') => {
-                slf.state = State::RcDataLessThanSign;
+                slf.state = State::RcdataLessThanSign;
                 Ok(ControlToken::Continue)
             }
             Some('\0') => {
@@ -135,7 +135,7 @@ where
             }
             None => Ok(ControlToken::Eof),
         },
-        State::RawText => match slf.read_char()? {
+        State::Rawtext => match slf.read_char()? {
             Some('<') => {
                 slf.state = State::RawTextLessThanSign;
                 Ok(ControlToken::Continue)
@@ -167,7 +167,7 @@ where
             }
             None => Ok(ControlToken::Eof),
         },
-        State::PlainText => match slf.read_char()? {
+        State::Plaintext => match slf.read_char()? {
             Some('\0') => {
                 slf.emit_error(Error::UnexpectedNullCharacter);
                 slf.emit_char_for_source_char('\u{fffd}', '\0');
@@ -270,34 +270,34 @@ where
                 Ok(ControlToken::Eof)
             }
         },
-        State::RcDataLessThanSign => match slf.read_char()? {
+        State::RcdataLessThanSign => match slf.read_char()? {
             Some('/') => {
                 slf.temporary_buffer.clear();
-                slf.state = State::RcDataEndTagOpen;
+                slf.state = State::RcdataEndTagOpen;
                 Ok(ControlToken::Continue)
             }
             c => {
                 slf.emit_char('<');
-                slf.state = State::RcData;
+                slf.state = State::Rcdata;
                 slf.unread_char(c);
                 Ok(ControlToken::Continue)
             }
         },
-        State::RcDataEndTagOpen => match slf.read_char()? {
+        State::RcdataEndTagOpen => match slf.read_char()? {
             Some(x) if x.is_ascii_alphabetic() => {
                 slf.init_end_tag();
-                slf.state = State::RcDataEndTagName;
+                slf.state = State::RcdataEndTagName;
                 slf.unread_char(Some(x));
                 Ok(ControlToken::Continue)
             }
             c => {
                 slf.emit_chars(b"</");
-                slf.state = State::RcData;
+                slf.state = State::Rcdata;
                 slf.unread_char(c);
                 Ok(ControlToken::Continue)
             }
         },
-        State::RcDataEndTagName => match slf.read_char()? {
+        State::RcdataEndTagName => match slf.read_char()? {
             Some(whitespace_pat!()) if slf.current_end_tag_is_appropriate() => {
                 slf.state = State::BeforeAttributeName;
                 Ok(ControlToken::Continue)
@@ -320,7 +320,7 @@ where
                 slf.emit_chars(b"</");
                 slf.flush_buffer_characters();
 
-                slf.state = State::RcData;
+                slf.state = State::Rcdata;
                 slf.unread_char(c);
                 Ok(ControlToken::Continue)
             }
@@ -333,7 +333,7 @@ where
             }
             c => {
                 slf.emit_char('<');
-                slf.state = State::RawText;
+                slf.state = State::Rawtext;
                 slf.unread_char(c);
                 Ok(ControlToken::Continue)
             }
@@ -347,7 +347,7 @@ where
             }
             c => {
                 slf.emit_chars(b"</");
-                slf.state = State::RawText;
+                slf.state = State::Rawtext;
                 slf.unread_char(c);
                 Ok(ControlToken::Continue)
             }
@@ -375,7 +375,7 @@ where
                 slf.emit_chars(b"</");
                 slf.flush_buffer_characters();
 
-                slf.state = State::RawText;
+                slf.state = State::Rawtext;
                 slf.unread_char(c);
                 Ok(ControlToken::Continue)
             }
diff --git a/src/tokenizer/machine/utils.rs b/src/tokenizer/machine/utils.rs
index 4d59282..b38b8d9 100644
--- a/src/tokenizer/machine/utils.rs
+++ b/src/tokenizer/machine/utils.rs
@@ -311,16 +311,16 @@ pub(crate) use noncharacter_pat;
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
 pub enum State {
     Data,
-    RcData,
-    RawText,
+    Rcdata,
+    Rawtext,
     ScriptData,
-    PlainText,
+    Plaintext,
     TagOpen,
     EndTagOpen,
     TagName,
-    RcDataLessThanSign,
-    RcDataEndTagOpen,
-    RcDataEndTagName,
+    RcdataLessThanSign,
+    RcdataEndTagOpen,
+    RcdataEndTagName,
     RawTextLessThanSign,
     RawTextEndTagOpen,
     RawTextEndTagName,
-- 
cgit v1.2.3