diff --git a/include/xrpl/basics/Logger.h b/include/xrpl/basics/Logger.h index 25190ed0d7..a723e57255 100644 --- a/include/xrpl/basics/Logger.h +++ b/include/xrpl/basics/Logger.h @@ -1,11 +1,11 @@ #pragma once -#include #include #include #include +#include #include #include #include @@ -488,7 +488,7 @@ public: * @param config The configuration to use * @return Void on success, error message on failure */ - [[nodiscard]] static Expected + [[nodiscard]] static std::expected init(LoggingConfiguration const& config); /** @@ -569,8 +569,9 @@ private: * @param config The configuration to parse sinks from * @return A vector of sinks on success, error message on failure */ - [[nodiscard]] static Expected>, std::string> - getSinks(LoggingConfiguration const& config, std::string const& format); + [[nodiscard]] static std:: + expected>, std::string> + getSinks(LoggingConfiguration const& config, std::string const& format); struct FileLoggingParams { diff --git a/src/libxrpl/basics/Logger.cpp b/src/libxrpl/basics/Logger.cpp index faa66e392f..f2bf21a044 100644 --- a/src/libxrpl/basics/Logger.cpp +++ b/src/libxrpl/basics/Logger.cpp @@ -1,7 +1,5 @@ #include -#include - #include #include #include @@ -19,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -396,7 +395,7 @@ LogServiceState::registerLogger(std::string_view channel, std::optional, std::string> +std::expected, std::string> LogService::getSinks(LoggingConfiguration const& config, std::string const& format) { std::vector allSinks = createConsoleSinks(config.enableConsole, format); @@ -408,7 +407,7 @@ LogService::getSinks(LoggingConfiguration const& config, std::string const& form { if (std::error_code error; !std::filesystem::create_directories(dirPath, error)) { - return Unexpected{fmt::format( + return std::unexpected{fmt::format( "Couldn't create logs directory '{}': {}", dirPath.string(), error.message())}; } } @@ -421,7 +420,7 @@ LogService::getSinks(LoggingConfiguration const& config, std::string const& form return allSinks; } -Expected +std::expected LogService::init(LoggingConfiguration const& config) { // Format is fully determined by the logging mode. @@ -430,7 +429,7 @@ LogService::init(LoggingConfiguration const& config) auto const sinksMaybe = getSinks(config, format_); if (!sinksMaybe.has_value()) { - return Unexpected{sinksMaybe.error()}; + return std::unexpected{sinksMaybe.error()}; } logDir_ = config.directory; diff --git a/src/tests/libxrpl/basics/StructuredLogging.cpp b/src/tests/libxrpl/basics/StructuredLogging.cpp index c85e4f7857..b43db8a8f3 100644 --- a/src/tests/libxrpl/basics/StructuredLogging.cpp +++ b/src/tests/libxrpl/basics/StructuredLogging.cpp @@ -244,15 +244,6 @@ TEST(HasToString, number_satisfies_concept) static_assert(detail::HasToString); } -TEST(HasToString, builtin_types_without_adl) -{ - // Built-in types have no associated namespace for ADL, so unless - // ToString.h is explicitly included they do not satisfy HasToString. - // They are handled by the fmt::format fallback path instead. - static_assert(!detail::HasToString); - static_assert(!detail::HasToString); -} - // -- appendJsonValue with to_string types ------------------------------------ TEST(AppendJsonValue, xrp_amount_quoted)