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

68
Userland/Libraries/LibWeb/ARIA/StateAndProperties.cpp
View file

@ -22,19 +22,19 @@ ErrorOr<String> state_or_property_to_string_value(StateAndProperties state_or_pr
value = aria_data.aria_atomic_or_default(default_value.get<bool>());
else
value = aria_data.aria_atomic_or_default();
return value ? "true"_short_string : "false"_short_string;
return value ? "true"_string : "false"_string;
}
case StateAndProperties::AriaAutoComplete: {
auto value = aria_data.aria_auto_complete_or_default();
switch (value) {
case AriaAutocomplete::None:
return "none"_short_string;
return "none"_string;
case AriaAutocomplete::List:
return "list"_short_string;
return "list"_string;
case AriaAutocomplete::Both:
return "both"_short_string;
return "both"_string;
case AriaAutocomplete::Inline:
return "inline"_short_string;
return "inline"_string;
}
VERIFY_NOT_REACHED();
}
@ -54,19 +54,19 @@ ErrorOr<String> state_or_property_to_string_value(StateAndProperties state_or_pr
auto value = aria_data.aria_current_or_default();
switch (value) {
case AriaCurrent::False:
return "false"_short_string;
return "false"_string;
case AriaCurrent::True:
return "true"_short_string;
return "true"_string;
case AriaCurrent::Date:
return "date"_short_string;
return "date"_string;
case AriaCurrent::Location:
return "location"_string;
case AriaCurrent::Page:
return "page"_short_string;
return "page"_string;
case AriaCurrent::Step:
return "step"_short_string;
return "step"_string;
case AriaCurrent::Time:
return "time"_short_string;
return "time"_string;
}
VERIFY_NOT_REACHED();
}
@ -77,7 +77,7 @@ ErrorOr<String> state_or_property_to_string_value(StateAndProperties state_or_pr
return value.has_value() ? String::from_deprecated_string(value.value()) : String::from_utf8(""sv);
}
case StateAndProperties::AriaDisabled:
return aria_data.aria_disabled_or_default() ? "true"_short_string : "false"_short_string;
return aria_data.aria_disabled_or_default() ? "true"_string : "false"_string;
case StateAndProperties::AriaDropEffect: {
StringBuilder builder;
auto value = aria_data.aria_drop_effect_or_default();
@ -126,19 +126,19 @@ ErrorOr<String> state_or_property_to_string_value(StateAndProperties state_or_pr
auto value = aria_data.aria_has_popup_or_default();
switch (value) {
case AriaHasPopup::False:
return "false"_short_string;
return "false"_string;
case AriaHasPopup::True:
return "true"_short_string;
return "true"_string;
case AriaHasPopup::Menu:
return "menu"_short_string;
return "menu"_string;
case AriaHasPopup::Listbox:
return "listbox"_string;
case AriaHasPopup::Tree:
return "tree"_short_string;
return "tree"_string;
case AriaHasPopup::Grid:
return "grid"_short_string;
return "grid"_string;
case AriaHasPopup::Dialog:
return "dialog"_short_string;
return "dialog"_string;
}
VERIFY_NOT_REACHED();
}
@ -148,13 +148,13 @@ ErrorOr<String> state_or_property_to_string_value(StateAndProperties state_or_pr
auto value = aria_data.aria_invalid_or_default();
switch (value) {
case AriaInvalid::Grammar:
return "grammar"_short_string;
return "grammar"_string;
case AriaInvalid::False:
return "false"_short_string;
return "false"_string;
case AriaInvalid::Spelling:
return "spelling"_string;
case AriaInvalid::True:
return "true"_short_string;
return "true"_string;
}
VERIFY_NOT_REACHED();
}
@ -177,18 +177,18 @@ ErrorOr<String> state_or_property_to_string_value(StateAndProperties state_or_pr
case AriaLive::Assertive:
return "assertive"_string;
case AriaLive::Off:
return "off"_short_string;
return "off"_string;
case AriaLive::Polite:
return "polite"_short_string;
return "polite"_string;
}
VERIFY_NOT_REACHED();
}
case StateAndProperties::AriaModal:
return aria_data.aria_modal_or_default() ? "true"_short_string : "false"_short_string;
return aria_data.aria_modal_or_default() ? "true"_string : "false"_string;
case StateAndProperties::AriaMultiLine:
return aria_data.aria_multi_line_or_default() ? "true"_short_string : "false"_short_string;
return aria_data.aria_multi_line_or_default() ? "true"_string : "false"_string;
case StateAndProperties::AriaMultiSelectable:
return aria_data.aria_multi_selectable_or_default() ? "true"_short_string : "false"_short_string;
return aria_data.aria_multi_selectable_or_default() ? "true"_string : "false"_string;
case StateAndProperties::AriaOrientation: {
AriaOrientation value;
if (default_value.has<AriaOrientation>())
@ -215,7 +215,7 @@ ErrorOr<String> state_or_property_to_string_value(StateAndProperties state_or_pr
case StateAndProperties::AriaPressed:
return ARIA::tristate_to_string(aria_data.aria_pressed_or_default());
case StateAndProperties::AriaReadOnly:
return aria_data.aria_read_only_or_default() ? "true"_short_string : "false"_short_string;
return aria_data.aria_read_only_or_default() ? "true"_string : "false"_string;
case StateAndProperties::AriaRelevant: {
StringBuilder builder;
auto value = aria_data.aria_relevant_or_default();
@ -269,9 +269,9 @@ ErrorOr<String> state_or_property_to_string_value(StateAndProperties state_or_pr
case AriaSort::Descending:
return "descending"_string;
case AriaSort::None:
return "none"_short_string;
return "none"_string;
case AriaSort::Other:
return "other"_short_string;
return "other"_string;
}
VERIFY_NOT_REACHED();
}
@ -297,13 +297,13 @@ ErrorOr<String> tristate_to_string(Tristate value)
{
switch (value) {
case Tristate::False:
return "false"_short_string;
return "false"_string;
case Tristate::True:
return "true"_short_string;
return "true"_string;
case Tristate::Undefined:
return "undefined"_string;
case Tristate::Mixed:
return "mixed"_short_string;
return "mixed"_string;
}
VERIFY_NOT_REACHED();
}
@ -320,8 +320,8 @@ ErrorOr<String> optional_bool_to_string(Optional<bool> value)
if (!value.has_value())
return "undefined"_string;
if (value.value())
return "true"_short_string;
return "false"_short_string;
return "true"_string;
return "false"_string;
}
ErrorOr<String> optional_number_to_string(Optional<f64> value)

22
Userland/Libraries/LibWeb/CSS/Parser/Token.cpp
View file

@ -49,29 +49,29 @@ ErrorOr<String> Token::to_string() const
case Type::Dimension:
return String::formatted("{}{}", m_number_value.value(), dimension_unit());
case Type::Whitespace:
return " "_short_string;
return " "_string;
case Type::CDO:
return "<!--"_string;
case Type::CDC:
return "-->"_short_string;
return "-->"_string;
case Type::Colon:
return ":"_short_string;
return ":"_string;
case Type::Semicolon:
return ";"_short_string;
return ";"_string;
case Type::Comma:
return ","_short_string;
return ","_string;
case Type::OpenSquare:
return "["_short_string;
return "["_string;
case Type::CloseSquare:
return "]"_short_string;
return "]"_string;
case Type::OpenParen:
return "("_short_string;
return "("_string;
case Type::CloseParen:
return ")"_short_string;
return ")"_string;
case Type::OpenCurly:
return "{"_short_string;
return "{"_string;
case Type::CloseCurly:
return "}"_short_string;
return "}"_string;
case Type::Invalid:
default:
VERIFY_NOT_REACHED();

4
Userland/Libraries/LibWeb/CSS/StyleValues/CalculatedStyleValue.cpp
View file

@ -993,9 +993,9 @@ ErrorOr<String> ConstantCalculationNode::to_string() const
{
switch (m_constant) {
case CalculationNode::ConstantType::E:
return "e"_short_string;
return "e"_string;
case CalculationNode::ConstantType::Pi:
return "pi"_short_string;
return "pi"_string;
case CalculationNode::ConstantType::Infinity:
return "infinity"_string;
case CalculationNode::ConstantType::MinusInfinity:

2
Userland/Libraries/LibWeb/Dump.cpp
View file

@ -731,7 +731,7 @@ void dump_font_face_rule(StringBuilder& builder, CSS::CSSFontFaceRule const& rul
builder.append("sources:\n"sv);
for (auto const& source : font_face.sources()) {
indent(builder, indent_levels + 2);
builder.appendff("url={}, format={}\n", source.url, source.format.value_or("???"_short_string));
builder.appendff("url={}, format={}\n", source.url, source.format.value_or("???"_string));
}
indent(builder, indent_levels + 1);

2
Userland/Libraries/LibWeb/Fetch/Fetching/Checks.cpp
View file

@ -56,7 +56,7 @@ ErrorOr<bool> tao_check(Infrastructure::Request const& request, Infrastructure::
auto values = TRY(response.header_list()->get_decode_and_split("Timing-Allow-Origin"sv.bytes()));
// 3. If values contains "*", then return success.
if (values.has_value() && values->contains_slow("*"_short_string))
if (values.has_value() && values->contains_slow("*"_string))
return true;
// 4. If values contains the result of serializing a request origin with request, then return success.

2
Userland/Libraries/LibWeb/HTML/BrowsingContext.cpp
View file

@ -1142,7 +1142,7 @@ WebIDL::ExceptionOr<void> BrowsingContext::navigate(
} else {
// Otherwise let navigation id be the result of generating a random UUID. [UUID]
// FIXME: Generate a UUID.
navigation_id = "FIXME"_short_string;
navigation_id = "FIXME"_string;
}
}

2
Userland/Libraries/LibWeb/HTML/MimeType.cpp
View file

@ -46,7 +46,7 @@ String MimeType::description() const
String const& MimeType::suffixes() const
{
// The MimeType interface's suffixes getter steps are to return "pdf".
static String suffixes_string = "pdf"_short_string;
static String suffixes_string = "pdf"_string;
return suffixes_string;
}

2
Userland/Libraries/LibWeb/IntersectionObserver/IntersectionObserver.h
View file

@ -15,7 +15,7 @@ namespace Web::IntersectionObserver {
struct IntersectionObserverInit {
Optional<Variant<JS::Handle<DOM::Element>, JS::Handle<DOM::Document>>> root;
String root_margin { "0px"_short_string };
String root_margin { "0px"_string };
Variant<double, Vector<double>> threshold { 0 };
};

2
Userland/Libraries/LibWeb/XHR/XMLHttpRequest.cpp
View file

@ -267,7 +267,7 @@ ErrorOr<MimeSniff::MimeType> XMLHttpRequest::get_response_mime_type() const
// 2. If mimeType is failure, then set mimeType to text/xml.
if (!mime_type.has_value())
return MimeSniff::MimeType::create("text"_string, "xml"_short_string);
return MimeSniff::MimeType::create("text"_string, "xml"_string);
// 3. Return mimeType.
return mime_type.release_value();