diff options
author | Vincent Ambo <tazjin@google.com> | 2020-05-25T14·54+0100 |
---|---|---|
committer | Vincent Ambo <tazjin@google.com> | 2020-05-25T14·54+0100 |
commit | bf452cbc2ae2b209ec262ce858deca470d086f24 (patch) | |
tree | 198e98902be569301ecb9a821b0c9512b128f930 /third_party/nix/src/libexpr/primops.cc | |
parent | b99b368d17f2e806a61f7abb83c6d3a9e4bbdc38 (diff) |
refactor(3p/nix): Replace tokenizeStrings with absl::StrSplit r/846
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.
Diffstat (limited to 'third_party/nix/src/libexpr/primops.cc')
-rw-r--r-- | third_party/nix/src/libexpr/primops.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/third_party/nix/src/libexpr/primops.cc b/third_party/nix/src/libexpr/primops.cc index fa0057041713..8ade52bd9122 100644 --- a/third_party/nix/src/libexpr/primops.cc +++ b/third_party/nix/src/libexpr/primops.cc @@ -4,6 +4,7 @@ #include <cstring> #include <regex> +#include <absl/strings/str_split.h> #include <dlfcn.h> #include <glog/logging.h> #include <sys/stat.h> @@ -712,7 +713,7 @@ static void prim_derivationStrict(EvalState& state, const Pos& pos, } else if (i->name == state.sOutputHashMode) { handleHashMode(s); } else if (i->name == state.sOutputs) { - handleOutputs(tokenizeString<Strings>(s)); + handleOutputs(absl::StrSplit(s, absl::ByAnyChar(" \t\n\r"))); } } } |