fmtlib/fmt
1
0
Fork 1
mirror of https://github.com/fmtlib/fmt.git synced 2025-12-16 02:28:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

basic_arg -> basic_format_arg, arg_store -> format_arg_store

Browse Source
This commit is contained in:
Victor Zverovich
2018-04-04 07:38:21 -07:00
parent 4975297eb0
commit 23759b2688
5 changed files with 69 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/format-test.cc
View File

@@ -1421,7 +1421,7 @@ class mock_arg_formatter:
return base::operator()(value);
}
iterator operator()(fmt::basic_arg<fmt::context>::handle) {
iterator operator()(fmt::basic_format_arg<fmt::context>::handle) {
return base::operator()(fmt::monostate());
}
};
@@ -1506,8 +1506,8 @@ TEST(FormatTest, OutputIterators) {
EXPECT_EQ("42", s.str());
}
TEST(FormatTest, OutputSize) {
EXPECT_EQ(2u, fmt::count("{}", 42));
TEST(FormatTest, FormattedSize) {
EXPECT_EQ(2u, fmt::formatted_size("{}", 42));
}
TEST(FormatTest, FormatToN) {
@@ -1633,12 +1633,12 @@ TEST(FormatTest, ConstexprParseFormatSpecs) {
struct test_context {
typedef char char_type;
FMT_CONSTEXPR fmt::basic_arg<test_context> next_arg() {
FMT_CONSTEXPR fmt::basic_format_arg<test_context> next_arg() {
return fmt::internal::make_arg<test_context>(11);
}
template <typename Id>
FMT_CONSTEXPR fmt::basic_arg<test_context> get_arg(Id) {
FMT_CONSTEXPR fmt::basic_format_arg<test_context> get_arg(Id) {
return fmt::internal::make_arg<test_context>(22);
}

10
test/util-test.cc
View File

@@ -33,7 +33,7 @@
#undef min
#undef max
using fmt::basic_arg;
using fmt::basic_format_arg;
using fmt::internal::basic_buffer;
using fmt::basic_memory_buffer;
using fmt::string_view;
@@ -48,7 +48,7 @@ namespace {
struct Test {};
template <typename Context, typename T>
basic_arg<Context> make_arg(const T &value) {
basic_format_arg<Context> make_arg(const T &value) {
return fmt::internal::make_arg<Context>(value);
}
} // namespace
@@ -579,7 +579,7 @@ TEST(UtilTest, PointerArg) {
}
struct check_custom {
Result operator()(fmt::basic_arg<fmt::context>::handle h) const {
Result operator()(fmt::basic_format_arg<fmt::context>::handle h) const {
fmt::memory_buffer buffer;
fmt::internal::basic_buffer<char> &base = buffer;
fmt::context ctx(std::back_inserter(base), "", fmt::format_args());
@@ -591,7 +591,7 @@ struct check_custom {
TEST(UtilTest, CustomArg) {
::Test test;
typedef MockVisitor<fmt::basic_arg<fmt::context>::handle> visitor;
typedef MockVisitor<fmt::basic_format_arg<fmt::context>::handle> visitor;
testing::StrictMock<visitor> v;
EXPECT_CALL(v, visit(_)).WillOnce(testing::Invoke(check_custom()));
fmt::visit(v, make_arg<fmt::context>(test));
@@ -601,7 +601,7 @@ TEST(ArgVisitorTest, VisitInvalidArg) {
typedef MockVisitor<fmt::monostate> Visitor;
testing::StrictMock<Visitor> visitor;
EXPECT_CALL(visitor, visit(_));
fmt::basic_arg<fmt::context> arg;
fmt::basic_format_arg<fmt::context> arg;
visit(visitor, arg);
}