diff options
| author | Tom Hubrecht <github@mail.hubrecht.ovh> | 2024-05-28 14:57:20 +0200 |
|---|---|---|
| committer | Tom Hubrecht <github@mail.hubrecht.ovh> | 2024-05-29 11:01:34 +0200 |
| commit | b91055112035c256fffd44d77f746b977cfdf3ca (patch) | |
| tree | a13d38c19913927a80cc8624ff9d2e68ee66beaf /src/libstore | |
| parent | 5b5a75979a0b954a5deefe79c8040bac1ad9c76a (diff) | |
util.{hh,cc}: Split out strings.{hh,cc}
Change-Id: I4f642d1046d56b5db26f1b0296ee16a0e02d444a
Diffstat (limited to 'src/libstore')
| -rw-r--r-- | src/libstore/crypto.cc | 2 | ||||
| -rw-r--r-- | src/libstore/machines.cc | 2 | ||||
| -rw-r--r-- | src/libstore/names.cc | 2 | ||||
| -rw-r--r-- | src/libstore/outputs-spec.cc | 3 | ||||
| -rw-r--r-- | src/libstore/ssh.cc | 3 |
5 files changed, 7 insertions, 5 deletions
diff --git a/src/libstore/crypto.cc b/src/libstore/crypto.cc index 1e29a812b..2e0fd8ca5 100644 --- a/src/libstore/crypto.cc +++ b/src/libstore/crypto.cc @@ -1,7 +1,7 @@ #include "crypto.hh" -#include "util.hh" #include "file-system.hh" #include "globals.hh" +#include "strings.hh" #include <sodium.h> diff --git a/src/libstore/machines.cc b/src/libstore/machines.cc index 700c9b3dd..cdd1e1c2c 100644 --- a/src/libstore/machines.cc +++ b/src/libstore/machines.cc @@ -1,7 +1,7 @@ #include "machines.hh" -#include "util.hh" #include "globals.hh" #include "store-api.hh" +#include "strings.hh" #include <algorithm> diff --git a/src/libstore/names.cc b/src/libstore/names.cc index 277aabf0f..b903a99f0 100644 --- a/src/libstore/names.cc +++ b/src/libstore/names.cc @@ -1,5 +1,5 @@ #include "names.hh" -#include "util.hh" +#include "strings.hh" #include <regex> diff --git a/src/libstore/outputs-spec.cc b/src/libstore/outputs-spec.cc index 21c069223..4422bcd21 100644 --- a/src/libstore/outputs-spec.cc +++ b/src/libstore/outputs-spec.cc @@ -1,10 +1,11 @@ #include <regex> #include <nlohmann/json.hpp> -#include "util.hh" #include "regex-combinators.hh" #include "outputs-spec.hh" #include "path-regex.hh" +#include "strings.hh" +#include "util.hh" namespace nix { diff --git a/src/libstore/ssh.cc b/src/libstore/ssh.cc index ccf0aef7f..932ebaa52 100644 --- a/src/libstore/ssh.cc +++ b/src/libstore/ssh.cc @@ -2,7 +2,8 @@ #include "environment-variables.hh" #include "ssh.hh" #include "finally.hh" -#include "util.hh" +#include "logging.hh" +#include "strings.hh" namespace nix { |