mirror of
https://github.com/fmtlib/fmt.git
synced 2025-06-24 08:51:41 +02:00
Update and apply clang-format
This commit is contained in:
@ -7,6 +7,7 @@ IndentCaseLabels: false
|
||||
AlwaysBreakTemplateDeclarations: false
|
||||
DerivePointerAlignment: false
|
||||
AllowShortCaseLabelsOnASingleLine: true
|
||||
QualifierAlignment: Left
|
||||
AlignConsecutiveShortCaseStatements:
|
||||
Enabled: true
|
||||
AcrossEmptyLines: true
|
||||
|
@ -1097,7 +1097,7 @@ template <> struct cache_accessor<double> {
|
||||
return {r.high(), r.low() == 0};
|
||||
}
|
||||
|
||||
static auto compute_delta(cache_entry_type const& cache, int beta) noexcept
|
||||
static auto compute_delta(const cache_entry_type& cache, int beta) noexcept
|
||||
-> uint32_t {
|
||||
return static_cast<uint32_t>(cache.high() >> (64 - 1 - beta));
|
||||
}
|
||||
|
@ -95,18 +95,17 @@ TEST(string_view_test, compare) {
|
||||
#if FMT_USE_CONSTEVAL
|
||||
namespace {
|
||||
|
||||
template <size_t N>
|
||||
struct fixed_string {
|
||||
char data[N] = {};
|
||||
template <size_t N> struct fixed_string {
|
||||
char data[N] = {};
|
||||
|
||||
constexpr fixed_string(char const (&m)[N]) {
|
||||
for (size_t i = 0; i != N; ++i) {
|
||||
data[i] = m[i];
|
||||
}
|
||||
constexpr fixed_string(const char (&m)[N]) {
|
||||
for (size_t i = 0; i != N; ++i) {
|
||||
data[i] = m[i];
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
} // namespace
|
||||
|
||||
TEST(string_view_test, from_constexpr_fixed_string) {
|
||||
static constexpr auto fs = fixed_string<5>("x={}");
|
||||
|
@ -583,7 +583,8 @@ TEST(format_test, named_arg) {
|
||||
fmt::arg("A_", "A"), fmt::arg("_1", 1)));
|
||||
EXPECT_EQ(fmt::format("{0:{width}}", -42, fmt::arg("width", 4)), " -42");
|
||||
EXPECT_EQ(fmt::format("{value:{width}}", fmt::arg("value", -42),
|
||||
fmt::arg("width", 4)), " -42");
|
||||
fmt::arg("width", 4)),
|
||||
" -42");
|
||||
EXPECT_EQ("st",
|
||||
fmt::format("{0:.{precision}}", "str", fmt::arg("precision", 2)));
|
||||
EXPECT_EQ(fmt::format("{} {two}", 1, fmt::arg("two", 2)), "1 2");
|
||||
@ -601,8 +602,9 @@ TEST(format_test, named_arg) {
|
||||
EXPECT_THROW_MSG((void)fmt::format(runtime("{a} {}"), fmt::arg("a", 2), 42),
|
||||
format_error,
|
||||
"cannot switch from manual to automatic argument indexing");
|
||||
EXPECT_THROW_MSG((void)fmt::format("{a}", fmt::arg("a", 1),
|
||||
fmt::arg("a", 10)), format_error, "duplicate named arg");
|
||||
EXPECT_THROW_MSG(
|
||||
(void)fmt::format("{a}", fmt::arg("a", 1), fmt::arg("a", 10)),
|
||||
format_error, "duplicate named arg");
|
||||
}
|
||||
|
||||
TEST(format_test, auto_arg_index) {
|
||||
|
@ -8,8 +8,8 @@
|
||||
#include "gtest/gtest.h"
|
||||
|
||||
#if !defined(__GNUC__) || __GNUC__ >= 5
|
||||
#define FMT_BUILTIN_TYPES 0
|
||||
#include "fmt/format.h"
|
||||
# define FMT_BUILTIN_TYPES 0
|
||||
# include "fmt/format.h"
|
||||
|
||||
TEST(no_builtin_types_test, format) {
|
||||
EXPECT_EQ(fmt::format("{}", 42), "42");
|
||||
|
@ -330,7 +330,7 @@ template <typename T> class noncopyable_range {
|
||||
explicit noncopyable_range(Args&&... args)
|
||||
: vec(std::forward<Args>(args)...) {}
|
||||
|
||||
noncopyable_range(noncopyable_range const&) = delete;
|
||||
noncopyable_range(const noncopyable_range&) = delete;
|
||||
noncopyable_range(noncopyable_range&) = delete;
|
||||
|
||||
auto begin() -> iterator { return vec.begin(); }
|
||||
@ -424,7 +424,7 @@ TEST(ranges_test, join_tuple) {
|
||||
auto t5 = tuple_like{42, "foo"};
|
||||
EXPECT_EQ(fmt::format("{}", fmt::join(t5, ", ")), "42, foo");
|
||||
|
||||
# if FMT_TUPLE_JOIN_SPECIFIERS
|
||||
#if FMT_TUPLE_JOIN_SPECIFIERS
|
||||
// Specs applied to each element.
|
||||
auto t5 = std::tuple<int, int, long>(-3, 100, 1);
|
||||
EXPECT_EQ(fmt::format("{:+03}", fmt::join(t5, ", ")), "-03, +100, +01");
|
||||
@ -437,7 +437,7 @@ TEST(ranges_test, join_tuple) {
|
||||
int y = -1;
|
||||
auto t7 = std::tuple<int, int&, const int&>(3, y, y);
|
||||
EXPECT_EQ(fmt::format("{:03}", fmt::join(t7, ", ")), "003, -01, -01");
|
||||
# endif
|
||||
#endif
|
||||
}
|
||||
|
||||
TEST(ranges_test, join_initializer_list) {
|
||||
@ -457,7 +457,7 @@ struct zstring {
|
||||
auto end() const -> zstring_sentinel { return {}; }
|
||||
};
|
||||
|
||||
# ifdef __cpp_lib_ranges
|
||||
#ifdef __cpp_lib_ranges
|
||||
struct cpp20_only_range {
|
||||
struct iterator {
|
||||
int val = 0;
|
||||
@ -487,7 +487,7 @@ struct cpp20_only_range {
|
||||
};
|
||||
|
||||
static_assert(std::input_iterator<cpp20_only_range::iterator>);
|
||||
# endif
|
||||
#endif
|
||||
|
||||
TEST(ranges_test, join_sentinel) {
|
||||
auto hello = zstring{"hello"};
|
||||
@ -515,13 +515,13 @@ TEST(ranges_test, join_range) {
|
||||
const auto z = std::vector<int>(3u, 0);
|
||||
EXPECT_EQ(fmt::format("{}", fmt::join(z, ",")), "0,0,0");
|
||||
|
||||
# ifdef __cpp_lib_ranges
|
||||
#ifdef __cpp_lib_ranges
|
||||
EXPECT_EQ(fmt::format("{}", cpp20_only_range{.lo = 0, .hi = 5}),
|
||||
"[0, 1, 2, 3, 4]");
|
||||
EXPECT_EQ(
|
||||
fmt::format("{}", fmt::join(cpp20_only_range{.lo = 0, .hi = 5}, ",")),
|
||||
"0,1,2,3,4");
|
||||
# endif
|
||||
#endif
|
||||
}
|
||||
|
||||
namespace adl {
|
||||
|
Reference in New Issue
Block a user