From 1f8d72da8e19da94978bbf3502b4fc1f27715773 Mon Sep 17 00:00:00 2001
From: Shannon Booth <shannon@serenityos.org>
Date: Sun, 5 Nov 2023 11:45:55 +1300
Subject: [PATCH] LibWeb: Port HTMLToken::to_deprecated_string to new AK String

---
 Tests/LibWeb/TestHTMLTokenizer.cpp                            | 2 +-
 Userland/Libraries/LibWeb/HTML/Parser/HTMLParser.cpp          | 2 +-
 Userland/Libraries/LibWeb/HTML/Parser/HTMLToken.cpp           | 4 ++--
 Userland/Libraries/LibWeb/HTML/Parser/HTMLToken.h             | 4 +---
 .../LibWeb/HTML/SyntaxHighlighter/SyntaxHighlighter.cpp       | 2 +-
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Tests/LibWeb/TestHTMLTokenizer.cpp b/Tests/LibWeb/TestHTMLTokenizer.cpp
index 15a01a85b6..b4ac3b0fbf 100644
--- a/Tests/LibWeb/TestHTMLTokenizer.cpp
+++ b/Tests/LibWeb/TestHTMLTokenizer.cpp
@@ -91,7 +91,7 @@ static u32 hash_tokens(Vector<Token> const& tokens)
 {
     StringBuilder builder;
     for (auto& token : tokens)
-        builder.append(token.to_deprecated_string());
+        builder.append(token.to_string());
     return (u32)builder.string_view().hash();
 }
 
diff --git a/Userland/Libraries/LibWeb/HTML/Parser/HTMLParser.cpp b/Userland/Libraries/LibWeb/HTML/Parser/HTMLParser.cpp
index 24bb160e2f..1ad7edbe96 100644
--- a/Userland/Libraries/LibWeb/HTML/Parser/HTMLParser.cpp
+++ b/Userland/Libraries/LibWeb/HTML/Parser/HTMLParser.cpp
@@ -179,7 +179,7 @@ void HTMLParser::run()
             break;
         auto& token = optional_token.value();
 
-        dbgln_if(HTML_PARSER_DEBUG, "[{}] {}", insertion_mode_name(), token.to_deprecated_string());
+        dbgln_if(HTML_PARSER_DEBUG, "[{}] {}", insertion_mode_name(), token.to_string());
 
         // https://html.spec.whatwg.org/multipage/parsing.html#tree-construction-dispatcher
         // As each token is emitted from the tokenizer, the user agent must follow the appropriate steps from the following list, known as the tree construction dispatcher:
diff --git a/Userland/Libraries/LibWeb/HTML/Parser/HTMLToken.cpp b/Userland/Libraries/LibWeb/HTML/Parser/HTMLToken.cpp
index f77a6f91da..27e256d977 100644
--- a/Userland/Libraries/LibWeb/HTML/Parser/HTMLToken.cpp
+++ b/Userland/Libraries/LibWeb/HTML/Parser/HTMLToken.cpp
@@ -8,7 +8,7 @@
 
 namespace Web::HTML {
 
-DeprecatedString HTMLToken::to_deprecated_string() const
+String HTMLToken::to_string() const
 {
     StringBuilder builder;
 
@@ -70,7 +70,7 @@ DeprecatedString HTMLToken::to_deprecated_string() const
         builder.appendff("@{}:{}-{}:{}", m_start_position.line, m_start_position.column, m_end_position.line, m_end_position.column);
     }
 
-    return builder.to_deprecated_string();
+    return MUST(builder.to_string());
 }
 
 }
diff --git a/Userland/Libraries/LibWeb/HTML/Parser/HTMLToken.h b/Userland/Libraries/LibWeb/HTML/Parser/HTMLToken.h
index 33739f7dcc..2b1c23779e 100644
--- a/Userland/Libraries/LibWeb/HTML/Parser/HTMLToken.h
+++ b/Userland/Libraries/LibWeb/HTML/Parser/HTMLToken.h
@@ -7,8 +7,6 @@
 
 #pragma once
 
-#include <AK/DeprecatedFlyString.h>
-#include <AK/DeprecatedString.h>
 #include <AK/FlyString.h>
 #include <AK/Function.h>
 #include <AK/OwnPtr.h>
@@ -322,7 +320,7 @@ public:
 
     Type type() const { return m_type; }
 
-    DeprecatedString to_deprecated_string() const;
+    String to_string() const;
 
     Position const& start_position() const { return m_start_position; }
     Position const& end_position() const { return m_end_position; }
diff --git a/Userland/Libraries/LibWeb/HTML/SyntaxHighlighter/SyntaxHighlighter.cpp b/Userland/Libraries/LibWeb/HTML/SyntaxHighlighter/SyntaxHighlighter.cpp
index 73e8392598..311076db78 100644
--- a/Userland/Libraries/LibWeb/HTML/SyntaxHighlighter/SyntaxHighlighter.cpp
+++ b/Userland/Libraries/LibWeb/HTML/SyntaxHighlighter/SyntaxHighlighter.cpp
@@ -73,7 +73,7 @@ void SyntaxHighlighter::rehighlight(Palette const& palette)
         auto token = tokenizer.next_token();
         if (!token.has_value() || token.value().is_end_of_file())
             break;
-        dbgln_if(SYNTAX_HIGHLIGHTING_DEBUG, "(HTML::SyntaxHighlighter) got token of type {}", token->to_deprecated_string());
+        dbgln_if(SYNTAX_HIGHLIGHTING_DEBUG, "(HTML::SyntaxHighlighter) got token of type {}", token->to_string());
 
         if (token->is_start_tag()) {
             if (token->tag_name() == "script"sv) {