phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-11 20:32:35 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove Join() helper only used in tests

Browse source 
Also remove redundant return type that can be deduced by the compiler.
This commit is contained in:
MacroFake 2022-08-19 19:44:03 +02:00
parent 9eaef10801
commit faf8da3c8d
No known key found for this signature in database
GPG key ID: CE2B75697E69A548
2 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/test/util_tests.cpp
View file

@ -238,9 +238,9 @@ BOOST_AUTO_TEST_CASE(span_write_bytes)
BOOST_AUTO_TEST_CASE(util_Join) BOOST_AUTO_TEST_CASE(util_Join)
{ {
// Normal version // Normal version
BOOST_CHECK_EQUAL(Join({}, ", "), ""); BOOST_CHECK_EQUAL(Join(std::vector<std::string>{}, ", "), "");
BOOST_CHECK_EQUAL(Join({"foo"}, ", "), "foo"); BOOST_CHECK_EQUAL(Join(std::vector<std::string>{"foo"}, ", "), "foo");
BOOST_CHECK_EQUAL(Join({"foo", "bar"}, ", "), "foo, bar"); BOOST_CHECK_EQUAL(Join(std::vector<std::string>{"foo", "bar"}, ", "), "foo, bar");
// Version with unary operator // Version with unary operator
const auto op_upper = [](const std::string& s) { return ToUpper(s); }; const auto op_upper = [](const std::string& s) { return ToUpper(s); };

7
src/util/string.h
View file

@ -66,7 +66,6 @@ void ReplaceAll(std::string& in_out, const std::string& search, const std::strin
*/ */
template <typename T, typename BaseType, typename UnaryOp> template <typename T, typename BaseType, typename UnaryOp>
auto Join(const std::vector<T>& list, const BaseType& separator, UnaryOp unary_op) auto Join(const std::vector<T>& list, const BaseType& separator, UnaryOp unary_op)
-> decltype(unary_op(list.at(0)))
{ {
decltype(unary_op(list.at(0))) ret; decltype(unary_op(list.at(0))) ret;
for (size_t i = 0; i < list.size(); ++i) { for (size_t i = 0; i < list.size(); ++i) {
@ -82,12 +81,6 @@ T Join(const std::vector<T>& list, const T2& separator)
return Join(list, separator, [](const T& i) { return i; }); return Join(list, separator, [](const T& i) { return i; });
} }
// Explicit overload needed for c_str arguments, which would otherwise cause a substitution failure in the template above.
inline std::string Join(const std::vector<std::string>& list, std::string_view separator)
{
return Join<std::string>(list, separator);
}
/** /**
* Create an unordered multi-line list of items. * Create an unordered multi-line list of items.
*/ */