sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 03:52:49 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#25803: refactor: Drop boost/algorithm/string/replace.hpp dependency

Browse Source 
fea75ad3caa29972db32d3ce7e0fe125ec77a0eb refactor: Drop `boost/algorithm/string/replace.hpp` dependency (Hennadii Stepanov)
857526e8cbb0847a865e9c2509425960d458f535 test: Add test case for `ReplaceAll()` function (Hennadii Stepanov)

Pull request description:

  A new implementation of the `ReplaceAll()` seems enough for all of our purposes.

ACKs for top commit:
  adam2k:
    ACK Tested fea75ad3caa29972db32d3ce7e0fe125ec77a0eb
  theStack:
    Code-review ACK fea75ad3caa29972db32d3ce7e0fe125ec77a0eb

Tree-SHA512: dacfffc9d2bd1fb9f034baf8c045b1e8657b766db2f0a7f8ef7e25ee6cd888f315b0124c54aba7a29ae59186b176ef9868a8b709dc995ea215c6b4ce58e174d9
This commit is contained in:
fanquake 2022-08-16 09:15:17 +01:00 committed by PastaPastaPasta
parent 5e69a5654e
commit 51ccdca24d
4 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/test/util_tests.cpp
View File

@ -219,6 +219,22 @@ BOOST_AUTO_TEST_CASE(util_Join)
BOOST_CHECK_EQUAL(Join<std::string>({"foo", "bar"}, ", ", op_upper), "FOO, BAR"); BOOST_CHECK_EQUAL(Join<std::string>({"foo", "bar"}, ", ", op_upper), "FOO, BAR");
} }
BOOST_AUTO_TEST_CASE(util_ReplaceAll)
{
const std::string original("A test \"%s\" string '%s'.");
auto test_replaceall = [&original](const std::string& search, const std::string& substitute, const std::string& expected) {
auto test = original;
ReplaceAll(test, search, substitute);
BOOST_CHECK_EQUAL(test, expected);
};
test_replaceall("", "foo", original);
test_replaceall(original, "foo", "foo");
test_replaceall("%s", "foo", "A test \"foo\" string 'foo'.");
test_replaceall("\"", "foo", "A test foo%sfoo string '%s'.");
test_replaceall("'", "foo", "A test \"%s\" string foo%sfoo.");
}
BOOST_AUTO_TEST_CASE(util_TrimString) BOOST_AUTO_TEST_CASE(util_TrimString)
{ {
BOOST_CHECK_EQUAL(TrimString(" foo bar "), "foo bar"); BOOST_CHECK_EQUAL(TrimString(" foo bar "), "foo bar");

9
src/util/string.cpp
View File

@ -4,9 +4,12 @@
#include <util/string.h> #include <util/string.h>
#include <boost/algorithm/string/replace.hpp> #include <regex>
#include <string>
#include <utility>
void ReplaceAll(std::string& in_out, std::string_view search, std::string_view substitute) void ReplaceAll(std::string& in_out, const std::string& search, const std::string& substitute)
{ {
boost::replace_all(in_out, search, substitute); if (search.empty()) return;
in_out = std::regex_replace(in_out, std::regex(std::move(search)), substitute);
} }

2
src/util/string.h
View File

@ -17,7 +17,7 @@
#include <string_view> #include <string_view>
#include <vector> #include <vector>
void ReplaceAll(std::string& in_out, std::string_view search, std::string_view substitute); void ReplaceAll(std::string& in_out, const std::string& search, const std::string& substitute);
[[nodiscard]] inline std::vector<std::string> SplitString(std::string_view str, char sep) [[nodiscard]] inline std::vector<std::string> SplitString(std::string_view str, char sep)
{ {

1
test/lint/lint-includes.sh
View File

@ -49,7 +49,6 @@ if [[ ${INCLUDED_CPP_FILES} != "" ]]; then
fi fi
EXPECTED_BOOST_INCLUDES=( EXPECTED_BOOST_INCLUDES=(
boost/algorithm/string/replace.hpp
boost/date_time/posix_time/posix_time.hpp boost/date_time/posix_time/posix_time.hpp
boost/filesystem.hpp boost/filesystem.hpp
boost/filesystem/fstream.hpp boost/filesystem/fstream.hpp