diff --git a/Userland/Libraries/LibWeb/CSS/Serialize.cpp b/Userland/Libraries/LibWeb/CSS/Serialize.cpp index fee6e61de4..22d6d9e512 100644 --- a/Userland/Libraries/LibWeb/CSS/Serialize.cpp +++ b/Userland/Libraries/LibWeb/CSS/Serialize.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, Sam Atkins + * Copyright (c) 2021-2023, Sam Atkins * * SPDX-License-Identifier: BSD-2-Clause */ @@ -131,7 +131,7 @@ void serialize_a_local(StringBuilder& builder, StringView path) void serialize_unicode_ranges(StringBuilder& builder, Vector const& unicode_ranges) { serialize_a_comma_separated_list(builder, unicode_ranges, [&](UnicodeRange unicode_range) { - serialize_a_string(builder, unicode_range.to_deprecated_string()); + serialize_a_string(builder, unicode_range.to_string().release_value_but_fixme_should_propagate_errors()); }); } diff --git a/Userland/Libraries/LibWeb/CSS/UnicodeRange.h b/Userland/Libraries/LibWeb/CSS/UnicodeRange.h index 4443e3d6cb..76c829eae2 100644 --- a/Userland/Libraries/LibWeb/CSS/UnicodeRange.h +++ b/Userland/Libraries/LibWeb/CSS/UnicodeRange.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, Sam Atkins + * Copyright (c) 2022-2023, Sam Atkins * * SPDX-License-Identifier: BSD-2-Clause */ @@ -7,7 +7,7 @@ #pragma once #include -#include +#include namespace Web::CSS { @@ -29,11 +29,11 @@ public: return m_min_code_point <= code_point && code_point <= m_max_code_point; } - DeprecatedString to_deprecated_string() const + ErrorOr to_string() const { if (m_min_code_point == m_max_code_point) - return DeprecatedString::formatted("U+{:x}", m_min_code_point); - return DeprecatedString::formatted("U+{:x}-{:x}", m_min_code_point, m_max_code_point); + return String::formatted("U+{:x}", m_min_code_point); + return String::formatted("U+{:x}-{:x}", m_min_code_point, m_max_code_point); } private: diff --git a/Userland/Libraries/LibWeb/Dump.cpp b/Userland/Libraries/LibWeb/Dump.cpp index 4f02ccc9ef..518178c7c6 100644 --- a/Userland/Libraries/LibWeb/Dump.cpp +++ b/Userland/Libraries/LibWeb/Dump.cpp @@ -606,7 +606,7 @@ void dump_font_face_rule(StringBuilder& builder, CSS::CSSFontFaceRule const& rul builder.append("unicode-ranges:\n"sv); for (auto const& unicode_range : font_face.unicode_ranges()) { indent(builder, indent_levels + 2); - builder.appendff("{}\n", unicode_range.to_deprecated_string()); + builder.appendff("{}\n", unicode_range.to_string().release_value_but_fixme_should_propagate_errors()); } }