From 99c1b634fc80c922ca4867e4eac83b73e4c28304 Mon Sep 17 00:00:00 2001
From: Jelle Raaijmakers <jelle@gmta.nl>
Date: Sun, 18 Dec 2022 23:24:02 +0100
Subject: [PATCH] AK: Stop using `DeprecatedString` in `UUID`

---
 AK/UUID.cpp | 23 ++++++++++++-----------
 AK/UUID.h   |  4 ++--
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/AK/UUID.cpp b/AK/UUID.cpp
index 0c406b4d1e..689b0d1388 100644
--- a/AK/UUID.cpp
+++ b/AK/UUID.cpp
@@ -97,19 +97,20 @@ ErrorOr<NonnullOwnPtr<Kernel::KString>> UUID::to_string() const
     return Kernel::KString::try_create(builder.string_view());
 }
 #else
-DeprecatedString UUID::to_deprecated_string() const
+ErrorOr<String> UUID::to_string() const
 {
+    auto buffer_span = m_uuid_buffer.span();
     StringBuilder builder(36);
-    builder.append(encode_hex(m_uuid_buffer.span().trim(4)).view());
-    builder.append('-');
-    builder.append(encode_hex(m_uuid_buffer.span().slice(4).trim(2)).view());
-    builder.append('-');
-    builder.append(encode_hex(m_uuid_buffer.span().slice(6).trim(2)).view());
-    builder.append('-');
-    builder.append(encode_hex(m_uuid_buffer.span().slice(8).trim(2)).view());
-    builder.append('-');
-    builder.append(encode_hex(m_uuid_buffer.span().slice(10).trim(6)).view());
-    return builder.to_deprecated_string();
+    TRY(builder.try_append(encode_hex(buffer_span.trim(4)).view()));
+    TRY(builder.try_append('-'));
+    TRY(builder.try_append(encode_hex(buffer_span.slice(4, 2)).view()));
+    TRY(builder.try_append('-'));
+    TRY(builder.try_append(encode_hex(buffer_span.slice(6, 2)).view()));
+    TRY(builder.try_append('-'));
+    TRY(builder.try_append(encode_hex(buffer_span.slice(8, 2)).view()));
+    TRY(builder.try_append('-'));
+    TRY(builder.try_append(encode_hex(buffer_span.slice(10, 6)).view()));
+    return builder.to_string();
 }
 #endif
 
diff --git a/AK/UUID.h b/AK/UUID.h
index 89135b3007..0c88582a46 100644
--- a/AK/UUID.h
+++ b/AK/UUID.h
@@ -14,7 +14,7 @@
 #ifdef KERNEL
 #    include <Kernel/KString.h>
 #else
-#    include <AK/DeprecatedString.h>
+#    include <AK/String.h>
 #endif
 
 namespace AK {
@@ -36,7 +36,7 @@ public:
 #ifdef KERNEL
     ErrorOr<NonnullOwnPtr<Kernel::KString>> to_string() const;
 #else
-    DeprecatedString to_deprecated_string() const;
+    ErrorOr<String> to_string() const;
 #endif
     bool is_zero() const;