RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 13:57:36 +00:00
Code Issues Activity Actions

Userland: Prefer _string over _short_string

Browse source 
As `_string` can't fail anymore (since 3434412), there are no real
benefits to use the short variant in most cases.
This commit is contained in:
Lucas CHOLLET 2023-08-07 22:26:17 -04:00 • committed by Andreas Kling
parent a5edc9cdfc
commit 3f35ffb648
198 changed files with 684 additions and 684 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Tests/AK/TestHashMap.cpp
View file

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

100
Tests/AK/TestString.cpp
View file

@ -638,7 +638,7 @@ TEST_CASE(join)
auto string5 = MUST(String::join(',', Array { 1, 2, 3 }, "[{}]"sv));
EXPECT_EQ(string5, "[1],[2],[3]"sv);
auto string6 = MUST(String::join("!!!"_short_string, Array { "foo"sv, "bar"sv, "baz"sv }));
auto string6 = MUST(String::join("!!!"_string, Array { "foo"sv, "bar"sv, "baz"sv }));
EXPECT_EQ(string6, "foo!!!bar!!!baz"sv);
auto string7 = MUST(String::join(" - "sv, Array { 1, 16, 256, 4096 }, "[{:#04x}]"sv));
@ -763,28 +763,28 @@ TEST_CASE(contains)
EXPECT(!String {}.contains(" "sv));
EXPECT(!String {}.contains(0));
EXPECT("a"_short_string.contains("a"sv));
EXPECT(!"a"_short_string.contains({}));
EXPECT(!"a"_short_string.contains("b"sv));
EXPECT(!"a"_short_string.contains("ab"sv));
EXPECT("a"_string.contains("a"sv));
EXPECT(!"a"_string.contains({}));
EXPECT(!"a"_string.contains("b"sv));
EXPECT(!"a"_string.contains("ab"sv));
EXPECT("a"_short_string.contains(0x0061));
EXPECT(!"a"_short_string.contains(0x0062));
EXPECT("a"_string.contains(0x0061));
EXPECT(!"a"_string.contains(0x0062));
EXPECT("abc"_short_string.contains("a"sv));
EXPECT("abc"_short_string.contains("b"sv));
EXPECT("abc"_short_string.contains("c"sv));
EXPECT("abc"_short_string.contains("ab"sv));
EXPECT("abc"_short_string.contains("bc"sv));
EXPECT("abc"_short_string.contains("abc"sv));
EXPECT(!"abc"_short_string.contains({}));
EXPECT(!"abc"_short_string.contains("ac"sv));
EXPECT(!"abc"_short_string.contains("abcd"sv));
EXPECT("abc"_string.contains("a"sv));
EXPECT("abc"_string.contains("b"sv));
EXPECT("abc"_string.contains("c"sv));
EXPECT("abc"_string.contains("ab"sv));
EXPECT("abc"_string.contains("bc"sv));
EXPECT("abc"_string.contains("abc"sv));
EXPECT(!"abc"_string.contains({}));
EXPECT(!"abc"_string.contains("ac"sv));
EXPECT(!"abc"_string.contains("abcd"sv));
EXPECT("abc"_short_string.contains(0x0061));
EXPECT("abc"_short_string.contains(0x0062));
EXPECT("abc"_short_string.contains(0x0063));
EXPECT(!"abc"_short_string.contains(0x0064));
EXPECT("abc"_string.contains(0x0061));
EXPECT("abc"_string.contains(0x0062));
EXPECT("abc"_string.contains(0x0063));
EXPECT(!"abc"_string.contains(0x0064));
auto emoji = "😀"_string;
EXPECT(emoji.contains("\xF0"sv));
@ -809,24 +809,24 @@ TEST_CASE(starts_with)
EXPECT(!String {}.starts_with_bytes(" "sv));
EXPECT(!String {}.starts_with(0));
EXPECT("a"_short_string.starts_with_bytes({}));
EXPECT("a"_short_string.starts_with_bytes("a"sv));
EXPECT(!"a"_short_string.starts_with_bytes("b"sv));
EXPECT(!"a"_short_string.starts_with_bytes("ab"sv));
EXPECT("a"_string.starts_with_bytes({}));
EXPECT("a"_string.starts_with_bytes("a"sv));
EXPECT(!"a"_string.starts_with_bytes("b"sv));
EXPECT(!"a"_string.starts_with_bytes("ab"sv));
EXPECT("a"_short_string.starts_with(0x0061));
EXPECT(!"a"_short_string.starts_with(0x0062));
EXPECT("a"_string.starts_with(0x0061));
EXPECT(!"a"_string.starts_with(0x0062));
EXPECT("abc"_short_string.starts_with_bytes({}));
EXPECT("abc"_short_string.starts_with_bytes("a"sv));
EXPECT("abc"_short_string.starts_with_bytes("ab"sv));
EXPECT("abc"_short_string.starts_with_bytes("abc"sv));
EXPECT(!"abc"_short_string.starts_with_bytes("b"sv));
EXPECT(!"abc"_short_string.starts_with_bytes("bc"sv));
EXPECT("abc"_string.starts_with_bytes({}));
EXPECT("abc"_string.starts_with_bytes("a"sv));
EXPECT("abc"_string.starts_with_bytes("ab"sv));
EXPECT("abc"_string.starts_with_bytes("abc"sv));
EXPECT(!"abc"_string.starts_with_bytes("b"sv));
EXPECT(!"abc"_string.starts_with_bytes("bc"sv));
EXPECT("abc"_short_string.starts_with(0x0061));
EXPECT(!"abc"_short_string.starts_with(0x0062));
EXPECT(!"abc"_short_string.starts_with(0x0063));
EXPECT("abc"_string.starts_with(0x0061));
EXPECT(!"abc"_string.starts_with(0x0062));
EXPECT(!"abc"_string.starts_with(0x0063));
auto emoji = "😀🙃"_string;
EXPECT(emoji.starts_with_bytes("\xF0"sv));
@ -850,24 +850,24 @@ TEST_CASE(ends_with)
EXPECT(!String {}.ends_with_bytes(" "sv));
EXPECT(!String {}.ends_with(0));
EXPECT("a"_short_string.ends_with_bytes({}));
EXPECT("a"_short_string.ends_with_bytes("a"sv));
EXPECT(!"a"_short_string.ends_with_bytes("b"sv));
EXPECT(!"a"_short_string.ends_with_bytes("ba"sv));
EXPECT("a"_string.ends_with_bytes({}));
EXPECT("a"_string.ends_with_bytes("a"sv));
EXPECT(!"a"_string.ends_with_bytes("b"sv));
EXPECT(!"a"_string.ends_with_bytes("ba"sv));
EXPECT("a"_short_string.ends_with(0x0061));
EXPECT(!"a"_short_string.ends_with(0x0062));
EXPECT("a"_string.ends_with(0x0061));
EXPECT(!"a"_string.ends_with(0x0062));
EXPECT("abc"_short_string.ends_with_bytes({}));
EXPECT("abc"_short_string.ends_with_bytes("c"sv));
EXPECT("abc"_short_string.ends_with_bytes("bc"sv));
EXPECT("abc"_short_string.ends_with_bytes("abc"sv));
EXPECT(!"abc"_short_string.ends_with_bytes("b"sv));
EXPECT(!"abc"_short_string.ends_with_bytes("ab"sv));
EXPECT("abc"_string.ends_with_bytes({}));
EXPECT("abc"_string.ends_with_bytes("c"sv));
EXPECT("abc"_string.ends_with_bytes("bc"sv));
EXPECT("abc"_string.ends_with_bytes("abc"sv));
EXPECT(!"abc"_string.ends_with_bytes("b"sv));
EXPECT(!"abc"_string.ends_with_bytes("ab"sv));
EXPECT("abc"_short_string.ends_with(0x0063));
EXPECT(!"abc"_short_string.ends_with(0x0062));
EXPECT(!"abc"_short_string.ends_with(0x0061));
EXPECT("abc"_string.ends_with(0x0063));
EXPECT(!"abc"_string.ends_with(0x0062));
EXPECT(!"abc"_string.ends_with(0x0061));
auto emoji = "😀🙃"_string;
EXPECT(emoji.ends_with_bytes("\x83"sv));