system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-10-07 00:19:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

AK: Don't inherit Formatter<ErrorOr<T>> for Formatter<IPv4Address>

Browse source
This commit is contained in:
MacDue 2023-01-13 02:21:33 +00:00 committed by Linus Groh
parent 2150e1b3a5
commit d5152c49a1
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
AK/IPv4Address.h
View file

@ -158,18 +158,18 @@ struct Traits<IPv4Address> : public GenericTraits<IPv4Address> {
#ifdef KERNEL #ifdef KERNEL
template<> template<>
struct Formatter<IPv4Address> : Formatter<ErrorOr<NonnullOwnPtr<Kernel::KString>>> { struct Formatter<IPv4Address> : Formatter<StringView> {
ErrorOr<void> format(FormatBuilder& builder, IPv4Address value) ErrorOr<void> format(FormatBuilder& builder, IPv4Address value)
{ {
return Formatter<ErrorOr<NonnullOwnPtr<Kernel::KString>>>::format(builder, TRY(value.to_string())); return Formatter<StringView>::format(builder, TRY(value.to_string())->view());
} }
}; };
#else #else
template<> template<>
struct Formatter<IPv4Address> : Formatter<DeprecatedString> { struct Formatter<IPv4Address> : Formatter<StringView> {
ErrorOr<void> format(FormatBuilder& builder, IPv4Address value) ErrorOr<void> format(FormatBuilder& builder, IPv4Address value)
{ {
return Formatter<DeprecatedString>::format(builder, value.to_deprecated_string()); return Formatter<StringView>::format(builder, value.to_deprecated_string());
} }
}; };
#endif #endif