mirrors/scylladb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add formatter for auth::role_or_anonymous

Browse Source 
before this change, we rely on the default-generated fmt::formatter
created from operator<<, but fmt v10 dropped the default-generated
formatter.

in this change, we define a formatter for auth::role_or_anonymous,
and remove their operator<<().

Refs #13245

Signed-off-by: Kefu Chai <kefu.chai@scylladb.com>

Closes scylladb/scylladb#16812
This commit is contained in:
Kefu Chai
2024-01-17 10:33:01 +08:00
committed by Botond Dénes
parent 3f0fbdcd86
commit 84a9d2fa45
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
auth/role_or_anonymous.cc
View File

@@ -8,8 +8,6 @@
#include "auth/role_or_anonymous.hh"
#include <iostream>
namespace auth {
std::ostream& operator<<(std::ostream& os, const role_or_anonymous& mr) {
@@ -22,3 +20,8 @@ bool is_anonymous(const role_or_anonymous& mr) noexcept {
}
}
auto fmt::formatter<auth::role_or_anonymous>::format(const auth::role_or_anonymous& mr,
fmt::format_context& ctx) const -> decltype(ctx.out()) {
return fmt::format_to(ctx.out(), "{}", mr.name.value_or("<anonymous>"));
}

9
auth/role_or_anonymous.hh
View File

@@ -10,8 +10,8 @@
#include <string_view>
#include <functional>
#include <iosfwd>
#include <optional>
#include <fmt/core.h>
#include <seastar/core/sstring.hh>
@@ -29,8 +29,6 @@ public:
friend bool operator==(const role_or_anonymous&, const role_or_anonymous&) noexcept = default;
};
std::ostream& operator<<(std::ostream&, const role_or_anonymous&);
bool is_anonymous(const role_or_anonymous&) noexcept;
}
@@ -45,3 +43,8 @@ struct hash<auth::role_or_anonymous> {
};
}
template <> struct fmt::formatter<auth::role_or_anonymous> {
constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); }
auto format(const auth::role_or_anonymous&, fmt::format_context& ctx) const -> decltype(ctx.out());
};