From df0e1993b7cf3407f6e842ee91eeabde5c56c739 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 12 Nov 2024 15:05:22 -0800 Subject: [PATCH] Include rearrangement: libutil Change-Id: Ibf4ee57e430ce1cd175f994d1db7964c8407ffa7 --- src/libutil/abstract-setting-to-json.hh | 6 +++--- src/libutil/apply-config-options.hh | 2 +- src/libutil/archive.cc | 14 +++++++------- src/libutil/archive.hh | 8 ++++---- src/libutil/args.cc | 16 ++++++++-------- src/libutil/args.hh | 6 +++--- src/libutil/args/root.hh | 2 +- src/libutil/canon-path.cc | 4 ++-- src/libutil/cgroup.cc | 10 +++++----- src/libutil/cgroup.hh | 2 +- src/libutil/compression.cc | 10 +++++----- src/libutil/compression.hh | 6 +++--- src/libutil/compute-levels.cc | 2 +- src/libutil/compute-levels.hh | 2 +- src/libutil/config-impl.hh | 6 +++--- src/libutil/config.cc | 20 ++++++++++---------- src/libutil/config.hh | 8 ++++---- src/libutil/current-process.cc | 16 ++++++++-------- src/libutil/current-process.hh | 2 +- src/libutil/deprecated-features-json.hh | 4 ++-- src/libutil/deprecated-features.cc | 6 +++--- src/libutil/deprecated-features.hh | 4 ++-- src/libutil/english.cc | 2 +- src/libutil/error.cc | 14 +++++++------- src/libutil/error.hh | 4 ++-- src/libutil/escape-char.cc | 2 +- src/libutil/escape-string.cc | 10 +++++----- src/libutil/exit.cc | 2 +- src/libutil/experimental-features-json.hh | 4 ++-- src/libutil/experimental-features.cc | 6 +++--- src/libutil/experimental-features.hh | 4 ++-- src/libutil/file-descriptor.cc | 12 ++++++------ src/libutil/file-descriptor.hh | 4 ++-- src/libutil/file-system.cc | 20 ++++++++++---------- src/libutil/file-system.hh | 6 +++--- src/libutil/fmt.cc | 2 +- src/libutil/fmt.hh | 2 +- src/libutil/generator.hh | 2 +- src/libutil/git.cc | 2 +- src/libutil/hash.cc | 14 +++++++------- src/libutil/hash.hh | 6 +++--- src/libutil/hilite.cc | 2 +- src/libutil/json-utils.cc | 4 ++-- src/libutil/logging-json.hh | 2 +- src/libutil/logging.cc | 12 ++++++------ src/libutil/logging.hh | 6 +++--- src/libutil/monitor-fd.hh | 6 +++--- src/libutil/mount.cc | 8 ++++---- src/libutil/mount.hh | 2 +- src/libutil/namespaces.cc | 12 ++++++------ src/libutil/pool.hh | 4 ++-- src/libutil/position.cc | 2 +- src/libutil/position.hh | 2 +- src/libutil/print-elided.cc | 6 +++--- src/libutil/processes.cc | 16 ++++++++-------- src/libutil/processes.hh | 6 +++--- src/libutil/references.cc | 6 +++--- src/libutil/references.hh | 2 +- src/libutil/regex-combinators.hh | 2 +- src/libutil/serialise.cc | 6 +++--- src/libutil/serialise.hh | 8 ++++---- src/libutil/shlex.cc | 4 ++-- src/libutil/shlex.hh | 2 +- src/libutil/signals.cc | 8 ++++---- src/libutil/signals.hh | 2 +- src/libutil/source-path.cc | 4 ++-- src/libutil/source-path.hh | 12 ++++++------ src/libutil/strings.cc | 4 ++-- src/libutil/strings.hh | 4 ++-- src/libutil/suggestions.cc | 6 +++--- src/libutil/suggestions.hh | 2 +- src/libutil/tarfile.cc | 10 +++++----- src/libutil/tarfile.hh | 2 +- src/libutil/terminal.cc | 6 +++--- src/libutil/thread-pool.cc | 6 +++--- src/libutil/thread-pool.hh | 4 ++-- src/libutil/topo-sort.hh | 2 +- src/libutil/unix-domain-socket.cc | 8 ++++---- src/libutil/unix-domain-socket.hh | 4 ++-- src/libutil/url-name.cc | 2 +- src/libutil/url-name.hh | 2 +- src/libutil/url.cc | 8 ++++---- src/libutil/url.hh | 2 +- src/libutil/users.cc | 8 ++++---- src/libutil/users.hh | 2 +- src/libutil/xml-writer.cc | 2 +- 86 files changed, 252 insertions(+), 252 deletions(-) diff --git a/src/libutil/abstract-setting-to-json.hh b/src/libutil/abstract-setting-to-json.hh index 60807412a..dbdd87d6f 100644 --- a/src/libutil/abstract-setting-to-json.hh +++ b/src/libutil/abstract-setting-to-json.hh @@ -2,10 +2,10 @@ ///@file #include -#include "config.hh" -#include "json-utils.hh" +#include "lix/libutil/config.hh" +#include "lix/libutil/json-utils.hh" // Required for instances of to_json and from_json for ExperimentalFeature -#include "experimental-features-json.hh" +#include "lix/libutil/experimental-features-json.hh" namespace nix { template diff --git a/src/libutil/apply-config-options.hh b/src/libutil/apply-config-options.hh index 533904a69..420440ace 100644 --- a/src/libutil/apply-config-options.hh +++ b/src/libutil/apply-config-options.hh @@ -4,7 +4,7 @@ * @brief Options for applying `Config` settings. */ -#include +#include "lix/libutil/types.hh" namespace nix { diff --git a/src/libutil/archive.cc b/src/libutil/archive.cc index ab7c1ce55..7ace1f044 100644 --- a/src/libutil/archive.cc +++ b/src/libutil/archive.cc @@ -12,13 +12,13 @@ #include #include -#include "archive.hh" -#include "file-system.hh" -#include "finally.hh" -#include "serialise.hh" -#include "config.hh" -#include "logging.hh" -#include "signals.hh" +#include "lix/libutil/archive.hh" +#include "lix/libutil/file-system.hh" +#include "lix/libutil/finally.hh" +#include "lix/libutil/serialise.hh" +#include "lix/libutil/config.hh" +#include "lix/libutil/logging.hh" +#include "lix/libutil/signals.hh" namespace nix { diff --git a/src/libutil/archive.hh b/src/libutil/archive.hh index c633bee00..a594ecc09 100644 --- a/src/libutil/archive.hh +++ b/src/libutil/archive.hh @@ -1,10 +1,10 @@ #pragma once ///@file -#include "generator.hh" -#include "types.hh" -#include "serialise.hh" -#include "file-system.hh" +#include "lix/libutil/generator.hh" +#include "lix/libutil/types.hh" +#include "lix/libutil/serialise.hh" +#include "lix/libutil/file-system.hh" namespace nix { diff --git a/src/libutil/args.cc b/src/libutil/args.cc index edcab23ac..92b24df20 100644 --- a/src/libutil/args.cc +++ b/src/libutil/args.cc @@ -1,12 +1,12 @@ -#include "args.hh" -#include "args/root.hh" -#include "hash.hh" -#include "strings.hh" -#include "json-utils.hh" // IWYU pragma: keep (instances) -#include "environment-variables.hh" +#include "lix/libutil/args.hh" +#include "lix/libutil/args/root.hh" +#include "lix/libutil/hash.hh" +#include "lix/libutil/strings.hh" +#include "lix/libutil/json-utils.hh" // IWYU pragma: keep (instances) +#include "lix/libutil/environment-variables.hh" -#include "experimental-features-json.hh" // IWYU pragma: keep (instances) -#include "logging.hh" +#include "lix/libutil/experimental-features-json.hh" // IWYU pragma: keep (instances) +#include "lix/libutil/logging.hh" #include diff --git a/src/libutil/args.hh b/src/libutil/args.hh index e2bac6415..dcec2ccbc 100644 --- a/src/libutil/args.hh +++ b/src/libutil/args.hh @@ -1,9 +1,9 @@ #pragma once ///@file -#include "experimental-features.hh" -#include "types.hh" -#include "ref.hh" +#include "lix/libutil/experimental-features.hh" +#include "lix/libutil/types.hh" +#include "lix/libutil/ref.hh" #include #include diff --git a/src/libutil/args/root.hh b/src/libutil/args/root.hh index 499ee6df4..2fe922ac1 100644 --- a/src/libutil/args/root.hh +++ b/src/libutil/args/root.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "args.hh" +#include "lix/libutil/args.hh" namespace nix { diff --git a/src/libutil/canon-path.cc b/src/libutil/canon-path.cc index f678fae94..af09705cc 100644 --- a/src/libutil/canon-path.cc +++ b/src/libutil/canon-path.cc @@ -1,5 +1,5 @@ -#include "canon-path.hh" -#include "file-system.hh" +#include "lix/libutil/canon-path.hh" +#include "lix/libutil/file-system.hh" namespace nix { diff --git a/src/libutil/cgroup.cc b/src/libutil/cgroup.cc index e28e21c3e..deff8565a 100644 --- a/src/libutil/cgroup.cc +++ b/src/libutil/cgroup.cc @@ -1,10 +1,10 @@ -#include "logging.hh" +#include "lix/libutil/logging.hh" #if __linux__ -#include "cgroup.hh" -#include "file-system.hh" -#include "finally.hh" -#include "strings.hh" +#include "lix/libutil/cgroup.hh" +#include "lix/libutil/file-system.hh" +#include "lix/libutil/finally.hh" +#include "lix/libutil/strings.hh" #include #include diff --git a/src/libutil/cgroup.hh b/src/libutil/cgroup.hh index 574ae8e5b..ed9d40e40 100644 --- a/src/libutil/cgroup.hh +++ b/src/libutil/cgroup.hh @@ -6,7 +6,7 @@ #include #include -#include "types.hh" +#include "lix/libutil/types.hh" namespace nix { diff --git a/src/libutil/compression.cc b/src/libutil/compression.cc index 51c820d55..cf211bc48 100644 --- a/src/libutil/compression.cc +++ b/src/libutil/compression.cc @@ -1,8 +1,8 @@ -#include "charptr-cast.hh" -#include "compression.hh" -#include "tarfile.hh" -#include "signals.hh" -#include "logging.hh" +#include "lix/libutil/charptr-cast.hh" +#include "lix/libutil/compression.hh" +#include "lix/libutil/tarfile.hh" +#include "lix/libutil/signals.hh" +#include "lix/libutil/logging.hh" #include #include diff --git a/src/libutil/compression.hh b/src/libutil/compression.hh index 9b22a0282..b49ded1b2 100644 --- a/src/libutil/compression.hh +++ b/src/libutil/compression.hh @@ -1,9 +1,9 @@ #pragma once ///@file -#include "ref.hh" -#include "types.hh" -#include "serialise.hh" +#include "lix/libutil/ref.hh" +#include "lix/libutil/types.hh" +#include "lix/libutil/serialise.hh" #include diff --git a/src/libutil/compute-levels.cc b/src/libutil/compute-levels.cc index 19eaedfa8..857d24ef1 100644 --- a/src/libutil/compute-levels.cc +++ b/src/libutil/compute-levels.cc @@ -1,4 +1,4 @@ -#include "types.hh" +#include "lix/libutil/types.hh" #if HAVE_LIBCPUID #include diff --git a/src/libutil/compute-levels.hh b/src/libutil/compute-levels.hh index 093e7a915..ebb55d1c3 100644 --- a/src/libutil/compute-levels.hh +++ b/src/libutil/compute-levels.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "types.hh" +#include "lix/libutil/types.hh" namespace nix { diff --git a/src/libutil/config-impl.hh b/src/libutil/config-impl.hh index 6abc9733a..5993693d4 100644 --- a/src/libutil/config-impl.hh +++ b/src/libutil/config-impl.hh @@ -12,9 +12,9 @@ * instantiation. */ -#include "args.hh" -#include "config.hh" -#include "logging.hh" +#include "lix/libutil/args.hh" +#include "lix/libutil/config.hh" +#include "lix/libutil/logging.hh" namespace nix { diff --git a/src/libutil/config.cc b/src/libutil/config.cc index 9599f58e6..ebc45ff13 100644 --- a/src/libutil/config.cc +++ b/src/libutil/config.cc @@ -1,14 +1,14 @@ -#include "config.hh" -#include "apply-config-options.hh" -#include "args.hh" -#include "abstract-setting-to-json.hh" -#include "experimental-features.hh" -#include "deprecated-features.hh" -#include "file-system.hh" -#include "logging.hh" -#include "strings.hh" +#include "lix/libutil/config.hh" +#include "lix/libutil/apply-config-options.hh" +#include "lix/libutil/args.hh" +#include "lix/libutil/abstract-setting-to-json.hh" +#include "lix/libutil/experimental-features.hh" +#include "lix/libutil/deprecated-features.hh" +#include "lix/libutil/file-system.hh" +#include "lix/libutil/logging.hh" +#include "lix/libutil/strings.hh" -#include "config-impl.hh" +#include "lix/libutil/config-impl.hh" #include diff --git a/src/libutil/config.hh b/src/libutil/config.hh index 88aa66367..33a60afde 100644 --- a/src/libutil/config.hh +++ b/src/libutil/config.hh @@ -7,10 +7,10 @@ #include -#include "types.hh" -#include "experimental-features.hh" -#include "deprecated-features.hh" -#include "apply-config-options.hh" +#include "lix/libutil/types.hh" +#include "lix/libutil/experimental-features.hh" +#include "lix/libutil/deprecated-features.hh" +#include "lix/libutil/apply-config-options.hh" namespace nix { diff --git a/src/libutil/current-process.cc b/src/libutil/current-process.cc index 3b3e46a9a..f8a850710 100644 --- a/src/libutil/current-process.cc +++ b/src/libutil/current-process.cc @@ -1,10 +1,11 @@ -#include "current-process.hh" -#include "error.hh" -#include "file-system.hh" -#include "logging.hh" -#include "namespaces.hh" -#include "signals.hh" -#include "strings.hh" +#include "lix/libutil/current-process.hh" +#include "lix/libutil/error.hh" +#include "lix/libutil/file-system.hh" +#include "lix/libutil/logging.hh" +#include "lix/libutil/namespaces.hh" +#include "lix/libutil/signals.hh" +#include "lix/libutil/strings.hh" +#include "lix/libutil/cgroup.hh" #include #ifdef __APPLE__ @@ -21,7 +22,6 @@ #endif #include -#include namespace nix { diff --git a/src/libutil/current-process.hh b/src/libutil/current-process.hh index 245946368..316af234e 100644 --- a/src/libutil/current-process.hh +++ b/src/libutil/current-process.hh @@ -4,7 +4,7 @@ #include #include -#include "types.hh" +#include "lix/libutil/types.hh" namespace nix { diff --git a/src/libutil/deprecated-features-json.hh b/src/libutil/deprecated-features-json.hh index 787be40dc..fef94f872 100644 --- a/src/libutil/deprecated-features-json.hh +++ b/src/libutil/deprecated-features-json.hh @@ -1,8 +1,8 @@ #pragma once ///@file -#include "deprecated-features.hh" -#include "json-utils.hh" +#include "lix/libutil/deprecated-features.hh" +#include "lix/libutil/json-utils.hh" namespace nix { diff --git a/src/libutil/deprecated-features.cc b/src/libutil/deprecated-features.cc index 65a003cd4..727a02f0c 100644 --- a/src/libutil/deprecated-features.cc +++ b/src/libutil/deprecated-features.cc @@ -1,7 +1,7 @@ -#include "deprecated-features.hh" +#include "lix/libutil/deprecated-features.hh" // Required for instances of to_json and from_json for DeprecatedFeature -#include "deprecated-features-json.hh" -#include "strings.hh" +#include "lix/libutil/deprecated-features-json.hh" +#include "lix/libutil/strings.hh" #include "nlohmann/json.hpp" diff --git a/src/libutil/deprecated-features.hh b/src/libutil/deprecated-features.hh index cd425e8f7..7f58ea3d3 100644 --- a/src/libutil/deprecated-features.hh +++ b/src/libutil/deprecated-features.hh @@ -1,8 +1,8 @@ #pragma once ///@file -#include "error.hh" -#include "types.hh" +#include "lix/libutil/error.hh" +#include "lix/libutil/types.hh" namespace nix { diff --git a/src/libutil/english.cc b/src/libutil/english.cc index 8c93c9156..d66957aaf 100644 --- a/src/libutil/english.cc +++ b/src/libutil/english.cc @@ -1,4 +1,4 @@ -#include "english.hh" +#include "lix/libutil/english.hh" namespace nix { diff --git a/src/libutil/error.cc b/src/libutil/error.cc index f57e3ef7d..cd5382d66 100644 --- a/src/libutil/error.cc +++ b/src/libutil/error.cc @@ -1,10 +1,10 @@ -#include "environment-variables.hh" -#include "error.hh" -#include "logging.hh" -#include "position.hh" -#include "terminal.hh" -#include "strings.hh" -#include "signals.hh" +#include "lix/libutil/environment-variables.hh" +#include "lix/libutil/error.hh" +#include "lix/libutil/logging.hh" +#include "lix/libutil/position.hh" +#include "lix/libutil/terminal.hh" +#include "lix/libutil/strings.hh" +#include "lix/libutil/signals.hh" #include #include diff --git a/src/libutil/error.hh b/src/libutil/error.hh index 885a2b218..451319494 100644 --- a/src/libutil/error.hh +++ b/src/libutil/error.hh @@ -15,8 +15,8 @@ * See libutil/tests/logging.cc for usage examples. */ -#include "suggestions.hh" -#include "fmt.hh" +#include "lix/libutil/suggestions.hh" +#include "lix/libutil/fmt.hh" #include #include diff --git a/src/libutil/escape-char.cc b/src/libutil/escape-char.cc index 132260286..4fcce3397 100644 --- a/src/libutil/escape-char.cc +++ b/src/libutil/escape-char.cc @@ -2,7 +2,7 @@ #include #include -#include "escape-char.hh" +#include "lix/libutil/escape-char.hh" namespace nix { diff --git a/src/libutil/escape-string.cc b/src/libutil/escape-string.cc index c3cea96d2..c550c960f 100644 --- a/src/libutil/escape-string.cc +++ b/src/libutil/escape-string.cc @@ -2,11 +2,11 @@ #include #include -#include "ansicolor.hh" -#include "escape-char.hh" -#include "english.hh" -#include "escape-string.hh" -#include "print-elided.hh" +#include "lix/libutil/ansicolor.hh" +#include "lix/libutil/escape-char.hh" +#include "lix/libutil/english.hh" +#include "lix/libutil/escape-string.hh" +#include "lix/libutil/print-elided.hh" namespace nix { diff --git a/src/libutil/exit.cc b/src/libutil/exit.cc index 73cd8b04e..9a1781ed9 100644 --- a/src/libutil/exit.cc +++ b/src/libutil/exit.cc @@ -1,4 +1,4 @@ -#include "exit.hh" +#include "lix/libutil/exit.hh" namespace nix { diff --git a/src/libutil/experimental-features-json.hh b/src/libutil/experimental-features-json.hh index a4f999a93..d015193b7 100644 --- a/src/libutil/experimental-features-json.hh +++ b/src/libutil/experimental-features-json.hh @@ -1,8 +1,8 @@ #pragma once ///@file -#include "experimental-features.hh" -#include "json-utils.hh" +#include "lix/libutil/experimental-features.hh" +#include "lix/libutil/json-utils.hh" namespace nix { diff --git a/src/libutil/experimental-features.cc b/src/libutil/experimental-features.cc index da3e6c2cd..60bcd38b9 100644 --- a/src/libutil/experimental-features.cc +++ b/src/libutil/experimental-features.cc @@ -1,7 +1,7 @@ -#include "experimental-features.hh" +#include "lix/libutil/experimental-features.hh" // Required for instances of to_json and from_json for ExperimentalFeature -#include "experimental-features-json.hh" -#include "strings.hh" +#include "lix/libutil/experimental-features-json.hh" +#include "lix/libutil/strings.hh" #include "nlohmann/json.hpp" diff --git a/src/libutil/experimental-features.hh b/src/libutil/experimental-features.hh index 3241ed955..349d71e4d 100644 --- a/src/libutil/experimental-features.hh +++ b/src/libutil/experimental-features.hh @@ -1,8 +1,8 @@ #pragma once ///@file -#include "error.hh" -#include "types.hh" +#include "lix/libutil/error.hh" +#include "lix/libutil/types.hh" namespace nix { diff --git a/src/libutil/file-descriptor.cc b/src/libutil/file-descriptor.cc index cbb2bb539..544562a4e 100644 --- a/src/libutil/file-descriptor.cc +++ b/src/libutil/file-descriptor.cc @@ -1,9 +1,9 @@ -#include "charptr-cast.hh" -#include "file-system.hh" -#include "finally.hh" -#include "logging.hh" -#include "serialise.hh" -#include "signals.hh" +#include "lix/libutil/charptr-cast.hh" +#include "lix/libutil/file-system.hh" +#include "lix/libutil/finally.hh" +#include "lix/libutil/logging.hh" +#include "lix/libutil/serialise.hh" +#include "lix/libutil/signals.hh" #include #include diff --git a/src/libutil/file-descriptor.hh b/src/libutil/file-descriptor.hh index 7270b73b5..5331751cb 100644 --- a/src/libutil/file-descriptor.hh +++ b/src/libutil/file-descriptor.hh @@ -1,8 +1,8 @@ #pragma once ///@file -#include "error.hh" -#include "generator.hh" +#include "lix/libutil/error.hh" +#include "lix/libutil/generator.hh" namespace nix { diff --git a/src/libutil/file-system.cc b/src/libutil/file-system.cc index 36d44f924..9322e96c1 100644 --- a/src/libutil/file-system.cc +++ b/src/libutil/file-system.cc @@ -4,16 +4,16 @@ #include #include -#include "environment-variables.hh" -#include "file-descriptor.hh" -#include "file-system.hh" -#include "finally.hh" -#include "logging.hh" -#include "serialise.hh" -#include "signals.hh" -#include "strings.hh" -#include "types.hh" -#include "users.hh" +#include "lix/libutil/environment-variables.hh" +#include "lix/libutil/file-descriptor.hh" +#include "lix/libutil/file-system.hh" +#include "lix/libutil/finally.hh" +#include "lix/libutil/logging.hh" +#include "lix/libutil/serialise.hh" +#include "lix/libutil/signals.hh" +#include "lix/libutil/strings.hh" +#include "lix/libutil/types.hh" +#include "lix/libutil/users.hh" namespace fs = std::filesystem; diff --git a/src/libutil/file-system.hh b/src/libutil/file-system.hh index f8265ff87..d878d5fc3 100644 --- a/src/libutil/file-system.hh +++ b/src/libutil/file-system.hh @@ -5,9 +5,9 @@ * Utiltities for working with the file sytem and file paths. */ -#include "box_ptr.hh" -#include "types.hh" -#include "file-descriptor.hh" +#include "lix/libutil/box_ptr.hh" +#include "lix/libutil/types.hh" +#include "lix/libutil/file-descriptor.hh" #include #include diff --git a/src/libutil/fmt.cc b/src/libutil/fmt.cc index bff5af020..b45448e3b 100644 --- a/src/libutil/fmt.cc +++ b/src/libutil/fmt.cc @@ -1,4 +1,4 @@ -#include "fmt.hh" // IWYU pragma: keep +#include "lix/libutil/fmt.hh" // IWYU pragma: keep // Darwin and FreeBSD stdenv do not define _GNU_SOURCE but do have _Unwind_Backtrace. #if __APPLE__ || __FreeBSD__ #define BOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED diff --git a/src/libutil/fmt.hh b/src/libutil/fmt.hh index 5feefdf90..2c0a07c88 100644 --- a/src/libutil/fmt.hh +++ b/src/libutil/fmt.hh @@ -4,7 +4,7 @@ #include #include #include -#include "ansicolor.hh" +#include "lix/libutil/ansicolor.hh" // Explicit instantiation in fmt.cc extern template class boost::basic_format; diff --git a/src/libutil/generator.hh b/src/libutil/generator.hh index fda257002..e6d674466 100644 --- a/src/libutil/generator.hh +++ b/src/libutil/generator.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "types.hh" +#include "lix/libutil/types.hh" #include #include diff --git a/src/libutil/git.cc b/src/libutil/git.cc index f35c2fdb7..476d41587 100644 --- a/src/libutil/git.cc +++ b/src/libutil/git.cc @@ -1,4 +1,4 @@ -#include "git.hh" +#include "lix/libutil/git.hh" #include diff --git a/src/libutil/hash.cc b/src/libutil/hash.cc index d383e9802..d8952e013 100644 --- a/src/libutil/hash.cc +++ b/src/libutil/hash.cc @@ -4,13 +4,13 @@ #include #include -#include "args.hh" -#include "hash.hh" -#include "archive.hh" -#include "charptr-cast.hh" -#include "logging.hh" -#include "split.hh" -#include "strings.hh" +#include "lix/libutil/args.hh" +#include "lix/libutil/hash.hh" +#include "lix/libutil/archive.hh" +#include "lix/libutil/charptr-cast.hh" +#include "lix/libutil/logging.hh" +#include "lix/libutil/split.hh" +#include "lix/libutil/strings.hh" #include #include diff --git a/src/libutil/hash.hh b/src/libutil/hash.hh index 47e970e17..c0f50c744 100644 --- a/src/libutil/hash.hh +++ b/src/libutil/hash.hh @@ -1,9 +1,9 @@ #pragma once ///@file -#include "types.hh" -#include "serialise.hh" -#include "file-system.hh" +#include "lix/libutil/types.hh" +#include "lix/libutil/serialise.hh" +#include "lix/libutil/file-system.hh" namespace nix { diff --git a/src/libutil/hilite.cc b/src/libutil/hilite.cc index e5088230d..43acb9cd5 100644 --- a/src/libutil/hilite.cc +++ b/src/libutil/hilite.cc @@ -1,4 +1,4 @@ -#include "hilite.hh" +#include "lix/libutil/hilite.hh" namespace nix { diff --git a/src/libutil/json-utils.cc b/src/libutil/json-utils.cc index 61cef743d..204f7b411 100644 --- a/src/libutil/json-utils.cc +++ b/src/libutil/json-utils.cc @@ -1,5 +1,5 @@ -#include "json-utils.hh" -#include "error.hh" +#include "lix/libutil/json-utils.hh" +#include "lix/libutil/error.hh" namespace nix { diff --git a/src/libutil/logging-json.hh b/src/libutil/logging-json.hh index 8263ad707..a76904a3e 100644 --- a/src/libutil/logging-json.hh +++ b/src/libutil/logging-json.hh @@ -4,7 +4,7 @@ ///@brief Logging functions for json specifically, split due to the cost of ///including nlohmann. -#include "logging.hh" +#include "lix/libutil/logging.hh" #include diff --git a/src/libutil/logging.cc b/src/libutil/logging.cc index d3d9a225c..5adbf078d 100644 --- a/src/libutil/logging.cc +++ b/src/libutil/logging.cc @@ -1,9 +1,9 @@ -#include "environment-variables.hh" -#include "file-descriptor.hh" -#include "logging.hh" -#include "config.hh" -#include "position.hh" -#include "terminal.hh" +#include "lix/libutil/environment-variables.hh" +#include "lix/libutil/file-descriptor.hh" +#include "lix/libutil/logging.hh" +#include "lix/libutil/config.hh" +#include "lix/libutil/position.hh" +#include "lix/libutil/terminal.hh" #include #include diff --git a/src/libutil/logging.hh b/src/libutil/logging.hh index 8cefcb5e5..1afa103e1 100644 --- a/src/libutil/logging.hh +++ b/src/libutil/logging.hh @@ -1,9 +1,9 @@ #pragma once ///@file -#include "types.hh" -#include "error.hh" -#include "config.hh" +#include "lix/libutil/types.hh" +#include "lix/libutil/error.hh" +#include "lix/libutil/config.hh" namespace nix { diff --git a/src/libutil/monitor-fd.hh b/src/libutil/monitor-fd.hh index ea6e89017..92ed9ff65 100644 --- a/src/libutil/monitor-fd.hh +++ b/src/libutil/monitor-fd.hh @@ -10,9 +10,9 @@ #include #include -#include "error.hh" -#include "file-descriptor.hh" -#include "signals.hh" +#include "lix/libutil/error.hh" +#include "lix/libutil/file-descriptor.hh" +#include "lix/libutil/signals.hh" namespace nix { diff --git a/src/libutil/mount.cc b/src/libutil/mount.cc index 025ced5b9..495344208 100644 --- a/src/libutil/mount.cc +++ b/src/libutil/mount.cc @@ -1,7 +1,7 @@ -#include "mount.hh" -#include "error.hh" -#include "file-system.hh" -#include "logging.hh" +#include "lix/libutil/mount.hh" +#include "lix/libutil/error.hh" +#include "lix/libutil/file-system.hh" +#include "lix/libutil/logging.hh" #if __linux__ #include diff --git a/src/libutil/mount.hh b/src/libutil/mount.hh index 59e2218be..6c8e55c23 100644 --- a/src/libutil/mount.hh +++ b/src/libutil/mount.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "types.hh" +#include "lix/libutil/types.hh" #if __linux__ namespace nix { diff --git a/src/libutil/namespaces.cc b/src/libutil/namespaces.cc index 247fba2c4..f90368164 100644 --- a/src/libutil/namespaces.cc +++ b/src/libutil/namespaces.cc @@ -1,9 +1,9 @@ -#include "file-descriptor.hh" -#include "file-system.hh" -#include "logging.hh" -#include "namespaces.hh" -#include "processes.hh" -#include "strings.hh" +#include "lix/libutil/file-descriptor.hh" +#include "lix/libutil/file-system.hh" +#include "lix/libutil/logging.hh" +#include "lix/libutil/namespaces.hh" +#include "lix/libutil/processes.hh" +#include "lix/libutil/strings.hh" #include diff --git a/src/libutil/pool.hh b/src/libutil/pool.hh index 1cece71ec..bd8c5366d 100644 --- a/src/libutil/pool.hh +++ b/src/libutil/pool.hh @@ -7,8 +7,8 @@ #include #include -#include "sync.hh" -#include "ref.hh" +#include "lix/libutil/sync.hh" +#include "lix/libutil/ref.hh" namespace nix { diff --git a/src/libutil/position.cc b/src/libutil/position.cc index 724e560b7..bbeb2e579 100644 --- a/src/libutil/position.cc +++ b/src/libutil/position.cc @@ -1,4 +1,4 @@ -#include "position.hh" +#include "lix/libutil/position.hh" namespace nix { diff --git a/src/libutil/position.hh b/src/libutil/position.hh index 9bdf3b4b5..9820ed177 100644 --- a/src/libutil/position.hh +++ b/src/libutil/position.hh @@ -8,7 +8,7 @@ #include #include -#include "source-path.hh" +#include "lix/libutil/source-path.hh" namespace nix { diff --git a/src/libutil/print-elided.cc b/src/libutil/print-elided.cc index 75357e5bc..f85af9e29 100644 --- a/src/libutil/print-elided.cc +++ b/src/libutil/print-elided.cc @@ -1,6 +1,6 @@ -#include "print-elided.hh" -#include "ansicolor.hh" -#include "english.hh" +#include "lix/libutil/print-elided.hh" +#include "lix/libutil/ansicolor.hh" +#include "lix/libutil/english.hh" namespace nix { diff --git a/src/libutil/processes.cc b/src/libutil/processes.cc index eec592221..4532ae6b9 100644 --- a/src/libutil/processes.cc +++ b/src/libutil/processes.cc @@ -1,11 +1,11 @@ -#include "current-process.hh" -#include "environment-variables.hh" -#include "finally.hh" -#include "logging.hh" -#include "processes.hh" -#include "strings.hh" -#include "serialise.hh" -#include "signals.hh" +#include "lix/libutil/current-process.hh" +#include "lix/libutil/environment-variables.hh" +#include "lix/libutil/finally.hh" +#include "lix/libutil/logging.hh" +#include "lix/libutil/processes.hh" +#include "lix/libutil/strings.hh" +#include "lix/libutil/serialise.hh" +#include "lix/libutil/signals.hh" #include #include diff --git a/src/libutil/processes.hh b/src/libutil/processes.hh index dd6e2978e..e9e4eb15a 100644 --- a/src/libutil/processes.hh +++ b/src/libutil/processes.hh @@ -1,9 +1,9 @@ #pragma once ///@file -#include "types.hh" -#include "error.hh" -#include "file-descriptor.hh" +#include "lix/libutil/types.hh" +#include "lix/libutil/error.hh" +#include "lix/libutil/file-descriptor.hh" #include #include diff --git a/src/libutil/references.cc b/src/libutil/references.cc index 9f4ab0678..952b14195 100644 --- a/src/libutil/references.cc +++ b/src/libutil/references.cc @@ -1,6 +1,6 @@ -#include "references.hh" -#include "hash.hh" -#include "logging.hh" +#include "lix/libutil/references.hh" +#include "lix/libutil/hash.hh" +#include "lix/libutil/logging.hh" #include #include diff --git a/src/libutil/references.hh b/src/libutil/references.hh index f0f467190..6dd57a795 100644 --- a/src/libutil/references.hh +++ b/src/libutil/references.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "hash.hh" +#include "lix/libutil/hash.hh" namespace nix { diff --git a/src/libutil/regex-combinators.hh b/src/libutil/regex-combinators.hh index 37962944e..384fb4d00 100644 --- a/src/libutil/regex-combinators.hh +++ b/src/libutil/regex-combinators.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "strings.hh" +#include "lix/libutil/strings.hh" #include diff --git a/src/libutil/serialise.cc b/src/libutil/serialise.cc index 2f5a11a28..10310c561 100644 --- a/src/libutil/serialise.cc +++ b/src/libutil/serialise.cc @@ -1,6 +1,6 @@ -#include "serialise.hh" -#include "charptr-cast.hh" -#include "signals.hh" +#include "lix/libutil/serialise.hh" +#include "lix/libutil/charptr-cast.hh" +#include "lix/libutil/signals.hh" #include #include diff --git a/src/libutil/serialise.hh b/src/libutil/serialise.hh index 08ea9a135..3e5f391cd 100644 --- a/src/libutil/serialise.hh +++ b/src/libutil/serialise.hh @@ -3,10 +3,10 @@ #include -#include "charptr-cast.hh" -#include "generator.hh" -#include "types.hh" -#include "file-descriptor.hh" +#include "lix/libutil/charptr-cast.hh" +#include "lix/libutil/generator.hh" +#include "lix/libutil/types.hh" +#include "lix/libutil/file-descriptor.hh" namespace nix { diff --git a/src/libutil/shlex.cc b/src/libutil/shlex.cc index b923fef65..150e7414d 100644 --- a/src/libutil/shlex.cc +++ b/src/libutil/shlex.cc @@ -1,5 +1,5 @@ -#include "shlex.hh" -#include "strings.hh" +#include "lix/libutil/shlex.hh" +#include "lix/libutil/strings.hh" namespace nix { diff --git a/src/libutil/shlex.hh b/src/libutil/shlex.hh index 6ebe272ad..2d47604c1 100644 --- a/src/libutil/shlex.hh +++ b/src/libutil/shlex.hh @@ -5,7 +5,7 @@ #include #include -#include "error.hh" +#include "lix/libutil/error.hh" namespace nix { diff --git a/src/libutil/signals.cc b/src/libutil/signals.cc index 6d5201a78..45edcaa65 100644 --- a/src/libutil/signals.cc +++ b/src/libutil/signals.cc @@ -1,7 +1,7 @@ -#include "signals.hh" -#include "error.hh" -#include "sync.hh" -#include "terminal.hh" +#include "lix/libutil/signals.hh" +#include "lix/libutil/error.hh" +#include "lix/libutil/sync.hh" +#include "lix/libutil/terminal.hh" #include #include diff --git a/src/libutil/signals.hh b/src/libutil/signals.hh index 10ee38e60..75a5b3caf 100644 --- a/src/libutil/signals.hh +++ b/src/libutil/signals.hh @@ -19,7 +19,7 @@ */ -#include "error.hh" +#include "lix/libutil/error.hh" #include #include diff --git a/src/libutil/source-path.cc b/src/libutil/source-path.cc index 782005ef1..ce7c77b49 100644 --- a/src/libutil/source-path.cc +++ b/src/libutil/source-path.cc @@ -1,5 +1,5 @@ -#include "source-path.hh" -#include "strings.hh" +#include "lix/libutil/source-path.hh" +#include "lix/libutil/strings.hh" namespace nix { diff --git a/src/libutil/source-path.hh b/src/libutil/source-path.hh index fe5b9b777..f64fd641f 100644 --- a/src/libutil/source-path.hh +++ b/src/libutil/source-path.hh @@ -5,12 +5,12 @@ * @brief SourcePath */ -#include "ref.hh" -#include "archive.hh" -#include "canon-path.hh" -#include "file-system.hh" -#include "repair-flag.hh" -#include "input-accessor.hh" +#include "lix/libutil/ref.hh" +#include "lix/libutil/archive.hh" +#include "lix/libutil/canon-path.hh" +#include "lix/libutil/file-system.hh" +#include "lix/libutil/repair-flag.hh" +#include "lix/libutil/input-accessor.hh" namespace nix { diff --git a/src/libutil/strings.cc b/src/libutil/strings.cc index de9a0eb9f..274207d3c 100644 --- a/src/libutil/strings.cc +++ b/src/libutil/strings.cc @@ -1,5 +1,5 @@ -#include "strings.hh" -#include "references.hh" +#include "lix/libutil/strings.hh" +#include "lix/libutil/references.hh" #include #include diff --git a/src/libutil/strings.hh b/src/libutil/strings.hh index 782807b61..2f865c379 100644 --- a/src/libutil/strings.hh +++ b/src/libutil/strings.hh @@ -1,8 +1,8 @@ #pragma once ///@file -#include "error.hh" -#include "types.hh" +#include "lix/libutil/error.hh" +#include "lix/libutil/types.hh" #include diff --git a/src/libutil/suggestions.cc b/src/libutil/suggestions.cc index cae52cf29..14a526a55 100644 --- a/src/libutil/suggestions.cc +++ b/src/libutil/suggestions.cc @@ -1,6 +1,6 @@ -#include "suggestions.hh" -#include "ansicolor.hh" -#include "terminal.hh" +#include "lix/libutil/suggestions.hh" +#include "lix/libutil/ansicolor.hh" +#include "lix/libutil/terminal.hh" #include #include diff --git a/src/libutil/suggestions.hh b/src/libutil/suggestions.hh index 3cac1371e..a0c7f4b67 100644 --- a/src/libutil/suggestions.hh +++ b/src/libutil/suggestions.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "comparator.hh" +#include "lix/libutil/comparator.hh" #include #include diff --git a/src/libutil/tarfile.cc b/src/libutil/tarfile.cc index 316751533..23e9397a9 100644 --- a/src/libutil/tarfile.cc +++ b/src/libutil/tarfile.cc @@ -1,11 +1,11 @@ #include #include -#include "charptr-cast.hh" -#include "file-system.hh" -#include "logging.hh" -#include "serialise.hh" -#include "tarfile.hh" +#include "lix/libutil/charptr-cast.hh" +#include "lix/libutil/file-system.hh" +#include "lix/libutil/logging.hh" +#include "lix/libutil/serialise.hh" +#include "lix/libutil/tarfile.hh" namespace nix { diff --git a/src/libutil/tarfile.hh b/src/libutil/tarfile.hh index 237d18c31..d355e001a 100644 --- a/src/libutil/tarfile.hh +++ b/src/libutil/tarfile.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "serialise.hh" +#include "lix/libutil/serialise.hh" #include namespace nix { diff --git a/src/libutil/terminal.cc b/src/libutil/terminal.cc index 25e97e599..e436fde24 100644 --- a/src/libutil/terminal.cc +++ b/src/libutil/terminal.cc @@ -1,6 +1,6 @@ -#include "terminal.hh" -#include "environment-variables.hh" -#include "sync.hh" +#include "lix/libutil/terminal.hh" +#include "lix/libutil/environment-variables.hh" +#include "lix/libutil/sync.hh" #include #include diff --git a/src/libutil/thread-pool.cc b/src/libutil/thread-pool.cc index 1c4488373..b4ea8363f 100644 --- a/src/libutil/thread-pool.cc +++ b/src/libutil/thread-pool.cc @@ -1,6 +1,6 @@ -#include "thread-pool.hh" -#include "logging.hh" -#include "signals.hh" +#include "lix/libutil/thread-pool.hh" +#include "lix/libutil/logging.hh" +#include "lix/libutil/signals.hh" namespace nix { diff --git a/src/libutil/thread-pool.hh b/src/libutil/thread-pool.hh index 380e1a2d2..412290574 100644 --- a/src/libutil/thread-pool.hh +++ b/src/libutil/thread-pool.hh @@ -1,8 +1,8 @@ #pragma once ///@file -#include "error.hh" -#include "sync.hh" +#include "lix/libutil/error.hh" +#include "lix/libutil/sync.hh" #include #include diff --git a/src/libutil/topo-sort.hh b/src/libutil/topo-sort.hh index a52811fbf..c6ff856bc 100644 --- a/src/libutil/topo-sort.hh +++ b/src/libutil/topo-sort.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "error.hh" +#include "lix/libutil/error.hh" namespace nix { diff --git a/src/libutil/unix-domain-socket.cc b/src/libutil/unix-domain-socket.cc index d4fc37fab..36131a4e4 100644 --- a/src/libutil/unix-domain-socket.cc +++ b/src/libutil/unix-domain-socket.cc @@ -1,7 +1,7 @@ -#include "file-system.hh" -#include "processes.hh" -#include "unix-domain-socket.hh" -#include "strings.hh" +#include "lix/libutil/file-system.hh" +#include "lix/libutil/processes.hh" +#include "lix/libutil/unix-domain-socket.hh" +#include "lix/libutil/strings.hh" #include #include diff --git a/src/libutil/unix-domain-socket.hh b/src/libutil/unix-domain-socket.hh index 692ad2627..22524021c 100644 --- a/src/libutil/unix-domain-socket.hh +++ b/src/libutil/unix-domain-socket.hh @@ -1,8 +1,8 @@ #pragma once ///@file -#include "file-descriptor.hh" -#include "types.hh" +#include "lix/libutil/file-descriptor.hh" +#include "lix/libutil/types.hh" #include diff --git a/src/libutil/url-name.cc b/src/libutil/url-name.cc index 12c55db9a..ab4c5e0c6 100644 --- a/src/libutil/url-name.cc +++ b/src/libutil/url-name.cc @@ -1,6 +1,6 @@ #include -#include "url-name.hh" +#include "lix/libutil/url-name.hh" namespace nix { diff --git a/src/libutil/url-name.hh b/src/libutil/url-name.hh index dabd23ca1..4cb5a8790 100644 --- a/src/libutil/url-name.hh +++ b/src/libutil/url-name.hh @@ -4,7 +4,7 @@ #include #include -#include "url.hh" +#include "lix/libutil/url.hh" namespace nix { diff --git a/src/libutil/url.cc b/src/libutil/url.cc index f0586189b..23c25edf5 100644 --- a/src/libutil/url.cc +++ b/src/libutil/url.cc @@ -1,7 +1,7 @@ -#include "url.hh" -#include "url-parts.hh" -#include "split.hh" -#include "strings.hh" +#include "lix/libutil/url.hh" +#include "lix/libutil/url-parts.hh" +#include "lix/libutil/split.hh" +#include "lix/libutil/strings.hh" namespace nix { diff --git a/src/libutil/url.hh b/src/libutil/url.hh index a821301ba..aff8ba6b1 100644 --- a/src/libutil/url.hh +++ b/src/libutil/url.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "error.hh" +#include "lix/libutil/error.hh" #include namespace nix { diff --git a/src/libutil/users.cc b/src/libutil/users.cc index ce36bad9b..83490f30e 100644 --- a/src/libutil/users.cc +++ b/src/libutil/users.cc @@ -1,7 +1,7 @@ -#include "environment-variables.hh" -#include "file-system.hh" -#include "logging.hh" -#include "strings.hh" +#include "lix/libutil/environment-variables.hh" +#include "lix/libutil/file-system.hh" +#include "lix/libutil/logging.hh" +#include "lix/libutil/strings.hh" #include #include diff --git a/src/libutil/users.hh b/src/libutil/users.hh index 3add4c732..a9e95a918 100644 --- a/src/libutil/users.hh +++ b/src/libutil/users.hh @@ -1,7 +1,7 @@ #pragma once ///@file -#include "types.hh" +#include "lix/libutil/types.hh" #include diff --git a/src/libutil/xml-writer.cc b/src/libutil/xml-writer.cc index 7993bee9a..fe4f8a012 100644 --- a/src/libutil/xml-writer.cc +++ b/src/libutil/xml-writer.cc @@ -1,6 +1,6 @@ #include -#include "xml-writer.hh" +#include "lix/libutil/xml-writer.hh" namespace nix {