Include rearrangement: rest

Change-Id: If9b5502ff348d358d7007b885e26e98a0d228f39
2024-11-18 12:31:19 -08:00
parent eeaa72b62b
commit 103cd44a04
179 changed files with 837 additions and 837 deletions
@@ -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 {
@@ -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;

@@ -3,7 +3,7 @@

 #include <rapidcheck/gen/Arbitrary.h>

-#include <hash.hh>
+#include "lix/libutil/hash.hh"

 namespace rc {
 using namespace nix;
@@ -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>
@@ -1,5 +1,5 @@
 #include "test-data.hh"
-#include "strings.hh"
+#include "lix/libutil/strings.hh"

 namespace nix {

@@ -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 {