External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust to review.

Browse Source
This commit is contained in:
John Eivind Helset 2022-06-19 17:08:30 +02:00
parent 907a07cbae
commit 1ea1738c22
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/fmt/ranges.h
View File

@ -219,9 +219,8 @@ template <typename T, typename C> class is_tuple_formattable_<T, C, true> {
static decltype(check2( static decltype(check2(
index_sequence<I...>{}, index_sequence<I...>{},
integer_sequence< integer_sequence<
bool, (fmt::is_formattable<typename std::tuple_element<I, T>::type, bool, (is_formattable<typename std::tuple_element<I, T>::type,
C>::value)...>{})) C>::value)...>{})) check(index_sequence<I...>);
check(index_sequence<I...>);
public: public:
static constexpr const bool value = static constexpr const bool value =

20
test/ranges-test.cc
View File

@ -85,23 +85,22 @@ TEST(ranges_test, format_pair) {
EXPECT_EQ(fmt::format("{}", p), "(42, 1.5)"); EXPECT_EQ(fmt::format("{}", p), "(42, 1.5)");
} }
struct unformattable {};
TEST(ranges_test, format_tuple) { TEST(ranges_test, format_tuple) {
auto t = auto t =
std::tuple<int, float, std::string, char>(42, 1.5f, "this is tuple", 'i'); std::tuple<int, float, std::string, char>(42, 1.5f, "this is tuple", 'i');
EXPECT_EQ(fmt::format("{}", t), "(42, 1.5, \"this is tuple\", 'i')"); EXPECT_EQ(fmt::format("{}", t), "(42, 1.5, \"this is tuple\", 'i')");
EXPECT_EQ(fmt::format("{}", std::tuple<>()), "()"); EXPECT_EQ(fmt::format("{}", std::tuple<>()), "()");
enum class noformatenum{b};
struct noformatstruct{};
EXPECT_TRUE((fmt::is_formattable<std::tuple<>>::value)); EXPECT_TRUE((fmt::is_formattable<std::tuple<>>::value));
EXPECT_FALSE((fmt::is_formattable<noformatenum>::value)); EXPECT_FALSE((fmt::is_formattable<unformattable>::value));
EXPECT_FALSE((fmt::is_formattable<noformatstruct>::value)); EXPECT_FALSE((fmt::is_formattable<std::tuple<unformattable>>::value));
EXPECT_FALSE((fmt::is_formattable<std::tuple<noformatenum>>::value)); EXPECT_FALSE((fmt::is_formattable<std::tuple<unformattable, int>>::value));
EXPECT_FALSE((fmt::is_formattable<std::tuple<noformatstruct>>::value)); EXPECT_FALSE((fmt::is_formattable<std::tuple<int, unformattable>>::value));
EXPECT_FALSE((fmt::is_formattable<std::tuple<noformatstruct,int>>::value)); EXPECT_FALSE(
EXPECT_FALSE((fmt::is_formattable<std::tuple<int,noformatenum>>::value)); (fmt::is_formattable<std::tuple<unformattable, unformattable>>::value));
EXPECT_FALSE((fmt::is_formattable<std::tuple<noformatstruct,noformatenum>>::value)); EXPECT_TRUE((fmt::is_formattable<std::tuple<int, float>>::value));
EXPECT_TRUE((fmt::is_formattable<std::tuple<int,float>>::value));
} }
#ifdef FMT_RANGES_TEST_ENABLE_FORMAT_STRUCT #ifdef FMT_RANGES_TEST_ENABLE_FORMAT_STRUCT
@ -232,7 +231,6 @@ TEST(ranges_test, enum_range) {
} }
#if !FMT_MSC_VERSION #if !FMT_MSC_VERSION
struct unformattable {};
TEST(ranges_test, unformattable_range) { TEST(ranges_test, unformattable_range) {
EXPECT_FALSE((fmt::has_formatter<std::vector<unformattable>, EXPECT_FALSE((fmt::has_formatter<std::vector<unformattable>,