RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 16:07:46 +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

2
Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateLocaleData.cpp
View file

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

4
Meta/Lagom/Tools/CodeGenerators/LibUnicode/GenerateUnicodeData.cpp
View file

@ -1071,12 +1071,12 @@ static constexpr Array<@mapping_type@, @size@> s_@name@_mappings { {
auto optional_code_point_to_string = [](auto const& code_point) -> ErrorOr<String> {
if (!code_point.has_value())
return "-1"_short_string;
return "-1"_string;
return String::number(*code_point);
};
auto first_index_to_string = [](auto const& list) -> ErrorOr<String> {
if (list.is_empty())
return "0"_short_string;
return "0"_string;
return String::number(list.first());
};

8
Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSEnums.cpp
View file

@ -65,13 +65,13 @@ enum class ValueID;
// Find the smallest possible type to use.
auto member_max_value = members.size() - 1;
if (NumericLimits<u8>::max() >= member_max_value) {
TRY(enum_generator.set("enum_type", "u8"_short_string));
TRY(enum_generator.set("enum_type", "u8"_string));
} else if (NumericLimits<u16>::max() >= member_max_value) {
TRY(enum_generator.set("enum_type", "u16"_short_string));
TRY(enum_generator.set("enum_type", "u16"_string));
} else if (NumericLimits<u32>::max() >= member_max_value) {
TRY(enum_generator.set("enum_type", "u32"_short_string));
TRY(enum_generator.set("enum_type", "u32"_string));
} else {
TRY(enum_generator.set("enum_type", "u64"_short_string));
TRY(enum_generator.set("enum_type", "u64"_string));
}
TRY(enum_generator.try_appendln("enum class @name:titlecase@ : @enum_type@ {"));

6
Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSMathFunctions.cpp
View file

@ -249,7 +249,7 @@ ErrorOr<OwnPtr<CalculationNode>> Parser::parse_math_function(PropertyID property
if (auto default_value = parameter.get_deprecated_string("default"sv); default_value.has_value()) {
TRY(parameter_generator.set("parameter_default", TRY(String::formatted(" = RoundingStrategy::{}", TRY(title_casify(default_value.value()))))));
} else {
TRY(parameter_generator.set("parameter_default", ""_short_string));
TRY(parameter_generator.set("parameter_default", ""_string));
}
} else {
// NOTE: This assumes everything not handled above is a calculation node of some kind.
@ -264,7 +264,7 @@ ErrorOr<OwnPtr<CalculationNode>> Parser::parse_math_function(PropertyID property
if (auto default_value = parameter.get_deprecated_string("default"sv); default_value.has_value()) {
TRY(parameter_generator.set("parameter_default", TRY(String::formatted(" = TRY(ConstantCalculationNode::create(CalculationNode::constant_type_from_string(\"{}\"sv).value()))", TRY(String::from_deprecated_string(default_value.value()))))));
} else {
TRY(parameter_generator.set("parameter_default", ""_short_string));
TRY(parameter_generator.set("parameter_default", ""_string));
}
}
@ -351,7 +351,7 @@ ErrorOr<OwnPtr<CalculationNode>> Parser::parse_math_function(PropertyID property
TRY(parameter_generator.set("parameter_index"sv, TRY(String::number(parameter_index))));
if (parameter_type_string == "<rounding-strategy>"sv) {
TRY(parameter_generator.set("release_value"sv, ""_short_string));
TRY(parameter_generator.set("release_value"sv, ""_string));
} else {
// NOTE: This assumes everything not handled above is a calculation node of some kind.
TRY(parameter_generator.set("release_value"sv, ".release_nonnull()"_string));

2
Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateCSSMediaFeatureID.cpp
View file

@ -145,7 +145,7 @@ bool media_feature_type_is_range(MediaFeatureID media_feature_id)
VERIFY(feature.has("type"sv));
auto feature_type = feature.get_deprecated_string("type"sv);
VERIFY(feature_type.has_value());
TRY(member_generator.set("is_range", feature_type.value() == "range" ? "true"_short_string : "false"_short_string));
TRY(member_generator.set("is_range", feature_type.value() == "range" ? "true"_string : "false"_string));
TRY(member_generator.try_append(R"~~~(
case MediaFeatureID::@name:titlecase@:
return @is_range@;)~~~"));