372a4d1b79
since we do not rely on FMT_DEPRECATED_OSTREAM to define the
fmt::formatter for us anymore, let's stop defining `FMT_DEPRECATED_OSTREAM`.
in this change,
* utils: drop the range formatters in to_string.hh and to_string.c, as
we don't use them anymore. and the tests for them in
test/boost/string_format_test.cc are removed accordingly.
* utils: use fmt to print chunk_vector and small_vector. as
we are not able to print the elements using operator<< anymore
after switching to {fmt} formatters.
* test/boost: specialize fmt::details::is_std_string_like<bytes>
due to a bug in {fmt} v9, {fmt} fails to format a range whose
element type is `basic_sstring<uint8_t>`, as it considers it
as a string-like type, but `basic_sstring<uint8_t>`'s char type
is signed char, not char. this issue does not exist in {fmt} v10,
so, in this change, we add a workaround to explicitly specialize
the type trait to assure that {fmt} format this type using its
`fmt::formatter` specialization instead of trying to format it
as a string. also, {fmt}'s generic ranges formatter calls the
pair formatter's `set_brackets()` and `set_separator()` methods
when printing the range, but operator<< based formatter does not
provide these method, we have to include this change in the change
switching to {fmt}, otherwise the change specializing
`fmt::details::is_std_string_like<bytes>` won't compile.
* test/boost: in tests, we use `BOOST_REQUIRE_EQUAL()` and its friends
for comparing values. but without the operator<< based formatters,
Boost.Test would not be able to print them. after removing
the homebrew formatters, we need to use the generic
`boost_test_print_type()` helper to do this job. so we are
including `test_utils.hh` in tests so that we can print
the formattable types.
* treewide: add "#include "utils/to_string.hh" where
`fmt::formatter<optional<>>` is used.
* configure.py: do not define FMT_DEPRECATED_OSTREAM
* cmake: do not define FMT_DEPRECATED_OSTREAM
Refs #13245
Signed-off-by: Kefu Chai <kefu.chai@scylladb.com>
47 lines
1.1 KiB
C++
47 lines
1.1 KiB
C++
|
|
/*
|
|
* Copyright (C) 2023-present ScyllaDB
|
|
*/
|
|
|
|
/*
|
|
* SPDX-License-Identifier: AGPL-3.0-or-later
|
|
*/
|
|
|
|
#define BOOST_TEST_MODULE string_format
|
|
|
|
#include <boost/test/unit_test.hpp>
|
|
|
|
#include <fmt/format.h>
|
|
#include <fmt/ranges.h>
|
|
#include <fmt/std.h>
|
|
|
|
#include "utils/to_string.hh"
|
|
|
|
// Test scylla's string formatters and printers defined in utils/to_string.hh
|
|
|
|
void verify_parenthesis(std::string_view sv) {
|
|
static std::unordered_map<char, char> paren_map = {{'{', '}'}, {'[', ']'}, {'(', ')'}, {'<', '>'}};
|
|
|
|
BOOST_REQUIRE(!sv.empty());
|
|
char open = sv.front();
|
|
char close = sv.back();
|
|
auto it = paren_map.find(open);
|
|
if (it == paren_map.end()) {
|
|
BOOST_FAIL(fmt::format("Unexpected delimiters: '{}' '{}'", open, close));
|
|
}
|
|
BOOST_REQUIRE_EQUAL(close, it->second);
|
|
}
|
|
|
|
BOOST_AUTO_TEST_CASE(test_optional_string_format) {
|
|
std::optional<std::string> sopt;
|
|
|
|
auto s = fmt::format("{}", sopt);
|
|
BOOST_TEST_MESSAGE(fmt::format("Empty opt: {}", s));
|
|
BOOST_REQUIRE_EQUAL(s.size(), 2);
|
|
verify_parenthesis(s);
|
|
|
|
sopt.emplace("foo");
|
|
s = fmt::format("{}", sopt);
|
|
BOOST_TEST_MESSAGE(fmt::format("Engaged opt: {}", s));
|
|
}
|