mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2024-10-02 13:02:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Return Writer instead of std::string in variadic overloads of Format for performance & consistency with non-variadic versions.

Browse Source
This commit is contained in:
Victor Zverovich 2014-04-24 07:32:01 -07:00
parent bc2cab2efe
commit 71a5b7a126
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
format-test.cc
View File

@ -1434,11 +1434,11 @@ TEST(FormatterTest, Examples) {
std::string path = "somefile"; std::string path = "somefile";
ReportError("File not found: {0}") << path; ReportError("File not found: {0}") << path;
#if FMT_USE_VARIADIC_TEMPLATES #if FMT_USE_VARIADIC_TEMPLATES && FMT_USE_RVALUE_REFERENCES
EXPECT_THROW_MSG( EXPECT_THROW_MSG(
Format("The answer is {:d}", "forty-two"), FormatError, Format("The answer is {:d}", "forty-two"), FormatError,
"unknown format code 'd' for string"); "unknown format code 'd' for string");
EXPECT_EQ(L"Cyrillic letter ю", Format(L"Cyrillic letter {}", L'ю')); EXPECT_EQ(L"Cyrillic letter ю", str(Format(L"Cyrillic letter {}", L'ю')));
#endif #endif
} }
@ -1501,10 +1501,10 @@ TEST(StrTest, Convert) {
EXPECT_EQ("2012-12-9", s); EXPECT_EQ("2012-12-9", s);
} }
#if FMT_USE_VARIADIC_TEMPLATES #if FMT_USE_VARIADIC_TEMPLATES && FMT_USE_RVALUE_REFERENCES
TEST(FormatTest, Variadic) { TEST(FormatTest, Variadic) {
EXPECT_EQ("Hello, world!1", Format("Hello, {}!{}", "world", 1)); EXPECT_EQ("Hello, world!1", str(Format("Hello, {}!{}", "world", 1)));
EXPECT_EQ(L"Hello, world!1", Format(L"Hello, {}!{}", L"world", 1)); EXPECT_EQ(L"Hello, world!1", str(Format(L"Hello, {}!{}", L"world", 1)));
} }
#endif // FMT_USE_VARIADIC_TEMPLATES #endif // FMT_USE_VARIADIC_TEMPLATES

13
format.h
View File

@ -1571,22 +1571,21 @@ inline Formatter<ColorWriter> PrintColored(Color c, StringRef format) {
return f; return f;
} }
#if FMT_USE_VARIADIC_TEMPLATES #if FMT_USE_VARIADIC_TEMPLATES && FMT_USE_RVALUE_REFERENCES
template<typename... Args> template<typename... Args>
inline std::string Format(const StringRef &format, const Args & ... args) { inline Writer Format(const StringRef &format, const Args & ... args) {
Writer w; Writer w;
w.Format(format, args...); w.Format(format, args...);
return str(w); return std::move(w);
} }
template<typename... Args> template<typename... Args>
inline std::wstring Format(const WStringRef &format, const Args & ... args) { inline WWriter Format(const WStringRef &format, const Args & ... args) {
WWriter w; WWriter w;
w.Format(format, args...); w.Format(format, args...);
return str(w); return std::move(w);
} }
#endif // FMT_USE_VARIADIC_TEMPLATES #endif // FMT_USE_VARIADIC_TEMPLATES && FMT_USE_RVALUE_REFERENCES
} }
// Restore warnings. // Restore warnings.