leavelet/fmt
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Pass writer to format_value

Browse Source
This commit is contained in:
Victor Zverovich
2016-10-25 05:55:40 -07:00
parent 64ca334a2d
commit edf98792a5
6 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
test/util-test.cc
View File

@@ -64,8 +64,9 @@ namespace {
struct Test {};
template <typename Char>
void format_value(fmt::basic_formatter<Char> &f, const Char *, Test) {
f.writer() << "test";
void format_value(fmt::BasicWriter<Char> &w, fmt::basic_formatter<Char> &f,
const Char *, Test) {
w << "test";
}
template <typename Char, typename T>
@@ -568,7 +569,7 @@ TEST(ArgTest, MakeArg) {
fmt::MemoryWriter w;
fmt::basic_formatter<char> formatter(fmt::format_args(), w);
const char *s = "}";
arg.custom.format(&formatter, &t, &s);
arg.custom.format(&formatter.writer(), &formatter, &t, &s);
EXPECT_EQ("test", w.str());
}
@@ -581,7 +582,8 @@ struct CustomFormatter {
typedef char char_type;
};
void format_value(CustomFormatter &, const char *&s, const Test &) {
void format_value(fmt::Writer &, CustomFormatter &, const char *&s,
const Test &) {
s = "custom_format";
}
@@ -590,7 +592,8 @@ TEST(UtilTest, MakeValueWithCustomFormatter) {
Arg arg = fmt::internal::MakeValue<CustomFormatter>(t);
CustomFormatter formatter;
const char *s = "";
arg.custom.format(&formatter, &t, &s);
fmt::MemoryWriter w;
arg.custom.format(&w, &formatter, &t, &s);
EXPECT_STREQ("custom_format", s);
}