refactor: replace folly::split with dwarfs::split_to

src/internal/worker_group.cpp

@@ -36,13 +36,13 @@
 
 #include <fmt/format.h>
 
-#include <folly/String.h>
 #include <folly/portability/Windows.h>
 #include <folly/system/ThreadName.h>
 
 #include <dwarfs/error.h>
 #include <dwarfs/logger.h>
 #include <dwarfs/os_access.h>
+#include <dwarfs/string.h>
 #include <dwarfs/util.h>
 
 #include <dwarfs/internal/worker_group.h>
@@ -232,16 +232,13 @@ class basic_worker_group final : public worker_group::impl, private Policy {
 
   void check_set_affinity_from_enviroment(const char* group_name) {
     if (auto var = os_.getenv("DWARFS_WORKER_GROUP_AFFINITY")) {
-      std::vector<std::string_view> groups;
-      folly::split(':', var.value(), groups);
+      auto groups = split_to<std::vector<std::string_view>>(var.value(), ':');
 
       for (auto& group : groups) {
-        std::vector<std::string_view> parts;
-        folly::split('=', group, parts);
+        auto parts = split_to<std::vector<std::string_view>>(group, '=');
 
         if (parts.size() == 2 && parts[0] == group_name) {
-          std::vector<int> cpus;
-          folly::split(',', parts[1], cpus);
+          auto cpus = split_to<std::vector<int>>(parts[1], ',');
           set_affinity(cpus);
         }
       }

src/logger.cpp

@@ -25,7 +25,6 @@
 #include <stdexcept>
 
 #include <folly/Conv.h>
-#include <folly/String.h>
 #include <folly/small_vector.h>
 
 #include <dwarfs/config.h>
@@ -42,6 +41,7 @@
 #include <fmt/format.h>
 
 #include <dwarfs/logger.h>
+#include <dwarfs/string.h>
 #include <dwarfs/terminal_ansi.h>
 #include <dwarfs/util.h>
 
@@ -189,7 +189,7 @@ void stream_logger::write(level_type level, const std::string& output,
           color_ ? folly::symbolizer::SymbolizePrinter::COLOR : 0);
       printer.println(addresses, 3);
       stacktrace = printer.str();
-      folly::split('\n', stacktrace, st_lines);
+      split_to(stacktrace, '\n', st_lines);
       if (st_lines.back().empty()) {
         st_lines.pop_back();
       }
@@ -217,9 +217,9 @@ void stream_logger::write(level_type level, const std::string& output,
       tmp.reserve(output.size());
       std::copy_if(output.begin(), output.end(), std::back_inserter(tmp),
                    [](char c) { return c != '\r'; });
-      folly::split('\n', tmp, lines);
+      split_to(tmp, '\n', lines);
     } else {
-      folly::split('\n', output, lines);
+      split_to(output, '\n', lines);
     }
 
     if (lines.back().empty()) {

src/option_map.cpp

@@ -27,17 +27,15 @@
 #include <fmt/ranges.h>
 #endif
 
-#include <folly/String.h>
-
 #include <dwarfs/error.h>
 #include <dwarfs/option_map.h>
+#include <dwarfs/string.h>
 #include <dwarfs/util.h>
 
 namespace dwarfs {
 
 option_map::option_map(const std::string_view spec) {
-  std::vector<std::string_view> arg;
-  folly::split(':', spec, arg);
+  auto arg = split_to<std::vector<std::string_view>>(spec, ':');
 
   choice_ = arg[0];
 

src/writer/category_parser.cpp

@@ -21,8 +21,7 @@
 
 #include <fmt/format.h>
 
-#include <folly/String.h>
-
+#include <dwarfs/string.h>
 #include <dwarfs/writer/category_parser.h>
 #include <dwarfs/writer/category_resolver.h>
 
@@ -40,9 +39,8 @@ category_parser::parse(std::string_view arg) const {
   }
 
   std::vector<fragment_category::value_type> rv;
-  std::vector<std::string_view> categories;
+  auto categories = split_to<std::vector<std::string_view>>(arg, ',');
 
-  folly::split(',', arg, categories);
   rv.reserve(categories.size());
 
   for (auto const& name : categories) {

src/xattr_posix.cpp

@@ -21,8 +21,7 @@
 
 #include <sys/xattr.h>
 
-#include <folly/String.h>
-
+#include <dwarfs/string.h>
 #include <dwarfs/xattr.h>
 
 namespace dwarfs {
@@ -144,7 +143,7 @@ listxattr(std::filesystem::path const& path, std::error_code& ec) {
       if (size > 0) {
         // drop the last '\0'
         list.resize(size - 1);
-        folly::split('\0', list, names);
+        split_to(list, '\0', names);
       }
 
       return names;

test/compat_test.cpp

@@ -42,6 +42,7 @@
 #include <dwarfs/mmap.h>
 #include <dwarfs/options.h>
 #include <dwarfs/reader/filesystem_v2.h>
+#include <dwarfs/string.h>
 #include <dwarfs/thread_pool.h>
 #include <dwarfs/utility/filesystem_extractor.h>
 #include <dwarfs/utility/rewrite_filesystem.h>
@@ -999,15 +1000,17 @@ void check_compat(logger& lgr, reader::filesystem_v2 const& fs,
     }
 
     std::vector<std::string> parts;
-    folly::split(' ', line, parts);
+    split_to(line, ' ', parts);
     auto name = parts.front().substr(2);
     parts.erase(parts.begin());
     std::unordered_map<std::string, std::string> kv;
 
     for (auto const& p : parts) {
-      std::string key, value;
-      folly::split('=', p, key, value);
-      kv[key] = value;
+      auto pos = p.find('=');
+      if (pos == std::string::npos) {
+        throw std::runtime_error("unexpected mtree line: " + line);
+      }
+      kv[p.substr(0, pos)] = p.substr(pos + 1);
     }
 
     ++num;