Everywhere: Remove AK::StringView(char const*) :^)

AK/CheckedFormatString.h

@@ -147,7 +147,7 @@ template<typename... Args>
 struct CheckedFormatString {
     template<size_t N>
     consteval CheckedFormatString(char const (&fmt)[N])
-        : m_string { fmt }
+        : m_string { fmt, N - 1 }
     {
 #ifdef ENABLE_COMPILETIME_FORMAT_CHECK
         check_format_parameter_consistency<N, sizeof...(Args)>(fmt);

AK/DateConstants.h

@@ -12,29 +12,29 @@
 namespace AK {
 
 static constexpr Array<StringView, 7> long_day_names = {
-    "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"
+    "Sunday"sv, "Monday"sv, "Tuesday"sv, "Wednesday"sv, "Thursday"sv, "Friday"sv, "Saturday"sv
 };
 
 static constexpr Array<StringView, 7> short_day_names = {
-    "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
+    "Sun"sv, "Mon"sv, "Tue"sv, "Wed"sv, "Thu"sv, "Fri"sv, "Sat"sv
 };
 
 static constexpr Array<StringView, 7> mini_day_names = {
-    "Su", "Mo", "Tu", "We", "Th", "Fr", "Sa"
+    "Su"sv, "Mo"sv, "Tu"sv, "We"sv, "Th"sv, "Fr"sv, "Sa"sv
 };
 
 static constexpr Array<StringView, 7> micro_day_names = {
-    "S", "M", "T", "W", "T", "F", "S"
+    "S"sv, "M"sv, "T"sv, "W"sv, "T"sv, "F"sv, "S"sv
 };
 
 static constexpr Array<StringView, 12> long_month_names = {
-    "January", "February", "March", "April", "May", "June",
-    "July", "August", "September", "October", "November", "December"
+    "January"sv, "February"sv, "March"sv, "April"sv, "May"sv, "June"sv,
+    "July"sv, "August"sv, "September"sv, "October"sv, "November"sv, "December"sv
 };
 
 static constexpr Array<StringView, 12> short_month_names = {
-    "Jan", "Feb", "Mar", "Apr", "May", "Jun",
-    "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
+    "Jan"sv, "Feb"sv, "Mar"sv, "Apr"sv, "May"sv, "Jun"sv,
+    "Jul"sv, "Aug"sv, "Sep"sv, "Oct"sv, "Nov"sv, "Dec"sv
 };
 
 }

AK/Demangle.h

@@ -18,7 +18,7 @@ inline String demangle(StringView name)
 {
     int status = 0;
     auto* demangled_name = abi::__cxa_demangle(name.to_string().characters(), nullptr, nullptr, &status);
-    auto string = String(status == 0 ? demangled_name : name);
+    auto string = String(status == 0 ? StringView { demangled_name, strlen(demangled_name) } : name);
     if (status == 0)
         free(demangled_name);
     return string;

AK/Error.h

@@ -24,7 +24,19 @@ class Error {
 public:
     static Error from_errno(int code) { return Error(code); }
     static Error from_syscall(StringView syscall_name, int rc) { return Error(syscall_name, rc); }
-    static Error from_string_literal(StringView string_literal) { return Error(string_literal); }
+    static Error from_string_view(StringView string_literal) { return Error(string_literal); }
+
+    // NOTE: Prefer `from_string_literal` when directly typing out an error message:
+    //
+    //     return Error::from_string_literal("Class: Some failure");
+    //
+    // If you need to return a static string based on a dynamic condition (like
+    // picking an error from an array), then prefer `from_string_view` instead.
+    template<size_t N>
+    ALWAYS_INLINE static Error from_string_literal(char const (&string_literal)[N])
+    {
+        return from_string_view(StringView { string_literal, N - 1 });
+    }
 
     bool operator==(Error const& other) const
     {

AK/Format.cpp

@@ -114,7 +114,7 @@ StringView FormatParser::consume_literal()
         if (consume_specific("}}"))
             continue;
 
-        if (next_is(is_any_of("{}")))
+        if (next_is(is_any_of("{}"sv)))
             return m_input.substring_view(begin, tell() - begin);
 
         consume();
@@ -170,7 +170,7 @@ bool FormatParser::consume_specifier(FormatSpecifier& specifier)
         if (!consume_specific('}'))
             VERIFY_NOT_REACHED();
 
-        specifier.flags = "";
+        specifier.flags = ""sv;
     }
 
     return true;
@@ -287,16 +287,16 @@ ErrorOr<void> FormatBuilder::put_u64(
         if (prefix) {
             if (base == 2) {
                 if (upper_case)
-                    TRY(m_builder.try_append("0B"));
+                    TRY(m_builder.try_append("0B"sv));
                 else
-                    TRY(m_builder.try_append("0b"));
+                    TRY(m_builder.try_append("0b"sv));
             } else if (base == 8) {
-                TRY(m_builder.try_append("0"));
+                TRY(m_builder.try_append("0"sv));
             } else if (base == 16) {
                 if (upper_case)
-                    TRY(m_builder.try_append("0X"));
+                    TRY(m_builder.try_append("0X"sv));
                 else
-                    TRY(m_builder.try_append("0x"));
+                    TRY(m_builder.try_append("0x"sv));
             }
         }
         return {};
@@ -587,8 +587,8 @@ ErrorOr<void> vformat(StringBuilder& builder, StringView fmtstr, TypeErasedForma
 
 void StandardFormatter::parse(TypeErasedFormatParams& params, FormatParser& parser)
 {
-    if (StringView { "<^>" }.contains(parser.peek(1))) {
-        VERIFY(!parser.next_is(is_any_of("{}")));
+    if ("<^>"sv.contains(parser.peek(1))) {
+        VERIFY(!parser.next_is(is_any_of("{}"sv)));
         m_fill = parser.consume();
     }
 
@@ -788,7 +788,7 @@ ErrorOr<void> Formatter<bool>::format(FormatBuilder& builder, bool value)
         return builder.put_hexdump({ &value, sizeof(value) }, m_width.value_or(32), m_fill);
     } else {
         Formatter<StringView> formatter { *this };
-        return formatter.format(builder, value ? "true" : "false");
+        return formatter.format(builder, value ? "true"sv : "false"sv);
     }
 }
 #ifndef KERNEL

AK/Format.h

@@ -395,6 +395,8 @@ template<>
 struct Formatter<Bytes> : Formatter<ReadonlyBytes> {
 };
 
+// FIXME: Printing raw char pointers is inherently dangerous. Remove this and
+//        its users and prefer StringView over it.
 template<>
 struct Formatter<char const*> : Formatter<StringView> {
     ErrorOr<void> format(FormatBuilder& builder, char const* value)
@@ -403,7 +405,8 @@ struct Formatter<char const*> : Formatter<StringView> {
             Formatter<FlatPtr> formatter { *this };
             return formatter.format(builder, reinterpret_cast<FlatPtr>(value));
         }
-        return Formatter<StringView>::format(builder, value);
+
+        return Formatter<StringView>::format(builder, value != nullptr ? StringView { value, __builtin_strlen(value) } : "(null)"sv);
     }
 };
 template<>
@@ -635,7 +638,7 @@ template<typename T, bool Supported = false>
 struct __FormatIfSupported : Formatter<StringView> {
     ErrorOr<void> format(FormatBuilder& builder, FormatIfSupported<T> const&)
     {
-        return Formatter<StringView>::format(builder, "?");
+        return Formatter<StringView>::format(builder, "?"sv);
     }
 };
 template<typename T>
@@ -670,15 +673,15 @@ struct Formatter<Error> : Formatter<FormatString> {
     {
 #if defined(__serenity__) && defined(KERNEL)
         if (error.is_errno())
-            return Formatter<FormatString>::format(builder, "Error(errno={})", error.code());
-        return Formatter<FormatString>::format(builder, "Error({})", error.string_literal());
+            return Formatter<FormatString>::format(builder, "Error(errno={})"sv, error.code());
+        return Formatter<FormatString>::format(builder, "Error({})"sv, error.string_literal());
 #else
         if (error.is_syscall())
-            return Formatter<FormatString>::format(builder, "{}: {} (errno={})", error.string_literal(), strerror(error.code()), error.code());
+            return Formatter<FormatString>::format(builder, "{}: {} (errno={})"sv, error.string_literal(), strerror(error.code()), error.code());
         if (error.is_errno())
-            return Formatter<FormatString>::format(builder, "{} (errno={})", strerror(error.code()), error.code());
+            return Formatter<FormatString>::format(builder, "{} (errno={})"sv, strerror(error.code()), error.code());
 
-        return Formatter<FormatString>::format(builder, "{}", error.string_literal());
+        return Formatter<FormatString>::format(builder, "{}"sv, error.string_literal());
 #endif
     }
 };
@@ -688,8 +691,8 @@ struct Formatter<ErrorOr<T, ErrorType>> : Formatter<FormatString> {
     ErrorOr<void> format(FormatBuilder& builder, ErrorOr<T, ErrorType> const& error_or)
     {
         if (error_or.is_error())
-            return Formatter<FormatString>::format(builder, "{}", error_or.error());
-        return Formatter<FormatString>::format(builder, "{{{}}}", error_or.value());
+            return Formatter<FormatString>::format(builder, "{}"sv, error_or.error());
+        return Formatter<FormatString>::format(builder, "{{{}}}"sv, error_or.value());
     }
 };
 

AK/GenericLexer.h

@@ -92,10 +92,10 @@ class GenericLexer {
 
     constexpr bool consume_specific(char const* next)
     {
-        return consume_specific(StringView { next });
+        return consume_specific(StringView { next, __builtin_strlen(next) });
     }
 
-    constexpr char consume_escaped_character(char escape_char = '\\', StringView escape_map = "n\nr\rt\tb\bf\f")
+    constexpr char consume_escaped_character(char escape_char = '\\', StringView escape_map = "n\nr\rt\tb\bf\f"sv)
     {
         if (!consume_specific(escape_char))
             return consume();
@@ -234,8 +234,8 @@ constexpr auto is_not_any_of(StringView values)
     return [values](auto c) { return !values.contains(c); };
 }
 
-constexpr auto is_path_separator = is_any_of("/\\");
-constexpr auto is_quote = is_any_of("'\"");
+constexpr auto is_path_separator = is_any_of("/\\"sv);
+constexpr auto is_quote = is_any_of("'\""sv);
 
 }
 

AK/JsonObject.h

@@ -182,9 +182,9 @@ inline void JsonValue::serialize(Builder& builder) const
 {
     switch (m_type) {
     case Type::String: {
-        builder.append("\"");
+        builder.append('\"');
         builder.append_escaped_for_json({ m_value.as_string->characters(), m_value.as_string->length() });
-        builder.append("\"");
+        builder.append('\"');
     } break;
     case Type::Array:
         m_value.as_array->serialize(builder);
@@ -193,7 +193,7 @@ inline void JsonValue::serialize(Builder& builder) const
         m_value.as_object->serialize(builder);
         break;
     case Type::Bool:
-        builder.append(m_value.as_bool ? "true" : "false");
+        builder.append(m_value.as_bool ? "true"sv : "false"sv);
         break;
 #if !defined(KERNEL)
     case Type::Double:
@@ -213,7 +213,7 @@ inline void JsonValue::serialize(Builder& builder) const
         builder.appendff("{}", as_u64());
         break;
     case Type::Null:
-        builder.append("null");
+        builder.append("null"sv);
         break;
     default:
         VERIFY_NOT_REACHED();

AK/JsonObjectSerializer.h

@@ -89,11 +89,11 @@ class JsonObjectSerializer {
         TRY(begin_item(key));
         if constexpr (IsLegacyBuilder<Builder>) {
             TRY(m_builder.try_append('"'));
-            TRY(m_builder.try_append_escaped_for_json(value));
+            TRY(m_builder.try_append_escaped_for_json({ value, strlen(value) }));
             TRY(m_builder.try_append('"'));
         } else {
             TRY(m_builder.append('"'));
-            TRY(m_builder.append_escaped_for_json(value));
+            TRY(m_builder.append_escaped_for_json({ value, strlen(value) }));
             TRY(m_builder.append('"'));
         }
         return {};
@@ -103,9 +103,9 @@ class JsonObjectSerializer {
     {
         TRY(begin_item(key));
         if constexpr (IsLegacyBuilder<Builder>)
-            TRY(m_builder.try_append(value ? "true" : "false"));
+            TRY(m_builder.try_append(value ? "true"sv : "false"sv));
         else
-            TRY(m_builder.append(value ? "true" : "false"));
+            TRY(m_builder.append(value ? "true"sv : "false"sv));
         return {};
     }
 
@@ -234,11 +234,11 @@ class JsonObjectSerializer {
         if constexpr (IsLegacyBuilder<Builder>) {
             TRY(m_builder.try_append('"'));
             TRY(m_builder.try_append_escaped_for_json(key));
-            TRY(m_builder.try_append("\":"));
+            TRY(m_builder.try_append("\":"sv));
         } else {
             TRY(m_builder.append('"'));
             TRY(m_builder.append_escaped_for_json(key));
-            TRY(m_builder.append("\":"));
+            TRY(m_builder.append("\":"sv));
         }
         return {};
     }