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

29
third_party/nix/src/libutil/util.cc vendored
View file

@ -12,6 +12,7 @@
#include <thread>
#include <utility>
#include <absl/strings/str_split.h>
#include <absl/strings/string_view.h>
#include <fcntl.h>
#include <grp.h>
@ -165,7 +166,7 @@ Path canonPath(const Path& path, bool resolveSymlinks) {
return s.empty() ? "/" : s;
}
Path dirOf(const Path& path) {
Path dirOf(absl::string_view path) {
Path::size_type pos = path.rfind('/');
if (pos == std::string::npos) {
return ".";
@ -542,7 +543,8 @@ Path getConfigDir() {
std::vector<Path> getConfigDirs() {
Path configHome = getConfigDir();
std::string configDirs = getEnv("XDG_CONFIG_DIRS");
auto result = tokenizeString<std::vector<std::string>>(configDirs, ":");
std::vector<std::string> result =
absl::StrSplit(configDirs, absl::ByChar(':'));
result.insert(result.begin(), configHome);
return result;
}
@ -1170,29 +1172,6 @@ void _interrupted() {
//////////////////////////////////////////////////////////////////////
template <class C>
C tokenizeString(const std::string& s, const std::string& separators) {
C result;
std::string::size_type pos = s.find_first_not_of(separators, 0);
while (pos != std::string::npos) {
std::string::size_type end = s.find_first_of(separators, pos + 1);
if (end == std::string::npos) {
end = s.size();
}
std::string token(s, pos, end - pos);
result.insert(result.end(), token);
pos = s.find_first_not_of(separators, end);
}
return result;
}
template Strings tokenizeString(const std::string& s,
const std::string& separators);
template StringSet tokenizeString(const std::string& s,
const std::string& separators);
template std::vector<std::string> tokenizeString(const std::string& s,
const std::string& separators);
std::string concatStringsSep(const std::string& sep, const Strings& ss) {
std::string s;
for (auto& i : ss) {