maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(3p/nix): Replace tokenizeStrings with absl::StrSplit

Browse source 
This function was a custom (and inefficient in the case of
single-character delimiters) string splitter which was used all over
the codebase. Abseil provides an appropriate replacement function.
This commit is contained in:
Vincent Ambo 2020-05-25 15:54:14 +01:00
parent b99b368d17
commit bf452cbc2a
29 changed files with 146 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

14
third_party/nix/src/libutil/config.cc vendored
View file

@ -1,14 +1,16 @@
#define GOOGLE_STRIP_LOG 0
#include "config.hh"
#include <string>
#include <utility>
#include <vector>
#include <absl/strings/numbers.h>
#include <absl/strings/str_split.h>
#include <absl/strings/string_view.h>
#include <glog/logging.h>
#include "args.hh"
#include "json.hh"
// #include <glog/log_severity.h>
namespace nix {
@ -99,7 +101,9 @@ void AbstractConfig::applyConfigFile(const Path& path) {
line = std::string(line, 0, hash);
}
auto tokens = tokenizeString<std::vector<std::string> >(line);
// TODO(tazjin): absl::string_view after path functions are fixed.
std::vector<std::string> tokens =
absl::StrSplit(line, absl::ByAnyChar(" \t\n\r"));
if (tokens.empty()) {
continue;
}
@ -258,7 +262,7 @@ void BaseSetting<bool>::convertToArg(Args& args, const std::string& category) {
template <>
void BaseSetting<Strings>::set(const std::string& str) {
value = tokenizeString<Strings>(str);
value = absl::StrSplit(str, absl::ByAnyChar(" \t\n\r"));
}
template <>
@ -276,7 +280,7 @@ void BaseSetting<Strings>::toJSON(JSONPlaceholder& out) {
template <>
void BaseSetting<StringSet>::set(const std::string& str) {
value = tokenizeString<StringSet>(str);
value = absl::StrSplit(str, absl::ByAnyChar(" \t\n\r"));
}
template <>