Simplify API
diff --git a/fmt/format.cc b/fmt/format.cc
index 3dd42e1..1e34dab 100644
--- a/fmt/format.cc
+++ b/fmt/format.cc
@@ -224,7 +224,7 @@
} // namespace internal
FMT_FUNC void SystemError::init(
- int err_code, CStringRef format_str, format_args args) {
+ int err_code, CStringRef format_str, args args) {
error_code_ = err_code;
MemoryWriter w;
format_system_error(w, err_code, vformat(format_str, args));
@@ -348,7 +348,7 @@
}
FMT_FUNC void WindowsError::init(
- int err_code, CStringRef format_str, format_args args) {
+ int err_code, CStringRef format_str, args args) {
error_code_ = err_code;
MemoryWriter w;
internal::format_windows_error(w, err_code, vformat(format_str, args));
@@ -428,17 +428,17 @@
}
#endif
-FMT_FUNC void vprint(std::FILE *f, CStringRef format_str, format_args args) {
+FMT_FUNC void vprint(std::FILE *f, CStringRef format_str, args args) {
MemoryWriter w;
w.vformat(format_str, args);
std::fwrite(w.data(), 1, w.size(), f);
}
-FMT_FUNC void vprint(CStringRef format_str, format_args args) {
+FMT_FUNC void vprint(CStringRef format_str, args args) {
vprint(stdout, format_str, args);
}
-FMT_FUNC void vprint_colored(Color c, CStringRef format, format_args args) {
+FMT_FUNC void vprint_colored(Color c, CStringRef format, args args) {
char escape[] = "\x1b[30m";
escape[3] = static_cast<char>('0' + c);
std::fputs(escape, stdout);
@@ -448,7 +448,7 @@
template <typename Char>
void printf(basic_writer<Char> &w, BasicCStringRef<Char> format,
- format_args args);
+ args args);
FMT_FUNC int vfprintf(std::FILE *f, CStringRef format, printf_args args) {
MemoryWriter w;
@@ -465,7 +465,7 @@
template void internal::FixedBuffer<char>::grow(std::size_t);
-template void internal::ArgMap<context>::init(const format_args &args);
+template void internal::ArgMap<context>::init(const args &args);
template void printf_context<char>::format(writer &writer);
@@ -483,7 +483,7 @@
template void internal::FixedBuffer<wchar_t>::grow(std::size_t);
-template void internal::ArgMap<wcontext>::init(const wformat_args &args);
+template void internal::ArgMap<wcontext>::init(const wargs &args);
template void printf_context<wchar_t>::format(wwriter &writer);
diff --git a/fmt/format.h b/fmt/format.h
index 742904f..a6a87fb 100644
--- a/fmt/format.h
+++ b/fmt/format.h
@@ -1369,9 +1369,6 @@
}
};
-typedef basic_arg<context> format_arg;
-typedef basic_arg<wcontext> wformat_arg;
-
/**
\rst
Visits an argument dispatching to the appropriate visit method based on
@@ -1625,8 +1622,8 @@
}
};
-typedef basic_args<context> format_args;
-typedef basic_args<wcontext> wformat_args;
+typedef basic_args<context> args;
+typedef basic_args<wcontext> wargs;
enum Alignment {
ALIGN_DEFAULT, ALIGN_LEFT, ALIGN_RIGHT, ALIGN_CENTER, ALIGN_NUMERIC
@@ -2111,7 +2108,7 @@
*/
class SystemError : public internal::RuntimeError {
private:
- void init(int err_code, CStringRef format_str, format_args args);
+ void init(int err_code, CStringRef format_str, args args);
protected:
int error_code_;
@@ -2943,7 +2940,7 @@
/** A Windows error. */
class WindowsError : public SystemError {
private:
- FMT_API void init(int error_code, CStringRef format_str, format_args args);
+ FMT_API void init(int error_code, CStringRef format_str, args args);
public:
/**
@@ -2989,7 +2986,7 @@
enum Color { BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE };
-FMT_API void vprint_colored(Color c, CStringRef format, format_args args);
+FMT_API void vprint_colored(Color c, CStringRef format, args args);
/**
Formats a string and prints it to stdout using ANSI escape sequences
@@ -3003,7 +3000,7 @@
vprint_colored(c, format_str, make_args(args...));
}
-inline std::string vformat(CStringRef format_str, format_args args) {
+inline std::string vformat(CStringRef format_str, args args) {
MemoryWriter w;
w.vformat(format_str, args);
return w.str();
@@ -3023,7 +3020,7 @@
return vformat(format_str, make_args(args...));
}
-inline std::wstring vformat(WCStringRef format_str, wformat_args args) {
+inline std::wstring vformat(WCStringRef format_str, wargs args) {
WMemoryWriter w;
w.vformat(format_str, args);
return w.str();
@@ -3035,7 +3032,7 @@
return vformat(format_str, vargs);
}
-FMT_API void vprint(std::FILE *f, CStringRef format_str, format_args args);
+FMT_API void vprint(std::FILE *f, CStringRef format_str, args args);
/**
\rst
@@ -3051,7 +3048,7 @@
vprint(f, format_str, make_args(args...));
}
-FMT_API void vprint(CStringRef format_str, format_args args);
+FMT_API void vprint(CStringRef format_str, args args);
/**
\rst
diff --git a/fmt/ostream.cc b/fmt/ostream.cc
index 0c7c750..d6f2698 100644
--- a/fmt/ostream.cc
+++ b/fmt/ostream.cc
@@ -28,7 +28,7 @@
}
FMT_FUNC void vprint(std::ostream &os, CStringRef format_str,
- format_args args) {
+ args args) {
MemoryWriter w;
w.vformat(format_str, args);
internal::write(os, w);
diff --git a/fmt/ostream.h b/fmt/ostream.h
index 040a185..4db6f9c 100644
--- a/fmt/ostream.h
+++ b/fmt/ostream.h
@@ -91,7 +91,7 @@
w, internal::make_arg< basic_context<Char> >(str), ctx);
}
-FMT_API void vprint(std::ostream &os, CStringRef format_str, format_args args);
+FMT_API void vprint(std::ostream &os, CStringRef format_str, args args);
/**
\rst
diff --git a/fmt/posix.h b/fmt/posix.h
index 19e8002..afc6958 100644
--- a/fmt/posix.h
+++ b/fmt/posix.h
@@ -166,7 +166,7 @@
// of MinGW that define fileno as a macro.
int (fileno)() const;
- void vprint(CStringRef format_str, const format_args &args) {
+ void vprint(CStringRef format_str, const args &args) {
fmt::vprint(file_, format_str, args);
}
diff --git a/test/custom-formatter-test.cc b/test/custom-formatter-test.cc
index 526a925..01d8b95 100644
--- a/test/custom-formatter-test.cc
+++ b/test/custom-formatter-test.cc
@@ -45,7 +45,7 @@
}
};
-std::string custom_vformat(fmt::CStringRef format_str, fmt::format_args args) {
+std::string custom_vformat(fmt::CStringRef format_str, fmt::args args) {
fmt::MemoryWriter writer;
// Pass custom argument formatter as a template arg to vformat.
fmt::vwrite<CustomArgFormatter>(writer, format_str, args);
diff --git a/test/format-impl-test.cc b/test/format-impl-test.cc
index c19329f..6308273 100644
--- a/test/format-impl-test.cc
+++ b/test/format-impl-test.cc
@@ -55,9 +55,8 @@
};
TEST(FormatTest, ArgConverter) {
- using fmt::format_arg;
fmt::LongLong value = std::numeric_limits<fmt::LongLong>::max();
- format_arg arg = fmt::internal::make_arg<fmt::context>(value);
+ auto arg = fmt::internal::make_arg<fmt::context>(value);
visit(fmt::internal::ArgConverter<
fmt::LongLong, fmt::context>(arg, 'd'), arg);
EXPECT_EQ(value, visit(ValueExtractor<fmt::LongLong>(), arg));
diff --git a/test/format-test.cc b/test/format-test.cc
index 35a9e47..f10e1b1 100644
--- a/test/format-test.cc
+++ b/test/format-test.cc
@@ -1566,7 +1566,7 @@
EXPECT_EQ("2012-12-9", s);
}
-std::string vformat_message(int id, const char *format, fmt::format_args args) {
+std::string vformat_message(int id, const char *format, fmt::args args) {
MemoryWriter w;
w.format("[{}] ", id);
w.vformat(format, args);
@@ -1656,7 +1656,7 @@
void operator()(fmt::internal::CustomValue<char>) {}
};
-void custom_vformat(fmt::CStringRef format_str, fmt::format_args args) {
+void custom_vformat(fmt::CStringRef format_str, fmt::args args) {
fmt::MemoryWriter writer;
fmt::vwrite<MockArgFormatter>(writer, format_str, args);
}
diff --git a/test/ostream-test.cc b/test/ostream-test.cc
index af279b8..6eab45a 100644
--- a/test/ostream-test.cc
+++ b/test/ostream-test.cc
@@ -65,7 +65,7 @@
TEST(OStreamTest, CustomArg) {
fmt::MemoryWriter writer;
- fmt::context ctx("}", fmt::format_args());
+ fmt::context ctx("}", fmt::args());
fmt::format_specs spec;
TestArgFormatter af(writer, ctx, spec);
visit(af, fmt::internal::make_arg<fmt::context>(TestEnum()));
diff --git a/test/util-test.cc b/test/util-test.cc
index e84415d..19cbcb8 100644
--- a/test/util-test.cc
+++ b/test/util-test.cc
@@ -53,7 +53,6 @@
#undef max
using fmt::basic_arg;
-using fmt::format_arg;
using fmt::buffer;
using fmt::StringRef;
using fmt::internal::MemoryBuffer;
@@ -408,7 +407,7 @@
}
TEST(UtilTest, FormatArgs) {
- fmt::format_args args;
+ fmt::args args;
EXPECT_FALSE(args[1]);
}
@@ -570,7 +569,7 @@
testing::Invoke([&](fmt::internal::CustomValue<char> custom) {
EXPECT_EQ(&test, custom.value);
fmt::MemoryWriter w;
- fmt::context ctx("}", fmt::format_args());
+ fmt::context ctx("}", fmt::args());
custom.format(w, &test, &ctx);
EXPECT_EQ("test", w.str());
return Visitor::Result();
@@ -582,7 +581,7 @@
typedef MockVisitor<fmt::monostate> Visitor;
testing::StrictMock<Visitor> visitor;
EXPECT_CALL(visitor, visit(_));
- format_arg arg;
+ fmt::basic_arg<fmt::context> arg;
visit(visitor, arg);
}
