AK: De-duplicate the definition of the JSON value variant

Author: https://github.com/trflynn89
Commit: a8bc0aed4a
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/3631
Reviewed-by: https://github.com/awesomekling ✅

AK/JsonValue.cpp

@@ -13,28 +13,16 @@
 
 namespace AK {
 
-namespace {
+static ErrorOr<JsonValue::Storage> clone(JsonValue::Storage const& other)
-using JsonValueStorage = Variant<
-    Empty,
-    bool,
-    i64,
-    u64,
-    double,
-    ByteString,
-    NonnullOwnPtr<JsonArray>,
-    NonnullOwnPtr<JsonObject>>;
-
-static ErrorOr<JsonValueStorage> clone(JsonValueStorage const& other)
 {
     return other.visit(
-        [](NonnullOwnPtr<JsonArray> const& value) -> ErrorOr<JsonValueStorage> {
+        [](NonnullOwnPtr<JsonArray> const& value) -> ErrorOr<JsonValue::Storage> {
             return TRY(try_make<JsonArray>(*value));
         },
-        [](NonnullOwnPtr<JsonObject> const& value) -> ErrorOr<JsonValueStorage> {
+        [](NonnullOwnPtr<JsonObject> const& value) -> ErrorOr<JsonValue::Storage> {
             return TRY(try_make<JsonObject>(*value));
         },
-        [](auto const& value) -> ErrorOr<JsonValueStorage> { return JsonValueStorage(value); });
+        [](auto const& value) -> ErrorOr<JsonValue::Storage> { return JsonValue::Storage(value); });
-}
 }
 
 JsonValue::JsonValue() = default;

AK/JsonValue.h

@@ -9,8 +9,8 @@
 
 #include <AK/ByteString.h>
 #include <AK/Forward.h>
+#include <AK/NonnullOwnPtr.h>
 #include <AK/Optional.h>
-#include <AK/OwnPtr.h>
 #include <AK/StringBuilder.h>
 
 namespace AK {
@@ -26,6 +26,16 @@ public:
         Object,
     };
 
+    using Storage = Variant<
+        Empty,
+        bool,
+        i64,
+        u64,
+        double,
+        ByteString,
+        NonnullOwnPtr<JsonArray>,
+        NonnullOwnPtr<JsonObject>>;
+
     static ErrorOr<JsonValue> from_string(StringView);
 
     JsonValue();
@@ -222,16 +232,7 @@ public:
     bool equals(JsonValue const& other) const;
 
 private:
-    Variant<
+    Storage m_value;
-        Empty,
-        bool,
-        i64,
-        u64,
-        double,
-        ByteString,
-        NonnullOwnPtr<JsonArray>,
-        NonnullOwnPtr<JsonObject>>
-        m_value;
 };
 
 template<>