Skip to content

Commit cc85f85

Browse files
committed
Update tests
1 parent 3a7e1df commit cc85f85

6 files changed

+8
-8
lines changed

regression-tests/test-results/mixed-lifetime-safety-and-null-contracts.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ auto call_my_framework(cpp2::in<const char *> msg) -> void;
2222
#line 5 "mixed-lifetime-safety-and-null-contracts.cpp2"
2323

2424
[[nodiscard]] auto main() -> int{
25-
cpp2::Null.set_handler(&call_my_framework);
25+
CPP2_UFCS(set_handler, cpp2::Null, &call_my_framework);
2626
try_pointer_stuff();
2727
std::cout << "done\n";
2828
}

regression-tests/test-results/mixed-postfix-expression-custom-formatting.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ auto call(auto const& v, auto const& w, auto const& x, auto const& y, auto const
1717

1818
[[nodiscard]] auto test(auto const& a) -> std::string{
1919
return call( a,
20-
++*cpp2::assert_not_null(a.b(a.c)), "hello", /* polite
20+
++*cpp2::assert_not_null(CPP2_UFCS(b, a, a.c)), "hello", /* polite
2121
greeting
2222
goes here */ " there",
23-
a.d.e( ++(*cpp2::assert_not_null(a.f)).g(), // because f is foobar
24-
a.h.i(),
23+
CPP2_UFCS(e, a.d, ++CPP2_UFCS_0(g, *cpp2::assert_not_null(a.f)), // because f is foobar
24+
CPP2_UFCS_0(i, a.h),
2525
CPP2_UFCS(j, a, a.k, a.l))
2626
);
2727
}

regression-tests/test-results/mixed-ufcs-multiple-template-arguments.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ struct X {
2828
std::cout << substr<4,8>(test_string) << "\n";
2929

3030
X x { test_string };
31-
std::cout << std::move(x).substr<4,8>() << "\n";
31+
std::cout << CPP2_UFCS_TEMPLATE_0(substr, (<4,8>), std::move(x)) << "\n";
3232
// for now this should not be UFCS-ized because of the multiple template arguments
3333
}
3434

regression-tests/test-results/pure2-inspect-expression-in-generic-function-multiple-types.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ auto test_generic(auto const& x, auto const& msg) -> void;
2121
test_generic(a, "any");
2222
test_generic(o, "optional<int>");
2323

24-
CPP2_UFCS_TEMPLATE(emplace<0>, v, 1);
24+
CPP2_UFCS_TEMPLATE(emplace, (<0>), v, 1);
2525
a = 2;
2626
o = 3;
2727
test_generic(42, "int");

regression-tests/test-results/pure2-type-safety-1.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ auto print(cpp2::in<std::string> msg, cpp2::in<bool> b) -> void;
2929

3030
std::cout << "\n";
3131

32-
CPP2_UFCS_TEMPLATE(emplace<1>, v, 1);
32+
CPP2_UFCS_TEMPLATE(emplace, (<1>), v, 1);
3333
a = 2;
3434
o = 3;
3535
test_generic(42, "int");

regression-tests/test-results/pure2-type-safety-2-with-inspect-expression.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ auto test_generic(auto const& x, auto const& msg) -> void;
2121
test_generic(a, "any");
2222
test_generic(o, "optional<int>");
2323

24-
CPP2_UFCS_TEMPLATE(emplace<2>, v, 1);
24+
CPP2_UFCS_TEMPLATE(emplace, (<2>), v, 1);
2525
a = 2;
2626
o = 3;
2727
test_generic(42, "int");

0 commit comments

Comments
 (0)