lix-project/lix
20
57
Fork 31
Code Issues 347 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Include rearrangement: libutil

Browse source 
Change-Id: Ibf4ee57e430ce1cd175f994d1db7964c8407ffa7
This commit is contained in:
jade 2024-11-12 15:05:22 -08:00
parent b62cc7b361
commit df0e1993b7
86 changed files with 252 additions and 252 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/libutil/abstract-setting-to-json.hh
View file

@ -2,10 +2,10 @@
///@file ///@file
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
#include "config.hh" #include "lix/libutil/config.hh"
#include "json-utils.hh" #include "lix/libutil/json-utils.hh"
// Required for instances of to_json and from_json for ExperimentalFeature // 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 { namespace nix {
template<typename T> template<typename T>

2
src/libutil/apply-config-options.hh
View file

@ -4,7 +4,7 @@
* @brief Options for applying `Config` settings. * @brief Options for applying `Config` settings.
*/ */
#include <types.hh> #include "lix/libutil/types.hh"
namespace nix { namespace nix {

14
src/libutil/archive.cc
View file

@ -12,13 +12,13 @@
#include <dirent.h> #include <dirent.h>
#include <fcntl.h> #include <fcntl.h>
#include "archive.hh" #include "lix/libutil/archive.hh"
#include "file-system.hh" #include "lix/libutil/file-system.hh"
#include "finally.hh" #include "lix/libutil/finally.hh"
#include "serialise.hh" #include "lix/libutil/serialise.hh"
#include "config.hh" #include "lix/libutil/config.hh"
#include "logging.hh" #include "lix/libutil/logging.hh"
#include "signals.hh" #include "lix/libutil/signals.hh"
namespace nix { namespace nix {

8
src/libutil/archive.hh
View file

@ -1,10 +1,10 @@
#pragma once #pragma once
///@file ///@file
#include "generator.hh" #include "lix/libutil/generator.hh"
#include "types.hh" #include "lix/libutil/types.hh"
#include "serialise.hh" #include "lix/libutil/serialise.hh"
#include "file-system.hh" #include "lix/libutil/file-system.hh"
namespace nix { namespace nix {

16
src/libutil/args.cc
View file

@ -1,12 +1,12 @@
#include "args.hh" #include "lix/libutil/args.hh"
#include "args/root.hh" #include "lix/libutil/args/root.hh"
#include "hash.hh" #include "lix/libutil/hash.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
#include "json-utils.hh" // IWYU pragma: keep (instances) #include "lix/libutil/json-utils.hh" // IWYU pragma: keep (instances)
#include "environment-variables.hh" #include "lix/libutil/environment-variables.hh"
#include "experimental-features-json.hh" // IWYU pragma: keep (instances) #include "lix/libutil/experimental-features-json.hh" // IWYU pragma: keep (instances)
#include "logging.hh" #include "lix/libutil/logging.hh"
#include <glob.h> #include <glob.h>

6
src/libutil/args.hh
View file

@ -1,9 +1,9 @@
#pragma once #pragma once
///@file ///@file
#include "experimental-features.hh" #include "lix/libutil/experimental-features.hh"
#include "types.hh" #include "lix/libutil/types.hh"
#include "ref.hh" #include "lix/libutil/ref.hh"
#include <functional> #include <functional>
#include <map> #include <map>

2
src/libutil/args/root.hh
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
///@file ///@file
#include "args.hh" #include "lix/libutil/args.hh"
namespace nix { namespace nix {

4
src/libutil/canon-path.cc
View file

@ -1,5 +1,5 @@
#include "canon-path.hh" #include "lix/libutil/canon-path.hh"
#include "file-system.hh" #include "lix/libutil/file-system.hh"
namespace nix { namespace nix {

10
src/libutil/cgroup.cc
View file

@ -1,10 +1,10 @@
#include "logging.hh" #include "lix/libutil/logging.hh"
#if __linux__ #if __linux__
#include "cgroup.hh" #include "lix/libutil/cgroup.hh"
#include "file-system.hh" #include "lix/libutil/file-system.hh"
#include "finally.hh" #include "lix/libutil/finally.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
#include <chrono> #include <chrono>
#include <cmath> #include <cmath>

2
src/libutil/cgroup.hh
View file

@ -6,7 +6,7 @@
#include <chrono> #include <chrono>
#include <optional> #include <optional>
#include "types.hh" #include "lix/libutil/types.hh"
namespace nix { namespace nix {

10
src/libutil/compression.cc
View file

@ -1,8 +1,8 @@
#include "charptr-cast.hh" #include "lix/libutil/charptr-cast.hh"
#include "compression.hh" #include "lix/libutil/compression.hh"
#include "tarfile.hh" #include "lix/libutil/tarfile.hh"
#include "signals.hh" #include "lix/libutil/signals.hh"
#include "logging.hh" #include "lix/libutil/logging.hh"
#include <archive.h> #include <archive.h>
#include <archive_entry.h> #include <archive_entry.h>

6
src/libutil/compression.hh
View file

@ -1,9 +1,9 @@
#pragma once #pragma once
///@file ///@file
#include "ref.hh" #include "lix/libutil/ref.hh"
#include "types.hh" #include "lix/libutil/types.hh"
#include "serialise.hh" #include "lix/libutil/serialise.hh"
#include <string> #include <string>

2
src/libutil/compute-levels.cc
View file

@ -1,4 +1,4 @@
#include "types.hh" #include "lix/libutil/types.hh"
#if HAVE_LIBCPUID #if HAVE_LIBCPUID
#include <libcpuid/libcpuid.h> #include <libcpuid/libcpuid.h>

2
src/libutil/compute-levels.hh
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
///@file ///@file
#include "types.hh" #include "lix/libutil/types.hh"
namespace nix { namespace nix {

6
src/libutil/config-impl.hh
View file

@ -12,9 +12,9 @@
* instantiation. * instantiation.
*/ */
#include "args.hh" #include "lix/libutil/args.hh"
#include "config.hh" #include "lix/libutil/config.hh"
#include "logging.hh" #include "lix/libutil/logging.hh"
namespace nix { namespace nix {

20
src/libutil/config.cc
View file

@ -1,14 +1,14 @@
#include "config.hh" #include "lix/libutil/config.hh"
#include "apply-config-options.hh" #include "lix/libutil/apply-config-options.hh"
#include "args.hh" #include "lix/libutil/args.hh"
#include "abstract-setting-to-json.hh" #include "lix/libutil/abstract-setting-to-json.hh"
#include "experimental-features.hh" #include "lix/libutil/experimental-features.hh"
#include "deprecated-features.hh" #include "lix/libutil/deprecated-features.hh"
#include "file-system.hh" #include "lix/libutil/file-system.hh"
#include "logging.hh" #include "lix/libutil/logging.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
#include "config-impl.hh" #include "lix/libutil/config-impl.hh"
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>

8
src/libutil/config.hh
View file

@ -7,10 +7,10 @@
#include <nlohmann/json_fwd.hpp> #include <nlohmann/json_fwd.hpp>
#include "types.hh" #include "lix/libutil/types.hh"
#include "experimental-features.hh" #include "lix/libutil/experimental-features.hh"
#include "deprecated-features.hh" #include "lix/libutil/deprecated-features.hh"
#include "apply-config-options.hh" #include "lix/libutil/apply-config-options.hh"
namespace nix { namespace nix {

16
src/libutil/current-process.cc
View file

@ -1,10 +1,11 @@
#include "current-process.hh" #include "lix/libutil/current-process.hh"
#include "error.hh" #include "lix/libutil/error.hh"
#include "file-system.hh" #include "lix/libutil/file-system.hh"
#include "logging.hh" #include "lix/libutil/logging.hh"
#include "namespaces.hh" #include "lix/libutil/namespaces.hh"
#include "signals.hh" #include "lix/libutil/signals.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
#include "lix/libutil/cgroup.hh"
#include <math.h> #include <math.h>
#ifdef __APPLE__ #ifdef __APPLE__
@ -21,7 +22,6 @@
#endif #endif
#include <sys/mount.h> #include <sys/mount.h>
#include <cgroup.hh>
namespace nix { namespace nix {

2
src/libutil/current-process.hh
View file

@ -4,7 +4,7 @@
#include <optional> #include <optional>
#include <sys/resource.h> #include <sys/resource.h>
#include "types.hh" #include "lix/libutil/types.hh"
namespace nix { namespace nix {

4
src/libutil/deprecated-features-json.hh
View file

@ -1,8 +1,8 @@
#pragma once #pragma once
///@file ///@file
#include "deprecated-features.hh" #include "lix/libutil/deprecated-features.hh"
#include "json-utils.hh" #include "lix/libutil/json-utils.hh"
namespace nix { namespace nix {

6
src/libutil/deprecated-features.cc
View file

@ -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 // Required for instances of to_json and from_json for DeprecatedFeature
#include "deprecated-features-json.hh" #include "lix/libutil/deprecated-features-json.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
#include "nlohmann/json.hpp" #include "nlohmann/json.hpp"

4
src/libutil/deprecated-features.hh
View file

@ -1,8 +1,8 @@
#pragma once #pragma once
///@file ///@file
#include "error.hh" #include "lix/libutil/error.hh"
#include "types.hh" #include "lix/libutil/types.hh"
namespace nix { namespace nix {

2
src/libutil/english.cc
View file

@ -1,4 +1,4 @@
#include "english.hh" #include "lix/libutil/english.hh"
namespace nix { namespace nix {

14
src/libutil/error.cc
View file

@ -1,10 +1,10 @@
#include "environment-variables.hh" #include "lix/libutil/environment-variables.hh"
#include "error.hh" #include "lix/libutil/error.hh"
#include "logging.hh" #include "lix/libutil/logging.hh"
#include "position.hh" #include "lix/libutil/position.hh"
#include "terminal.hh" #include "lix/libutil/terminal.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
#include "signals.hh" #include "lix/libutil/signals.hh"
#include <iostream> #include <iostream>
#include <optional> #include <optional>

4
src/libutil/error.hh
View file

@ -15,8 +15,8 @@
* See libutil/tests/logging.cc for usage examples. * See libutil/tests/logging.cc for usage examples.
*/ */
#include "suggestions.hh" #include "lix/libutil/suggestions.hh"
#include "fmt.hh" #include "lix/libutil/fmt.hh"
#include <cstring> #include <cstring>
#include <list> #include <list>

2
src/libutil/escape-char.cc
View file

@ -2,7 +2,7 @@
#include <iomanip> #include <iomanip>
#include <iostream> #include <iostream>
#include "escape-char.hh" #include "lix/libutil/escape-char.hh"
namespace nix { namespace nix {

10
src/libutil/escape-string.cc
View file

@ -2,11 +2,11 @@
#include <ostream> #include <ostream>
#include <sstream> #include <sstream>
#include "ansicolor.hh" #include "lix/libutil/ansicolor.hh"
#include "escape-char.hh" #include "lix/libutil/escape-char.hh"
#include "english.hh" #include "lix/libutil/english.hh"
#include "escape-string.hh" #include "lix/libutil/escape-string.hh"
#include "print-elided.hh" #include "lix/libutil/print-elided.hh"
namespace nix { namespace nix {

2
src/libutil/exit.cc
View file

@ -1,4 +1,4 @@
#include "exit.hh" #include "lix/libutil/exit.hh"
namespace nix { namespace nix {

4
src/libutil/experimental-features-json.hh
View file

@ -1,8 +1,8 @@
#pragma once #pragma once
///@file ///@file
#include "experimental-features.hh" #include "lix/libutil/experimental-features.hh"
#include "json-utils.hh" #include "lix/libutil/json-utils.hh"
namespace nix { namespace nix {

6
src/libutil/experimental-features.cc
View file

@ -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 // Required for instances of to_json and from_json for ExperimentalFeature
#include "experimental-features-json.hh" #include "lix/libutil/experimental-features-json.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
#include "nlohmann/json.hpp" #include "nlohmann/json.hpp"

4
src/libutil/experimental-features.hh
View file

@ -1,8 +1,8 @@
#pragma once #pragma once
///@file ///@file
#include "error.hh" #include "lix/libutil/error.hh"
#include "types.hh" #include "lix/libutil/types.hh"
namespace nix { namespace nix {

12
src/libutil/file-descriptor.cc
View file

@ -1,9 +1,9 @@
#include "charptr-cast.hh" #include "lix/libutil/charptr-cast.hh"
#include "file-system.hh" #include "lix/libutil/file-system.hh"
#include "finally.hh" #include "lix/libutil/finally.hh"
#include "logging.hh" #include "lix/libutil/logging.hh"
#include "serialise.hh" #include "lix/libutil/serialise.hh"
#include "signals.hh" #include "lix/libutil/signals.hh"
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>

4
src/libutil/file-descriptor.hh
View file

@ -1,8 +1,8 @@
#pragma once #pragma once
///@file ///@file
#include "error.hh" #include "lix/libutil/error.hh"
#include "generator.hh" #include "lix/libutil/generator.hh"
namespace nix { namespace nix {

20
src/libutil/file-system.cc
View file

@ -4,16 +4,16 @@
#include <atomic> #include <atomic>
#include <random> #include <random>
#include "environment-variables.hh" #include "lix/libutil/environment-variables.hh"
#include "file-descriptor.hh" #include "lix/libutil/file-descriptor.hh"
#include "file-system.hh" #include "lix/libutil/file-system.hh"
#include "finally.hh" #include "lix/libutil/finally.hh"
#include "logging.hh" #include "lix/libutil/logging.hh"
#include "serialise.hh" #include "lix/libutil/serialise.hh"
#include "signals.hh" #include "lix/libutil/signals.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
#include "types.hh" #include "lix/libutil/types.hh"
#include "users.hh" #include "lix/libutil/users.hh"
namespace fs = std::filesystem; namespace fs = std::filesystem;

6
src/libutil/file-system.hh
View file

@ -5,9 +5,9 @@
* Utiltities for working with the file sytem and file paths. * Utiltities for working with the file sytem and file paths.
*/ */
#include "box_ptr.hh" #include "lix/libutil/box_ptr.hh"
#include "types.hh" #include "lix/libutil/types.hh"
#include "file-descriptor.hh" #include "lix/libutil/file-descriptor.hh"
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>

2
src/libutil/fmt.cc
View file

@ -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. // Darwin and FreeBSD stdenv do not define _GNU_SOURCE but do have _Unwind_Backtrace.
#if __APPLE__ || __FreeBSD__ #if __APPLE__ || __FreeBSD__
#define BOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED #define BOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED

2
src/libutil/fmt.hh
View file

@ -4,7 +4,7 @@
#include <iostream> #include <iostream>
#include <string> #include <string>
#include <boost/format.hpp> #include <boost/format.hpp>
#include "ansicolor.hh" #include "lix/libutil/ansicolor.hh"
// Explicit instantiation in fmt.cc // Explicit instantiation in fmt.cc
extern template class boost::basic_format<char>; extern template class boost::basic_format<char>;

2
src/libutil/generator.hh
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
///@file ///@file
#include "types.hh" #include "lix/libutil/types.hh"
#include <coroutine> #include <coroutine>
#include <exception> #include <exception>

2
src/libutil/git.cc
View file

@ -1,4 +1,4 @@
#include "git.hh" #include "lix/libutil/git.hh"
#include <regex> #include <regex>

14
src/libutil/hash.cc
View file

@ -4,13 +4,13 @@
#include <openssl/md5.h> #include <openssl/md5.h>
#include <openssl/sha.h> #include <openssl/sha.h>
#include "args.hh" #include "lix/libutil/args.hh"
#include "hash.hh" #include "lix/libutil/hash.hh"
#include "archive.hh" #include "lix/libutil/archive.hh"
#include "charptr-cast.hh" #include "lix/libutil/charptr-cast.hh"
#include "logging.hh" #include "lix/libutil/logging.hh"
#include "split.hh" #include "lix/libutil/split.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>

6
src/libutil/hash.hh
View file

@ -1,9 +1,9 @@
#pragma once #pragma once
///@file ///@file
#include "types.hh" #include "lix/libutil/types.hh"
#include "serialise.hh" #include "lix/libutil/serialise.hh"
#include "file-system.hh" #include "lix/libutil/file-system.hh"
namespace nix { namespace nix {

2
src/libutil/hilite.cc
View file

@ -1,4 +1,4 @@
#include "hilite.hh" #include "lix/libutil/hilite.hh"
namespace nix { namespace nix {

4
src/libutil/json-utils.cc
View file

@ -1,5 +1,5 @@
#include "json-utils.hh" #include "lix/libutil/json-utils.hh"
#include "error.hh" #include "lix/libutil/error.hh"
namespace nix { namespace nix {

2
src/libutil/logging-json.hh
View file

@ -4,7 +4,7 @@
///@brief Logging functions for json specifically, split due to the cost of ///@brief Logging functions for json specifically, split due to the cost of
///including nlohmann. ///including nlohmann.
#include "logging.hh" #include "lix/libutil/logging.hh"
#include <nlohmann/json_fwd.hpp> #include <nlohmann/json_fwd.hpp>

12
src/libutil/logging.cc
View file

@ -1,9 +1,9 @@
#include "environment-variables.hh" #include "lix/libutil/environment-variables.hh"
#include "file-descriptor.hh" #include "lix/libutil/file-descriptor.hh"
#include "logging.hh" #include "lix/libutil/logging.hh"
#include "config.hh" #include "lix/libutil/config.hh"
#include "position.hh" #include "lix/libutil/position.hh"
#include "terminal.hh" #include "lix/libutil/terminal.hh"
#include <algorithm> #include <algorithm>
#include <atomic> #include <atomic>

6
src/libutil/logging.hh
View file

@ -1,9 +1,9 @@
#pragma once #pragma once
///@file ///@file
#include "types.hh" #include "lix/libutil/types.hh"
#include "error.hh" #include "lix/libutil/error.hh"
#include "config.hh" #include "lix/libutil/config.hh"
namespace nix { namespace nix {

6
src/libutil/monitor-fd.hh
View file

@ -10,9 +10,9 @@
#include <unistd.h> #include <unistd.h>
#include <signal.h> #include <signal.h>
#include "error.hh" #include "lix/libutil/error.hh"
#include "file-descriptor.hh" #include "lix/libutil/file-descriptor.hh"
#include "signals.hh" #include "lix/libutil/signals.hh"
namespace nix { namespace nix {

8
src/libutil/mount.cc
View file

@ -1,7 +1,7 @@
#include "mount.hh" #include "lix/libutil/mount.hh"
#include "error.hh" #include "lix/libutil/error.hh"
#include "file-system.hh" #include "lix/libutil/file-system.hh"
#include "logging.hh" #include "lix/libutil/logging.hh"
#if __linux__ #if __linux__
#include <sys/mount.h> #include <sys/mount.h>

2
src/libutil/mount.hh
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
///@file ///@file
#include "types.hh" #include "lix/libutil/types.hh"
#if __linux__ #if __linux__
namespace nix { namespace nix {

12
src/libutil/namespaces.cc
View file

@ -1,9 +1,9 @@
#include "file-descriptor.hh" #include "lix/libutil/file-descriptor.hh"
#include "file-system.hh" #include "lix/libutil/file-system.hh"
#include "logging.hh" #include "lix/libutil/logging.hh"
#include "namespaces.hh" #include "lix/libutil/namespaces.hh"
#include "processes.hh" #include "lix/libutil/processes.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
#include <sys/mount.h> #include <sys/mount.h>

4
src/libutil/pool.hh
View file

@ -7,8 +7,8 @@
#include <memory> #include <memory>
#include <cassert> #include <cassert>
#include "sync.hh" #include "lix/libutil/sync.hh"
#include "ref.hh" #include "lix/libutil/ref.hh"
namespace nix { namespace nix {

2
src/libutil/position.cc
View file

@ -1,4 +1,4 @@
#include "position.hh" #include "lix/libutil/position.hh"
namespace nix { namespace nix {

2
src/libutil/position.hh
View file

@ -8,7 +8,7 @@
#include <cstdint> #include <cstdint>
#include <string> #include <string>
#include "source-path.hh" #include "lix/libutil/source-path.hh"
namespace nix { namespace nix {

6
src/libutil/print-elided.cc
View file

@ -1,6 +1,6 @@
#include "print-elided.hh" #include "lix/libutil/print-elided.hh"
#include "ansicolor.hh" #include "lix/libutil/ansicolor.hh"
#include "english.hh" #include "lix/libutil/english.hh"
namespace nix { namespace nix {

16
src/libutil/processes.cc
View file

@ -1,11 +1,11 @@
#include "current-process.hh" #include "lix/libutil/current-process.hh"
#include "environment-variables.hh" #include "lix/libutil/environment-variables.hh"
#include "finally.hh" #include "lix/libutil/finally.hh"
#include "logging.hh" #include "lix/libutil/logging.hh"
#include "processes.hh" #include "lix/libutil/processes.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
#include "serialise.hh" #include "lix/libutil/serialise.hh"
#include "signals.hh" #include "lix/libutil/signals.hh"
#include <cerrno> #include <cerrno>
#include <cstdlib> #include <cstdlib>

6
src/libutil/processes.hh
View file

@ -1,9 +1,9 @@
#pragma once #pragma once
///@file ///@file
#include "types.hh" #include "lix/libutil/types.hh"
#include "error.hh" #include "lix/libutil/error.hh"
#include "file-descriptor.hh" #include "lix/libutil/file-descriptor.hh"
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>

6
src/libutil/references.cc
View file

@ -1,6 +1,6 @@
#include "references.hh" #include "lix/libutil/references.hh"
#include "hash.hh" #include "lix/libutil/hash.hh"
#include "logging.hh" #include "lix/libutil/logging.hh"
#include <cstdlib> #include <cstdlib>
#include <mutex> #include <mutex>

2
src/libutil/references.hh
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
///@file ///@file
#include "hash.hh" #include "lix/libutil/hash.hh"
namespace nix { namespace nix {

2
src/libutil/regex-combinators.hh
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
///@file ///@file
#include "strings.hh" #include "lix/libutil/strings.hh"
#include <string_view> #include <string_view>

6
src/libutil/serialise.cc
View file

@ -1,6 +1,6 @@
#include "serialise.hh" #include "lix/libutil/serialise.hh"
#include "charptr-cast.hh" #include "lix/libutil/charptr-cast.hh"
#include "signals.hh" #include "lix/libutil/signals.hh"
#include <cstring> #include <cstring>
#include <cerrno> #include <cerrno>

8
src/libutil/serialise.hh
View file

@ -3,10 +3,10 @@
#include <memory> #include <memory>
#include "charptr-cast.hh" #include "lix/libutil/charptr-cast.hh"
#include "generator.hh" #include "lix/libutil/generator.hh"
#include "types.hh" #include "lix/libutil/types.hh"
#include "file-descriptor.hh" #include "lix/libutil/file-descriptor.hh"
namespace nix { namespace nix {

4
src/libutil/shlex.cc
View file

@ -1,5 +1,5 @@
#include "shlex.hh" #include "lix/libutil/shlex.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
namespace nix { namespace nix {

2
src/libutil/shlex.hh
View file

@ -5,7 +5,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "error.hh" #include "lix/libutil/error.hh"
namespace nix { namespace nix {

8
src/libutil/signals.cc
View file

@ -1,7 +1,7 @@
#include "signals.hh" #include "lix/libutil/signals.hh"
#include "error.hh" #include "lix/libutil/error.hh"
#include "sync.hh" #include "lix/libutil/sync.hh"
#include "terminal.hh" #include "lix/libutil/terminal.hh"
#include <map> #include <map>
#include <thread> #include <thread>

2
src/libutil/signals.hh
View file

@ -19,7 +19,7 @@
*/ */
#include "error.hh" #include "lix/libutil/error.hh"
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>

4
src/libutil/source-path.cc
View file

@ -1,5 +1,5 @@
#include "source-path.hh" #include "lix/libutil/source-path.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
namespace nix { namespace nix {

12
src/libutil/source-path.hh
View file

@ -5,12 +5,12 @@
* @brief SourcePath * @brief SourcePath
*/ */
#include "ref.hh" #include "lix/libutil/ref.hh"
#include "archive.hh" #include "lix/libutil/archive.hh"
#include "canon-path.hh" #include "lix/libutil/canon-path.hh"
#include "file-system.hh" #include "lix/libutil/file-system.hh"
#include "repair-flag.hh" #include "lix/libutil/repair-flag.hh"
#include "input-accessor.hh" #include "lix/libutil/input-accessor.hh"
namespace nix { namespace nix {

4
src/libutil/strings.cc
View file

@ -1,5 +1,5 @@
#include "strings.hh" #include "lix/libutil/strings.hh"
#include "references.hh" #include "lix/libutil/references.hh"
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include <stdint.h> #include <stdint.h>

4
src/libutil/strings.hh
View file

@ -1,8 +1,8 @@
#pragma once #pragma once
///@file ///@file
#include "error.hh" #include "lix/libutil/error.hh"
#include "types.hh" #include "lix/libutil/types.hh"
#include <vector> #include <vector>

6
src/libutil/suggestions.cc
View file

@ -1,6 +1,6 @@
#include "suggestions.hh" #include "lix/libutil/suggestions.hh"
#include "ansicolor.hh" #include "lix/libutil/ansicolor.hh"
#include "terminal.hh" #include "lix/libutil/terminal.hh"
#include <algorithm> #include <algorithm>
#include <ostream> #include <ostream>

2
src/libutil/suggestions.hh
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
///@file ///@file
#include "comparator.hh" #include "lix/libutil/comparator.hh"
#include <set> #include <set>
#include <string_view> #include <string_view>

10
src/libutil/tarfile.cc
View file

@ -1,11 +1,11 @@
#include <archive.h> #include <archive.h>
#include <archive_entry.h> #include <archive_entry.h>
#include "charptr-cast.hh" #include "lix/libutil/charptr-cast.hh"
#include "file-system.hh" #include "lix/libutil/file-system.hh"
#include "logging.hh" #include "lix/libutil/logging.hh"
#include "serialise.hh" #include "lix/libutil/serialise.hh"
#include "tarfile.hh" #include "lix/libutil/tarfile.hh"
namespace nix { namespace nix {

2
src/libutil/tarfile.hh
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
///@file ///@file
#include "serialise.hh" #include "lix/libutil/serialise.hh"
#include <archive.h> #include <archive.h>
namespace nix { namespace nix {

6
src/libutil/terminal.cc
View file

@ -1,6 +1,6 @@
#include "terminal.hh" #include "lix/libutil/terminal.hh"
#include "environment-variables.hh" #include "lix/libutil/environment-variables.hh"
#include "sync.hh" #include "lix/libutil/sync.hh"
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <unistd.h> #include <unistd.h>

6
src/libutil/thread-pool.cc
View file

@ -1,6 +1,6 @@
#include "thread-pool.hh" #include "lix/libutil/thread-pool.hh"
#include "logging.hh" #include "lix/libutil/logging.hh"
#include "signals.hh" #include "lix/libutil/signals.hh"
namespace nix { namespace nix {

4
src/libutil/thread-pool.hh
View file

@ -1,8 +1,8 @@
#pragma once #pragma once
///@file ///@file
#include "error.hh" #include "lix/libutil/error.hh"
#include "sync.hh" #include "lix/libutil/sync.hh"
#include <map> #include <map>
#include <queue> #include <queue>

2
src/libutil/topo-sort.hh
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
///@file ///@file
#include "error.hh" #include "lix/libutil/error.hh"
namespace nix { namespace nix {

8
src/libutil/unix-domain-socket.cc
View file

@ -1,7 +1,7 @@
#include "file-system.hh" #include "lix/libutil/file-system.hh"
#include "processes.hh" #include "lix/libutil/processes.hh"
#include "unix-domain-socket.hh" #include "lix/libutil/unix-domain-socket.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/un.h> #include <sys/un.h>

4
src/libutil/unix-domain-socket.hh
View file

@ -1,8 +1,8 @@
#pragma once #pragma once
///@file ///@file
#include "file-descriptor.hh" #include "lix/libutil/file-descriptor.hh"
#include "types.hh" #include "lix/libutil/types.hh"
#include <unistd.h> #include <unistd.h>

2
src/libutil/url-name.cc
View file

@ -1,6 +1,6 @@
#include <regex> #include <regex>
#include "url-name.hh" #include "lix/libutil/url-name.hh"
namespace nix { namespace nix {

2
src/libutil/url-name.hh
View file

@ -4,7 +4,7 @@
#include <string> #include <string>
#include <optional> #include <optional>
#include "url.hh" #include "lix/libutil/url.hh"
namespace nix { namespace nix {

8
src/libutil/url.cc
View file

@ -1,7 +1,7 @@
#include "url.hh" #include "lix/libutil/url.hh"
#include "url-parts.hh" #include "lix/libutil/url-parts.hh"
#include "split.hh" #include "lix/libutil/split.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
namespace nix { namespace nix {

2
src/libutil/url.hh
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
///@file ///@file
#include "error.hh" #include "lix/libutil/error.hh"
#include <map> #include <map>
namespace nix { namespace nix {

8
src/libutil/users.cc
View file

@ -1,7 +1,7 @@
#include "environment-variables.hh" #include "lix/libutil/environment-variables.hh"
#include "file-system.hh" #include "lix/libutil/file-system.hh"
#include "logging.hh" #include "lix/libutil/logging.hh"
#include "strings.hh" #include "lix/libutil/strings.hh"
#include <pwd.h> #include <pwd.h>
#include <sys/types.h> #include <sys/types.h>

2
src/libutil/users.hh
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
///@file ///@file
#include "types.hh" #include "lix/libutil/types.hh"
#include <sys/types.h> #include <sys/types.h>

2
src/libutil/xml-writer.cc
View file

@ -1,6 +1,6 @@
#include <cassert> #include <cassert>
#include "xml-writer.hh" #include "lix/libutil/xml-writer.hh"
namespace nix { namespace nix {