Everywhere: Use _{short_,}string to create Strings from literals

Author: linusg

Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateLocaleData.cpp

@@ -1375,7 +1375,7 @@ static LanguageMapping const* resolve_likely_subtag(LanguageID const& language_i
             if (!language_id.script.has_value())
                 continue;
 
-            search_key.language = String::from_utf8_short_string("und"sv);
+            search_key.language = "und"_short_string;
             search_key.script = *language_id.script;
             break;
 

Tests/AK/TestFlyString.cpp

@@ -22,13 +22,13 @@ TEST_CASE(empty_string)
 
 TEST_CASE(short_string)
 {
-    FlyString fly1 { MUST(String::from_utf8("foo"sv)) };
+    FlyString fly1 { MUST("foo"_string) };
     EXPECT_EQ(fly1, "foo"sv);
 
-    FlyString fly2 { MUST(String::from_utf8("foo"sv)) };
+    FlyString fly2 { MUST("foo"_string) };
     EXPECT_EQ(fly2, "foo"sv);
 
-    FlyString fly3 { MUST(String::from_utf8("bar"sv)) };
+    FlyString fly3 { MUST("bar"_string) };
     EXPECT_EQ(fly3, "bar"sv);
 
     EXPECT_EQ(fly1, fly2);
@@ -45,15 +45,15 @@ TEST_CASE(short_string)
 
 TEST_CASE(long_string)
 {
-    FlyString fly1 { MUST(String::from_utf8("thisisdefinitelymorethan7bytes"sv)) };
+    FlyString fly1 { MUST("thisisdefinitelymorethan7bytes"_string) };
     EXPECT_EQ(fly1, "thisisdefinitelymorethan7bytes"sv);
     EXPECT_EQ(FlyString::number_of_fly_strings(), 1u);
 
-    FlyString fly2 { MUST(String::from_utf8("thisisdefinitelymorethan7bytes"sv)) };
+    FlyString fly2 { MUST("thisisdefinitelymorethan7bytes"_string) };
     EXPECT_EQ(fly2, "thisisdefinitelymorethan7bytes"sv);
     EXPECT_EQ(FlyString::number_of_fly_strings(), 1u);
 
-    FlyString fly3 { MUST(String::from_utf8("thisisalsoforsuremorethan7bytes"sv)) };
+    FlyString fly3 { MUST("thisisalsoforsuremorethan7bytes"_string) };
     EXPECT_EQ(fly3, "thisisalsoforsuremorethan7bytes"sv);
     EXPECT_EQ(FlyString::number_of_fly_strings(), 2u);
 
@@ -68,15 +68,15 @@ TEST_CASE(long_string)
 
 TEST_CASE(from_string_view)
 {
-    auto fly1 = MUST(FlyString::from_utf8("thisisdefinitelymorethan7bytes"sv));
+    auto fly1 = MUST("thisisdefinitelymorethan7bytes"_fly_string);
     EXPECT_EQ(fly1, "thisisdefinitelymorethan7bytes"sv);
     EXPECT_EQ(FlyString::number_of_fly_strings(), 1u);
 
-    auto fly2 = MUST(FlyString::from_utf8("thisisdefinitelymorethan7bytes"sv));
+    auto fly2 = MUST("thisisdefinitelymorethan7bytes"_fly_string);
     EXPECT_EQ(fly2, "thisisdefinitelymorethan7bytes"sv);
     EXPECT_EQ(FlyString::number_of_fly_strings(), 1u);
 
-    auto fly3 = MUST(FlyString::from_utf8("foo"sv));
+    auto fly3 = MUST("foo"_fly_string);
     EXPECT_EQ(fly3, "foo"sv);
     EXPECT_EQ(FlyString::number_of_fly_strings(), 1u);
 
@@ -91,7 +91,7 @@ TEST_CASE(fly_string_keep_string_data_alive)
     {
         FlyString fly {};
         {
-            auto string = MUST(String::from_utf8("thisisdefinitelymorethan7bytes"sv));
+            auto string = MUST("thisisdefinitelymorethan7bytes"_string);
             fly = FlyString { string };
             EXPECT_EQ(FlyString::number_of_fly_strings(), 1u);
         }
@@ -108,7 +108,7 @@ TEST_CASE(moved_fly_string_becomes_empty)
     FlyString fly1 {};
     EXPECT(fly1.is_empty());
 
-    FlyString fly2 { MUST(String::from_utf8("thisisdefinitelymorethan7bytes"sv)) };
+    FlyString fly2 { MUST("thisisdefinitelymorethan7bytes"_string) };
     EXPECT_EQ(fly2, "thisisdefinitelymorethan7bytes"sv);
     EXPECT_EQ(FlyString::number_of_fly_strings(), 1u);
 

Tests/AK/TestHashMap.cpp

@@ -227,11 +227,11 @@ TEST_CASE(take)
 
     EXPECT(!map.take("foo"sv).has_value());
     EXPECT(!map.take("bar"sv).has_value());
-    EXPECT(!map.take(String::from_utf8_short_string("baz"sv)).has_value());
+    EXPECT(!map.take("baz"_short_string).has_value());
 
-    map.set(String::from_utf8_short_string("foo"sv), 1);
-    map.set(String::from_utf8_short_string("bar"sv), 2);
-    map.set(String::from_utf8_short_string("baz"sv), 3);
+    map.set("foo"_short_string, 1);
+    map.set("bar"_short_string, 2);
+    map.set("baz"_short_string, 3);
 
     auto foo = map.take("foo"sv);
     EXPECT_EQ(foo, 1);
@@ -245,9 +245,9 @@ TEST_CASE(take)
     bar = map.take("bar"sv);
     EXPECT(!bar.has_value());
 
-    auto baz = map.take(String::from_utf8_short_string("baz"sv));
+    auto baz = map.take("baz"_short_string);
     EXPECT_EQ(baz, 3);
 
-    baz = map.take(String::from_utf8_short_string("baz"sv));
+    baz = map.take("baz"_short_string);
     EXPECT(!baz.has_value());
 }