Merge "Clean up includes" into main

lix/legacy/nix-build.cc

@@ -1,7 +1,5 @@
 #include <cstring>
-#include <fstream>
 #include <iostream>
-#include <filesystem>
 #include <regex>
 #include <sstream>
 #include <vector>
@@ -16,7 +14,6 @@
 #include "lix/libmain/shared.hh"
 #include "lix/libstore/path-with-outputs.hh"
 #include "lix/libexpr/eval.hh"
-#include "lix/libexpr/eval-inline.hh"
 #include "lix/libexpr/get-drvs.hh"
 #include "lix/libcmd/common-eval-args.hh"
 #include "lix/libexpr/attr-path.hh"

lix/legacy/nix-collect-garbage.cc

@@ -10,7 +10,6 @@
 #include "lix/libutil/types.hh"
 #include "nix-collect-garbage.hh"
 
-#include <iostream>
 #include <cerrno>
 
 namespace nix {

lix/legacy/nix-env.cc

@@ -13,7 +13,6 @@
 #include "lix/libstore/store-api.hh"
 #include "lix/libstore/local-fs-store.hh"
 #include "user-env.hh"
-#include "lix/libutil/json.hh"
 #include "lix/libutil/users.hh"
 #include "lix/libexpr/value-to-json.hh"
 #include "lix/libutil/xml-writer.hh"

lix/legacy/nix-instantiate.cc

@@ -2,7 +2,6 @@
 #include "lix/libexpr/print-ambiguous.hh"
 #include "lix/libmain/shared.hh"
 #include "lix/libexpr/eval.hh"
-#include "lix/libexpr/eval-inline.hh"
 #include "lix/libexpr/get-drvs.hh"
 #include "lix/libexpr/attr-path.hh"
 #include "lix/libexpr/value-to-xml.hh"
@@ -13,7 +12,6 @@
 #include "lix/libcmd/legacy.hh"
 #include "nix-instantiate.hh"
 
-#include <map>
 #include <iostream>
 
 

lix/legacy/nix-store.cc

@@ -5,14 +5,14 @@
 #include "lix/libutil/async.hh"
 #include "lix/libutil/exit.hh"
 #include "lix/libstore/globals.hh"
-#include "lix/libstore/build-result.hh"
+#include "lix/libstore/build-result.hh" // IWYU pragma: keep
 #include "lix/libstore/store-cast.hh"
 #include "lix/libstore/gc-store.hh"
 #include "lix/libstore/log-store.hh"
 #include "lix/libstore/local-store.hh"
 #include "lix/libutil/monitor-fd.hh"
 #include "lix/libstore/serve-protocol.hh"
-#include "lix/libstore/serve-protocol-impl.hh"
+#include "lix/libstore/serve-protocol-impl.hh" // IWYU pragma: keep
 #include "lix/libmain/shared.hh"
 #include "graphml.hh"
 #include "lix/libcmd/legacy.hh"

lix/legacy/user-env.cc

@@ -3,10 +3,8 @@
 #include "lix/libstore/store-api.hh"
 #include "lix/libstore/path-with-outputs.hh"
 #include "lix/libstore/local-fs-store.hh"
-#include "lix/libstore/globals.hh"
 #include "lix/libmain/shared.hh"
 #include "lix/libexpr/eval.hh"
-#include "lix/libexpr/eval-inline.hh"
 #include "lix/libstore/profiles.hh"
 #include "lix/libexpr/print-ambiguous.hh"
 

lix/libcmd/built-path.cc

@@ -7,8 +7,6 @@
 
 #include <kj/async.h>
 
-#include <optional>
-
 namespace nix {
 
 #define CMP_ONE(CHILD_TYPE, MY_TYPE, FIELD, COMPARATOR) \

lix/libcmd/cmd-profiles.hh

@@ -7,8 +7,6 @@
 #include "lix/libexpr/get-drvs.hh"
 #include "lix/libutil/types.hh"
 #include "lix/libutil/json-fwd.hh"
-#include "lix/libutil/url.hh"
-#include "lix/libutil/url-name.hh"
 
 #include <string>
 #include <set>

lix/libcmd/command.cc

@@ -2,7 +2,6 @@
 #include "lix/libstore/store-api.hh"
 #include "lix/libstore/local-fs-store.hh"
 #include "lix/libstore/derivations.hh"
-#include "lix/libexpr/nixexpr.hh"
 #include "lix/libstore/profiles.hh"
 #include "lix/libcmd/repl.hh"
 

lix/libcmd/installable-flake.cc

@@ -1,24 +1,11 @@
-#include "lix/libstore/globals.hh"
 #include "lix/libcmd/installable-flake.hh"
-#include "lix/libcmd/installable-derived-path.hh"
 #include "lix/libstore/outputs-spec.hh"
 #include "lix/libcmd/command.hh"
 #include "lix/libexpr/attr-path.hh"
 #include "lix/libcmd/common-eval-args.hh"
-#include "lix/libstore/derivations.hh"
-#include "lix/libexpr/eval-inline.hh"
 #include "lix/libexpr/eval.hh"
-#include "lix/libexpr/get-drvs.hh"
-#include "lix/libstore/store-api.hh"
-#include "lix/libmain/shared.hh"
 #include "lix/libexpr/flake/flake.hh"
 #include "lix/libexpr/eval-cache.hh"
-#include "lix/libutil/url.hh"
-#include "lix/libfetchers/registry.hh"
-#include "lix/libstore/build-result.hh"
-
-#include <regex>
-#include <queue>
 
 #include <nlohmann/json.hpp>
 

lix/libcmd/installables.hh

@@ -3,7 +3,6 @@
 
 #include "lix/libexpr/eval.hh"
 #include "lix/libstore/path.hh"
-#include "lix/libstore/outputs-spec.hh"
 #include "lix/libstore/derived-path.hh"
 #include "lix/libcmd/built-path.hh"
 #include "lix/libstore/store-api.hh"

lix/libcmd/repl.cc

@@ -12,10 +12,7 @@
 
 #include "lix/libutil/ansicolor.hh"
 #include "lix/libmain/shared.hh"
-#include "lix/libutil/escape-string.hh"
 #include "lix/libexpr/eval.hh"
-#include "lix/libexpr/eval-cache.hh"
-#include "lix/libexpr/eval-inline.hh"
 #include "lix/libexpr/eval-settings.hh"
 #include "lix/libexpr/attr-path.hh"
 #include "lix/libutil/signals.hh"

lix/libexpr/attr-path.cc

@@ -1,5 +1,4 @@
 #include "lix/libexpr/attr-path.hh"
-#include "lix/libexpr/eval-inline.hh"
 #include "lix/libutil/strings.hh"
 #include "print-options.hh"
 #include <algorithm>

lix/libexpr/attr-path.hh

@@ -4,7 +4,6 @@
 #include "lix/libexpr/eval.hh"
 
 #include <string>
-#include <map>
 
 namespace nix {
 

lix/libexpr/attr-set.hh

@@ -5,7 +5,6 @@
 #include "lix/libexpr/symbol-table.hh"
 
 #include <algorithm>
-#include <optional>
 
 namespace nix {
 

lix/libexpr/eval-cache.hh

@@ -1,7 +1,6 @@
 #pragma once
 ///@file
 
-#include "lix/libutil/sync.hh"
 #include "lix/libutil/hash.hh"
 #include "lix/libexpr/eval.hh"
 

lix/libexpr/eval.cc

@@ -7,7 +7,6 @@
 #include "lix/libutil/error.hh"
 #include "lix/libutil/english.hh"
 #include "lix/libutil/fmt.hh"
-#include "lix/libutil/hash.hh"
 #include "lix/libexpr/primops.hh"
 #include "lix/libexpr/print-options.hh"
 #include "lix/libmain/shared.hh"
@@ -17,8 +16,6 @@
 #include "lix/libstore/derivations.hh"
 #include "lix/libstore/downstream-placeholder.hh"
 #include "lix/libexpr/gc-alloc.hh"
-#include "lix/libstore/globals.hh"
-#include "lix/libexpr/eval-inline.hh"
 #include "lix/libstore/filetransfer.hh"
 #include "lix/libexpr/function-trace.hh"
 #include "lix/libstore/profiles.hh"

lix/libexpr/flake/flake.cc

@@ -3,8 +3,6 @@
 #include "lix/libexpr/eval-settings.hh"
 #include "lix/libexpr/extra-primops.hh"
 #include "lix/libexpr/flake/lockfile.hh"
-#include "lix/libexpr/primops.hh"
-#include "lix/libexpr/eval-inline.hh"
 #include "lix/libstore/store-api.hh"
 #include "lix/libfetchers/fetchers.hh"
 #include "lix/libutil/async.hh"

lix/libexpr/flake/flakeref.hh

@@ -2,12 +2,9 @@
 ///@file
 
 #include "lix/libutil/types.hh"
-#include "lix/libutil/hash.hh"
 #include "lix/libfetchers/fetchers.hh"
 #include "lix/libstore/outputs-spec.hh"
 
-#include <variant>
-
 namespace nix {
 
 class Store;

lix/libexpr/flake/lockfile.cc

@@ -1,5 +1,4 @@
 #include "lix/libexpr/flake/lockfile.hh"
-#include "json-to-value.hh"
 #include "lix/libstore/store-api.hh"
 #include "lix/libutil/error.hh"
 #include "lix/libutil/json.hh"

lix/libexpr/function-trace.hh

@@ -1,9 +1,7 @@
 #pragma once
 ///@file
 
-#include "eval.hh"
-
-#include <chrono>
+#include "lix/libutil/position.hh"
 
 namespace nix {
 

lix/libexpr/get-drvs.cc

@@ -1,5 +1,4 @@
 #include "lix/libexpr/get-drvs.hh"
-#include "lix/libexpr/eval-inline.hh"
 #include "lix/libstore/derivations.hh"
 #include "lix/libexpr/eval.hh"
 #include "lix/libstore/path.hh"

lix/libexpr/json-to-value.cc

@@ -4,7 +4,6 @@
 #include "lix/libutil/json.hh"
 
 #include <limits>
-#include <variant>
 
 namespace nix {
 

lix/libexpr/json-to-value.hh

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

lix/libexpr/nixexpr.cc

@@ -1,9 +1,7 @@
 #include "lix/libexpr/nixexpr.hh"
-#include "lix/libstore/derivations.hh"
 #include "lix/libexpr/eval.hh"
 #include "lix/libexpr/symbol-table.hh"
 #include "lix/libexpr/print.hh"
-#include "lix/libutil/escape-string.hh"
 
 #include <cstdlib>
 #include <sstream>

lix/libexpr/nixexpr.hh

@@ -6,12 +6,9 @@
 
 #include "lix/libexpr/value.hh"
 #include "lix/libexpr/symbol-table.hh"
-#include "lix/libutil/error.hh"
 #include "lix/libutil/json.hh"
-#include "lix/libutil/position.hh"
 #include "lix/libexpr/eval-error.hh"
 #include "lix/libexpr/pos-idx.hh"
-#include "lix/libexpr/pos-table.hh"
 #include "lix/libutil/strings.hh"
 
 namespace nix {

lix/libexpr/parser/grammar.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include "tao/pegtl.hpp"
+#include "tao/pegtl.hpp" // IWYU pragma: keep
 #include <type_traits>
 #include <variant>
 

lix/libexpr/parser/parser-impl1.inc.cc

@@ -1,3 +1,14 @@
+#include "eval-settings.hh"
+#include "lix/libexpr/nixexpr.hh"
+#include "lix/libexpr/parser/change_head.hh"
+#include "lix/libexpr/parser/grammar.hh"
+#include "lix/libexpr/parser/state.hh"
+#include "lix/libexpr/pos-idx.hh"
+#include "lix/libutil/finally.hh"
+#include "lix/libutil/users.hh"
+
+#include <charconv>
+
 // flip this define when doing parser development to enable some g checks.
 #if 0
 #include <tao/pegtl/contrib/analyze.hpp>

lix/libexpr/parser/parser.cc

@@ -1,17 +1,10 @@
-#include "lix/libexpr/attr-set.hh"
 #include "lix/libutil/error.hh"
-#include "lix/libexpr/eval-settings.hh"
 #include "lix/libexpr/eval.hh"
-#include "lix/libutil/finally.hh"
 #include "lix/libexpr/nixexpr.hh"
-#include "lix/libexpr/symbol-table.hh"
-#include "lix/libutil/users.hh"
 
-#include "lix/libexpr/parser/change_head.hh"
 #include "lix/libexpr/parser/grammar.hh"
 #include "lix/libexpr/parser/state.hh"
 
-#include <charconv>
 #include <memory>
 
 // Linter complains that this is a "suspicious include of file with '.cc' extension".

lix/libexpr/parser/state.hh

@@ -1,7 +1,8 @@
 #pragma once
 ///@file
 
-#include "lix/libexpr/eval.hh"
+#include "lix/libexpr/nixexpr.hh"
+#include "lix/libexpr/pos-idx.hh"
 #include "lix/libutil/logging.hh"
 
 namespace nix::parser {

lix/libexpr/pos-idx.hh

@@ -1,7 +1,7 @@
 #pragma once
 ///@file
 
-#include <cinttypes>
+#include <cstdint>
 
 namespace nix {
 

lix/libexpr/pos-table.hh

@@ -1,11 +1,8 @@
 #pragma once
 ///@file
 
-#include <cinttypes>
-#include <numeric>
 #include <vector>
 
-#include "lix/libutil/chunked-vector.hh"
 #include "lix/libexpr/pos-idx.hh"
 #include "lix/libutil/position.hh"
 #include "lix/libutil/sync.hh"

lix/libexpr/primops.cc

@@ -1,7 +1,6 @@
 #include "lix/libutil/archive.hh"
 #include "lix/libstore/derivations.hh"
 #include "lix/libstore/downstream-placeholder.hh"
-#include "lix/libexpr/eval-inline.hh"
 #include "lix/libexpr/eval.hh"
 #include "lix/libexpr/eval-settings.hh"
 #include "lix/libexpr/extra-primops.hh"
@@ -18,7 +17,6 @@
 #include "lix/libexpr/value-to-xml.hh"
 #include "lix/libexpr/primops.hh"
 #include "lix/libfetchers/fetch-to-store.hh"
-#include "lix/libutil/result.hh"
 #include "lix/libutil/types.hh"
 
 #include <boost/container/small_vector.hpp>

lix/libexpr/primops.hh

@@ -3,7 +3,6 @@
 
 #include "lix/libexpr/eval.hh"
 
-#include <tuple>
 #include <vector>
 
 namespace nix {

lix/libexpr/primops/context.cc

@@ -1,5 +1,4 @@
 #include "lix/libexpr/primops.hh"
-#include "lix/libexpr/eval-inline.hh"
 #include "lix/libexpr/extra-primops.hh"
 #include "lix/libstore/derivations.hh"
 #include "lix/libstore/store-api.hh"

lix/libexpr/primops/fetchClosure.cc

@@ -1,4 +1,4 @@
-#include "lix/libexpr/primops.hh"
+#include "lix/libexpr/eval.hh"
 #include "lix/libexpr/extra-primops.hh"
 #include "lix/libstore/store-api.hh"
 #include "lix/libstore/make-content-addressed.hh"

lix/libexpr/primops/fetchMercurial.cc

@@ -1,9 +1,6 @@
 #include "lix/libexpr/primops.hh"
-#include "lix/libexpr/eval-inline.hh"
 #include "lix/libexpr/eval-settings.hh"
-#include "lix/libstore/store-api.hh"
 #include "lix/libfetchers/fetchers.hh"
-#include "lix/libutil/url.hh"
 #include "lix/libutil/url-parts.hh"
 
 namespace nix {

lix/libexpr/primops/fetchTree.cc

@@ -1,5 +1,4 @@
-#include "lix/libexpr/primops.hh"
-#include "lix/libexpr/eval-inline.hh"
+#include "lix/libexpr/eval.hh"
 #include "lix/libexpr/eval-settings.hh"
 #include "lix/libexpr/extra-primops.hh"
 #include "lix/libstore/store-api.hh"

lix/libexpr/primops/fromTOML.cc

@@ -1,5 +1,4 @@
-#include "lix/libexpr/primops.hh"
-#include "lix/libexpr/eval-inline.hh"
+#include "lix/libexpr/eval.hh"
 #include "lix/libexpr/extra-primops.hh"
 
 #include <sstream>

lix/libexpr/print-options.hh

@@ -4,6 +4,7 @@
  * @brief Options for printing Nix values.
  */
 
+#include <cstddef>
 #include <limits>
 
 namespace nix {

lix/libexpr/print.cc

@@ -7,9 +7,9 @@
 #include "lix/libexpr/print.hh"
 #include "lix/libutil/ansicolor.hh"
 #include "lix/libstore/store-api.hh"
-#include "lix/libutil/english.hh"
 #include "lix/libutil/signals.hh"
 #include "lix/libexpr/eval.hh"
+#include "lix/libutil/print-elided.hh"
 #include "lix/libutil/terminal.hh"
 
 namespace nix {

lix/libexpr/print.hh

@@ -11,7 +11,6 @@
 
 #include "lix/libutil/fmt.hh"
 #include "lix/libexpr/print-options.hh"
-#include "lix/libutil/print-elided.hh"
 
 namespace nix {
 

lix/libexpr/symbol-table.hh

@@ -1,8 +1,6 @@
 #pragma once
 ///@file
 
-#include <list>
-#include <map>
 #include <unordered_map>
 
 #include "lix/libutil/types.hh"

lix/libexpr/value-to-json.cc

@@ -1,11 +1,9 @@
 #include "lix/libexpr/value-to-json.hh"
-#include "lix/libexpr/eval-inline.hh"
 #include "lix/libutil/json.hh"
 #include "lix/libutil/signals.hh"
 #include "lix/libstore/store-api.hh"
 
 #include <cstdlib>
-#include <iomanip>
 
 
 namespace nix {

lix/libexpr/value-to-json.hh

@@ -5,9 +5,6 @@
 #include "lix/libexpr/eval.hh"
 #include "lix/libutil/json-fwd.hh"
 
-#include <string>
-#include <map>
-
 namespace nix {
 
 JSON printValueAsJSON(EvalState & state, bool strict,

lix/libexpr/value-to-xml.hh

@@ -4,9 +4,6 @@
 #include "lix/libexpr/nixexpr.hh"
 #include "lix/libexpr/eval.hh"
 
-#include <string>
-#include <map>
-
 namespace nix {
 
 void printValueAsXML(EvalState & state, bool strict, bool location,

lix/libexpr/value.hh

@@ -10,7 +10,6 @@
 #include "lix/libexpr/gc-alloc.hh"
 #include "lix/libexpr/symbol-table.hh"
 #include "lix/libexpr/value/context.hh"
-#include "lix/libutil/input-accessor.hh"
 #include "lix/libutil/source-path.hh"
 #include "lix/libexpr/print-options.hh"
 #include "lix/libutil/checked-arithmetic.hh"

lix/libexpr/value/context.cc

@@ -1,7 +1,5 @@
 #include "lix/libexpr/value/context.hh"
 
-#include <optional>
-
 namespace nix {
 
 NixStringContextElem NixStringContextElem::parse(

lix/libutil/json.hh

@@ -9,9 +9,9 @@
 
 #include "lix/libutil/error.hh"
 #include "lix/libutil/fmt.hh"
-#include "lix/libutil/json-fwd.hh" // IWYU pragma: keep
+#include "lix/libutil/json-fwd.hh" // IWYU pragma: export
 #include <concepts>
-#include <nlohmann/json.hpp> // IWYU pragma: keep
+#include <nlohmann/json.hpp> // IWYU pragma: export
 #include <list>
 #include <string_view>
 #include <type_traits>