RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 15:37:46 +00:00
Code Issues Activity Actions

LibUnicode: Return a String from Unicode normalization

Browse source
This commit is contained in:
Timothy Flynn 2023-01-14 09:52:38 -05:00 • committed by Linus Groh
parent c9056b824e
commit 58bc831750
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Libraries/LibUnicode/Normalize.cpp
View file

@ -302,7 +302,7 @@ static ErrorOr<Vector<u32>> normalize_implementation(Utf8View string, Normalizat
VERIFY_NOT_REACHED(); VERIFY_NOT_REACHED();
} }
ErrorOr<DeprecatedString> normalize(StringView string, NormalizationForm form) ErrorOr<String> normalize(StringView string, NormalizationForm form)
{ {
auto const code_points = TRY(normalize_implementation(Utf8View { string }, form)); auto const code_points = TRY(normalize_implementation(Utf8View { string }, form));
@ -310,7 +310,7 @@ ErrorOr<DeprecatedString> normalize(StringView string, NormalizationForm form)
for (auto code_point : code_points) for (auto code_point : code_points)
TRY(builder.try_append_code_point(code_point)); TRY(builder.try_append_code_point(code_point));
return builder.to_deprecated_string(); return builder.to_string();
} }
} }

4
Userland/Libraries/LibUnicode/Normalize.h
View file

@ -6,11 +6,11 @@
#pragma once #pragma once
#include <AK/DeprecatedString.h>
#include <AK/Error.h> #include <AK/Error.h>
#include <AK/Forward.h> #include <AK/Forward.h>
#include <AK/Optional.h> #include <AK/Optional.h>
#include <AK/Span.h> #include <AK/Span.h>
#include <AK/String.h>
#include <AK/StringView.h> #include <AK/StringView.h>
#include <LibUnicode/Forward.h> #include <LibUnicode/Forward.h>
@ -29,6 +29,6 @@ enum class NormalizationForm {
NormalizationForm normalization_form_from_string(StringView form); NormalizationForm normalization_form_from_string(StringView form);
StringView normalization_form_to_string(NormalizationForm form); StringView normalization_form_to_string(NormalizationForm form);
ErrorOr<DeprecatedString> normalize(StringView string, NormalizationForm form); ErrorOr<String> normalize(StringView string, NormalizationForm form);
} }