Include rearrangement: rest

Change-Id: If9b5502ff348d358d7007b885e26e98a0d228f39

tests/functional/plugins/plugintest.cc

@@ -1,5 +1,5 @@
-#include "config.hh"
-#include "primops.hh"
+#include "lix/libutil/config.hh"
+#include "lix/libexpr/primops.hh"
 #include <stdlib.h>
 
 using namespace nix;

tests/functional/repl_characterization/repl_characterization.cc

@@ -9,7 +9,7 @@
 #include "test-session.hh"
 #include "tests/characterization.hh"
 #include "tests/cli-literate-parser.hh"
-#include "strings.hh"
+#include "lix/libutil/strings.hh"
 
 using namespace std::string_literals;
 

tests/functional/repl_characterization/test-session.cc

@@ -3,9 +3,9 @@
 #include <unistd.h>
 
 #include "test-session.hh"
-#include "escape-char.hh"
-#include "processes.hh"
-#include "strings.hh"
+#include "lix/libutil/escape-char.hh"
+#include "lix/libutil/processes.hh"
+#include "lix/libutil/strings.hh"
 
 namespace nix {
 

tests/functional/repl_characterization/test-session.hh

@@ -6,8 +6,8 @@
 #include <span>
 #include <string>
 
-#include "file-descriptor.hh"
-#include "processes.hh"
+#include "lix/libutil/file-descriptor.hh"
+#include "lix/libutil/processes.hh"
 #include "tests/terminal-code-eater.hh"
 
 namespace nix {

tests/functional/test-libstoreconsumer/main.cc

@@ -1,6 +1,6 @@
-#include "globals.hh"
-#include "store-api.hh"
-#include "build-result.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libstore/store-api.hh"
+#include "lix/libstore/build-result.hh"
 #include <iostream>
 
 using namespace nix;

tests/unit/libcmd/args.cc

@@ -5,11 +5,11 @@
 #include <boost/core/demangle.hpp>
 #include <gtest/gtest.h>
 
-#include "common-eval-args.hh"
-#include "eval.hh"
-#include "filetransfer.hh"
-#include "shared.hh"
-#include "store-api.hh"
+#include "lix/libcmd/common-eval-args.hh"
+#include "lix/libexpr/eval.hh"
+#include "lix/libstore/filetransfer.hh"
+#include "lix/libmain/shared.hh"
+#include "lix/libstore/store-api.hh"
 
 constexpr std::string_view INVALID_CHANNEL = "channel:example";
 constexpr std::string_view CHANNEL_URL = "https://nixos.org/channels/example/nixexprs.tar.xz";

tests/unit/libexpr-support/tests/libexpr.hh

@@ -4,11 +4,11 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
-#include "value.hh"
-#include "nixexpr.hh"
-#include "eval.hh"
-#include "eval-inline.hh"
-#include "store-api.hh"
+#include "lix/libexpr/value.hh"
+#include "lix/libexpr/nixexpr.hh"
+#include "lix/libexpr/eval.hh"
+#include "lix/libexpr/eval-inline.hh"
+#include "lix/libstore/store-api.hh"
 
 #include "tests/libstore.hh"
 

tests/unit/libexpr-support/tests/value/context.hh

@@ -3,7 +3,7 @@
 
 #include <rapidcheck/gen/Arbitrary.h>
 
-#include "value/context.hh"
+#include "lix/libexpr/value/context.hh"
 
 namespace rc {
 using namespace nix;

tests/unit/libexpr/expr-print.cc

@@ -5,8 +5,8 @@
 
 #include "tests/libexpr.hh"
 
-#include "nixexpr.hh"
-#include "ref.hh"
+#include "lix/libexpr/nixexpr.hh"
+#include "lix/libutil/ref.hh"
 
 namespace nix
 {

tests/unit/libexpr/flakeref.cc

@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
 
-#include "flake/flakeref.hh"
+#include "lix/libexpr/flake/flakeref.hh"
 
 namespace nix {
 

tests/unit/libexpr/json.cc

@@ -1,5 +1,5 @@
 #include "tests/libexpr.hh"
-#include "value-to-json.hh"
+#include "lix/libexpr/value-to-json.hh"
 
 namespace nix {
 // Testing the conversion to JSON

tests/unit/libexpr/primops.cc

@@ -1,7 +1,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "eval-settings.hh"
+#include "lix/libexpr/eval-settings.hh"
 
 #include "tests/libexpr.hh"
 

tests/unit/libexpr/search-path.cc

@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
-#include "search-path.hh"
+#include "lix/libexpr/search-path.hh"
 
 namespace nix {
 

tests/unit/libexpr/value/print.cc

@@ -1,7 +1,7 @@
 #include "tests/libexpr.hh"
 
-#include "value.hh"
-#include "print.hh"
+#include "lix/libexpr/value.hh"
+#include "lix/libexpr/print.hh"
 
 namespace nix {
 

tests/unit/libmain/crash.cc

@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include "crash-handler.hh"
+#include "lix/libmain/crash-handler.hh"
 
 namespace nix {
 

tests/unit/libmain/progress-bar.cc

@@ -1,10 +1,10 @@
 #include <gtest/gtest.h>
 
-#include "eval.hh"
-#include "progress-bar.hh"
-#include "loggers.hh"
-#include "logging.hh"
-#include "shared.hh"
+#include "lix/libexpr/eval.hh"
+#include "lix/libmain/progress-bar.hh"
+#include "lix/libmain/loggers.hh"
+#include "lix/libutil/logging.hh"
+#include "lix/libmain/shared.hh"
 
 constexpr std::string_view TEST_URL = "https://github.com/NixOS/nixpkgs/archive/master.tar.gz";
 // Arbitrary number. We picked the size of a Nixpkgs tarball that we downloaded.

tests/unit/libstore-support/tests/derived-path.hh

@@ -3,7 +3,7 @@
 
 #include <rapidcheck/gen/Arbitrary.h>
 
-#include <derived-path.hh>
+#include "lix/libstore/derived-path.hh"
 
 #include "tests/path.hh"
 #include "tests/outputs-spec.hh"

tests/unit/libstore-support/tests/libstore.hh

@@ -4,7 +4,7 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
-#include "store-api.hh"
+#include "lix/libstore/store-api.hh"
 
 namespace nix {
 

tests/unit/libstore-support/tests/outputs-spec.hh

@@ -3,7 +3,7 @@
 
 #include <rapidcheck/gen/Arbitrary.h>
 
-#include <outputs-spec.hh>
+#include "lix/libstore/outputs-spec.hh"
 
 #include "tests/path.hh"
 

tests/unit/libstore-support/tests/path.cc

@@ -3,8 +3,8 @@
 
 #include <rapidcheck.h>
 
-#include "path-regex.hh"
-#include "store-api.hh"
+#include "lix/libstore/path-regex.hh"
+#include "lix/libstore/store-api.hh"
 
 #include "tests/hash.hh"
 #include "tests/path.hh"

tests/unit/libstore-support/tests/path.hh

@@ -3,7 +3,7 @@
 
 #include <rapidcheck/gen/Arbitrary.h>
 
-#include <path.hh>
+#include "lix/libstore/path.hh"
 
 namespace nix {
 

tests/unit/libstore/common-protocol.cc

@@ -3,9 +3,9 @@
 #include <nlohmann/json.hpp>
 #include <gtest/gtest.h>
 
-#include "common-protocol.hh"
-#include "common-protocol-impl.hh"
-#include "build-result.hh"
+#include "lix/libstore/common-protocol.hh"
+#include "lix/libstore/common-protocol-impl.hh"
+#include "lix/libstore/build-result.hh"
 #include "protocol.hh"
 #include "tests/characterization.hh"
 

tests/unit/libstore/derivation.cc

@@ -1,8 +1,8 @@
 #include <nlohmann/json.hpp>
 #include <gtest/gtest.h>
 
-#include "derivations.hh"
-#include "strings.hh"
+#include "lix/libstore/derivations.hh"
+#include "lix/libutil/strings.hh"
 
 #include "tests/libstore.hh"
 #include "tests/characterization.hh"

tests/unit/libstore/downstream-placeholder.cc

@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
 
-#include "downstream-placeholder.hh"
+#include "lix/libstore/downstream-placeholder.hh"
 
 namespace nix {
 

tests/unit/libstore/filetransfer.cc

@@ -1,5 +1,5 @@
-#include "filetransfer.hh"
-#include "compression.hh"
+#include "lix/libstore/filetransfer.hh"
+#include "lix/libutil/compression.hh"
 
 #include <cstdint>
 #include <exception>

tests/unit/libstore/machines.cc

@@ -1,7 +1,7 @@
-#include "file-system.hh"
-#include "machines.hh"
-#include "globals.hh"
-#include "strings.hh"
+#include "lix/libutil/file-system.hh"
+#include "lix/libstore/machines.hh"
+#include "lix/libstore/globals.hh"
+#include "lix/libutil/strings.hh"
 #include "tests/test-data.hh"
 
 #include <gmock/gmock-matchers.h>

tests/unit/libstore/nar-info-disk-cache.cc

@@ -1,9 +1,9 @@
-#include "nar-info-disk-cache.hh"
+#include "lix/libstore/nar-info-disk-cache.hh"
 
 #include <gtest/gtest.h>
 #include <rapidcheck/gtest.h>
-#include "sqlite.hh"
-#include "temporary-dir.hh"
+#include "lix/libstore/sqlite.hh"
+#include "lix/libstore/temporary-dir.hh"
 #include <sqlite3.h>
 
 

tests/unit/libstore/path.cc

@@ -4,8 +4,8 @@
 #include <gtest/gtest.h>
 #include <rapidcheck/gtest.h>
 
-#include "path-regex.hh"
-#include "store-api.hh"
+#include "lix/libstore/path-regex.hh"
+#include "lix/libstore/store-api.hh"
 
 #include "tests/hash.hh"
 #include "tests/libstore.hh"

tests/unit/libstore/protocol.hh

@@ -1,7 +1,7 @@
 #include <nlohmann/json.hpp>
 #include <gtest/gtest.h>
 
-#include "strings.hh"
+#include "lix/libutil/strings.hh"
 #include "tests/libstore.hh"
 #include "tests/characterization.hh"
 

tests/unit/libstore/references.cc

@@ -1,4 +1,4 @@
-#include "references.hh"
+#include "lix/libutil/references.hh"
 
 #include <gtest/gtest.h>
 

tests/unit/libstore/serve-protocol.cc

@@ -3,9 +3,9 @@
 #include <nlohmann/json.hpp>
 #include <gtest/gtest.h>
 
-#include "serve-protocol.hh"
-#include "serve-protocol-impl.hh"
-#include "build-result.hh"
+#include "lix/libstore/serve-protocol.hh"
+#include "lix/libstore/serve-protocol-impl.hh"
+#include "lix/libstore/build-result.hh"
 #include "protocol.hh"
 #include "tests/characterization.hh"
 

tests/unit/libstore/worker-protocol.cc

@@ -3,10 +3,10 @@
 #include <nlohmann/json.hpp>
 #include <gtest/gtest.h>
 
-#include "worker-protocol.hh"
-#include "worker-protocol-impl.hh"
-#include "derived-path.hh"
-#include "build-result.hh"
+#include "lix/libstore/worker-protocol.hh"
+#include "lix/libstore/worker-protocol-impl.hh"
+#include "lix/libstore/derived-path.hh"
+#include "lix/libstore/build-result.hh"
 #include "protocol.hh"
 #include "tests/characterization.hh"
 

tests/unit/libutil-support/tests/characterization.hh

@@ -1,14 +1,14 @@
 #pragma once
 ///@file
 
-#include "environment-variables.hh"
-#include "file-system.hh"
+#include "lix/libutil/environment-variables.hh"
+#include "lix/libutil/file-system.hh"
 
 #include <gtest/gtest.h>
 
 #include <filesystem>
 
-#include "types.hh"
+#include "lix/libutil/types.hh"
 #include "test-data.hh"
 
 namespace nix {

tests/unit/libutil-support/tests/cli-literate-parser.cc

@@ -1,6 +1,6 @@
 #include "cli-literate-parser.hh"
-#include "escape-string.hh"
-#include "types.hh"
+#include "lix/libutil/escape-string.hh"
+#include "lix/libutil/types.hh"
 #include <ranges>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/algorithm/string/trim.hpp>
@@ -9,11 +9,11 @@
 #include <variant>
 
 #include "cli-literate-parser.hh"
-#include "escape-string.hh"
-#include "fmt.hh"
-#include "shlex.hh"
-#include "types.hh"
-#include "strings.hh"
+#include "lix/libutil/escape-string.hh"
+#include "lix/libutil/fmt.hh"
+#include "lix/libutil/shlex.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libutil/strings.hh"
 
 static constexpr const bool DEBUG_PARSER = false;
 

tests/unit/libutil-support/tests/hash.hh

@@ -3,7 +3,7 @@
 
 #include <rapidcheck/gen/Arbitrary.h>
 
-#include <hash.hh>
+#include "lix/libutil/hash.hh"
 
 namespace rc {
 using namespace nix;

tests/unit/libutil-support/tests/terminal-code-eater.cc

@@ -1,5 +1,5 @@
 #include "terminal-code-eater.hh"
-#include "escape-char.hh"
+#include "lix/libutil/escape-char.hh"
 #include <assert.h>
 #include <cstdint>
 #include <iostream>

tests/unit/libutil-support/tests/test-data.cc

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

tests/unit/libutil-support/tests/test-data.hh

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

tests/unit/libutil/async-collect.cc

@@ -1,4 +1,4 @@
-#include "async-collect.hh"
+#include "lix/libutil/async-collect.hh"
 
 #include <gtest/gtest.h>
 #include <kj/array.h>

tests/unit/libutil/async-semaphore.cc

@@ -1,4 +1,4 @@
-#include "async-semaphore.hh"
+#include "lix/libutil/async-semaphore.hh"
 
 #include <gtest/gtest.h>
 #include <kj/async.h>

tests/unit/libutil/canon-path.cc

@@ -1,4 +1,4 @@
-#include "canon-path.hh"
+#include "lix/libutil/canon-path.hh"
 
 #include <gtest/gtest.h>
 

tests/unit/libutil/checked-arithmetic.cc

@@ -5,7 +5,7 @@
 #include <rapidcheck/gtest.h>
 #include <rapidcheck/gen/Arbitrary.hpp>
 
-#include <checked-arithmetic.hh>
+#include "lix/libutil/checked-arithmetic.hh"
 
 #include "tests/gtest-with-params.hh"
 

tests/unit/libutil/chunked-vector.cc

@@ -1,4 +1,4 @@
-#include "chunked-vector.hh"
+#include "lix/libutil/chunked-vector.hh"
 
 #include <gtest/gtest.h>
 

tests/unit/libutil/closure.cc

@@ -1,4 +1,4 @@
-#include "closure.hh"
+#include "lix/libutil/closure.hh"
 #include <gtest/gtest.h>
 
 namespace nix {

tests/unit/libutil/compression.cc

@@ -1,4 +1,4 @@
-#include "compression.hh"
+#include "lix/libutil/compression.hh"
 #include <cstddef>
 #include <gtest/gtest.h>
 

tests/unit/libutil/config.cc

@@ -1,8 +1,8 @@
-#include "config.hh"
-#include "args.hh"
-#include "file-system.hh"
-#include "environment-variables.hh"
-#include "logging.hh"
+#include "lix/libutil/config.hh"
+#include "lix/libutil/args.hh"
+#include "lix/libutil/file-system.hh"
+#include "lix/libutil/environment-variables.hh"
+#include "lix/libutil/logging.hh"
 #include "tests/test-data.hh"
 
 #include <sstream>

tests/unit/libutil/escape-string.cc

@@ -1,5 +1,5 @@
-#include "escape-string.hh"
-#include "ansicolor.hh"
+#include "lix/libutil/escape-string.hh"
+#include "lix/libutil/ansicolor.hh"
 #include <gtest/gtest.h>
 
 namespace nix {

tests/unit/libutil/generator.cc

@@ -1,4 +1,4 @@
-#include "generator.hh"
+#include "lix/libutil/generator.hh"
 
 #include <concepts>
 #include <cstdint>

tests/unit/libutil/git.cc

@@ -1,4 +1,4 @@
-#include "git.hh"
+#include "lix/libutil/git.hh"
 #include <gtest/gtest.h>
 
 namespace nix {

tests/unit/libutil/hash.cc

@@ -2,7 +2,7 @@
 
 #include <gtest/gtest.h>
 
-#include "hash.hh"
+#include "lix/libutil/hash.hh"
 
 namespace nix {
 

tests/unit/libutil/hilite.cc

@@ -1,4 +1,4 @@
-#include "hilite.hh"
+#include "lix/libutil/hilite.hh"
 
 #include <gtest/gtest.h>
 

tests/unit/libutil/json-utils.cc

@@ -3,7 +3,7 @@
 
 #include <gtest/gtest.h>
 
-#include "json-utils.hh"
+#include "lix/libutil/json-utils.hh"
 
 namespace nix {
 

tests/unit/libutil/lru-cache.cc

@@ -1,4 +1,4 @@
-#include "lru-cache.hh"
+#include "lix/libutil/lru-cache.hh"
 #include <gtest/gtest.h>
 
 namespace nix {

tests/unit/libutil/paths-setting.cc

@@ -1,4 +1,4 @@
-#include "config.hh"
+#include "lix/libutil/config.hh"
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>

tests/unit/libutil/pool.cc

@@ -1,4 +1,4 @@
-#include "pool.hh"
+#include "lix/libutil/pool.hh"
 #include <gtest/gtest.h>
 
 namespace nix {

tests/unit/libutil/references.cc

@@ -1,5 +1,5 @@
-#include "references.hh"
-#include "strings.hh"
+#include "lix/libutil/references.hh"
+#include "lix/libutil/strings.hh"
 #include <gtest/gtest.h>
 
 namespace nix {

tests/unit/libutil/serialise.cc

@@ -1,10 +1,10 @@
-#include "serialise.hh"
-#include "error.hh"
-#include "fmt.hh"
-#include "pos-table.hh"
-#include "generator.hh"
-#include "ref.hh"
-#include "types.hh"
+#include "lix/libutil/serialise.hh"
+#include "lix/libutil/error.hh"
+#include "lix/libutil/fmt.hh"
+#include "lix/libexpr/pos-table.hh"
+#include "lix/libutil/generator.hh"
+#include "lix/libutil/ref.hh"
+#include "lix/libutil/types.hh"
 
 #include <concepts>
 #include <cstdint>

tests/unit/libutil/suggestions.cc

@@ -1,4 +1,4 @@
-#include "suggestions.hh"
+#include "lix/libutil/suggestions.hh"
 #include <gtest/gtest.h>
 
 namespace nix {

tests/unit/libutil/tests.cc

@@ -1,8 +1,8 @@
-#include "file-system.hh"
-#include "processes.hh"
-#include "strings.hh"
-#include "types.hh"
-#include "terminal.hh"
+#include "lix/libutil/file-system.hh"
+#include "lix/libutil/processes.hh"
+#include "lix/libutil/strings.hh"
+#include "lix/libutil/types.hh"
+#include "lix/libutil/terminal.hh"
 
 #include <gtest/gtest.h>
 

tests/unit/libutil/url-name.cc

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

tests/unit/libutil/url.cc

@@ -1,5 +1,5 @@
-#include "url.hh"
-#include "types.hh"
+#include "lix/libutil/url.hh"
+#include "lix/libutil/types.hh"
 #include <gtest/gtest.h>
 
 namespace nix {

tests/unit/libutil/xml-writer.cc

@@ -1,4 +1,4 @@
-#include "xml-writer.hh"
+#include "lix/libutil/xml-writer.hh"
 #include <gtest/gtest.h>
 #include <sstream>