primops: Run iwyu and update includes

Change-Id: Ic3f48d6fca6ca1ae444475f7ccdee6220da946de
This commit is contained in:
Tom Hubrecht 2024-05-30 11:14:32 +02:00
parent 5541723b60
commit 127ee1abe7
20 changed files with 369 additions and 81 deletions

View file

@ -1,20 +1,14 @@
#include "derivations.hh"
#include "eval.hh"
#include "eval-settings.hh"
#include "gc-small-vector.hh"
#include "json-to-value.hh"
#include "store-api.hh"
#include "primops.hh"
#include <boost/container/small_vector.hpp>
#include <nlohmann/json.hpp>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <algorithm>
#include <dlfcn.h>
#include <time.h> // for time
#include <algorithm> // for max
#include "canon-path.hh" // for CanonPath
#include "config.hh" // for Setting, ExperimentalFeatureSettings
#include "eval-settings.hh" // for EvalSettings, evalSettings
#include "eval.hh" // for EvalState, PrimOp, Env
#include "nixexpr.hh" // for StaticEnv
#include "ref.hh" // for ref
#include "search-path.hh" // for SearchPath
#include "store-api.hh" // for Store
namespace nix {

View file

@ -1,4 +1,10 @@
#include "primops.hh"
#include <math.h> // for ceil, floor
#include <limits> // for numeric_limits
#include "eval-error.hh" // for EvalError, EvalErrorBuilder
#include "eval.hh" // for EvalState, PrimOp
#include "pos-idx.hh" // for PosIdx, noPos
#include "primops.hh" // for CompareValues, prim_lessThan
#include "value.hh" // for Value, nFloat, NixInt, NixFloat
namespace nix {

View file

@ -1,5 +1,21 @@
#include "gc-small-vector.hh"
#include "primops.hh"
#include <string.h> // for size_t, memcpy, strcmp
#include <algorithm> // for sort, min, set_difference
#include <boost/container/small_vector.hpp> // for small_vector
#include <boost/container/vector.hpp> // for operator+, operator-
#include <iterator> // for back_insert_iterator
#include <map> // for map, _Rb_tree_iterator
#include <set> // for set
#include <string_view> // for string_view, operator<=>
#include <utility> // for pair
#include <vector> // for vector
#include "attr-set.hh" // for Attr, Bindings, Bindings...
#include "eval-error.hh" // for TypeError, EvalErrorBuilder
#include "eval.hh" // for EvalState, PrimOp, prim_...
#include "gc-small-vector.hh" // for SmallValueVector
#include "pos-idx.hh" // for PosIdx, noPos
#include "primops.hh" // for CompareValues, ValueList
#include "symbol-table.hh" // for Symbol, SymbolTable, Sym...
#include "value.hh" // for Value, ValueVector, Valu...
namespace nix {

View file

@ -1,8 +1,31 @@
#include "downstream-placeholder.hh"
#include "eval-settings.hh"
#include "primops.hh"
#include "derivations.hh"
#include "store-api.hh"
#include <map> // for map, _Rb_tree_const_iterator
#include <memory> // for shared_ptr
#include <string> // for basic_string, operator<=>, char...
#include <utility> // for move, pair
#include <variant> // for visit, get_if
#include <vector> // for vector
#include "attr-set.hh" // for Attr, Bindings, BindingsBuilder
#include "config.hh" // for Setting, ExperimentalFeatureSet...
#include "derivations.hh" // for isDerivation
#include "derived-path.hh" // for DerivedPath, makeConstantStoreP...
#include "downstream-placeholder.hh" // for DownstreamPlaceholder
#include "error.hh" // for Error
#include "eval-error.hh" // for EvalError, EvalErrorBuilder
#include "eval-settings.hh" // for EvalSettings, evalSettings
#include "eval.hh" // for EvalState, PrimOp
#include "experimental-features.hh" // for ExperimentalFeature, Xp
#include "fmt.hh" // for HintFmt
#include "globals.hh" // for Settings, settings
#include "outputs-spec.hh" // for OutputsSpec
#include "path.hh" // for StorePath, StorePathSet
#include "pos-idx.hh" // for PosIdx, noPos
#include "ref.hh" // for ref
#include "store-api.hh" // for Store, resolveDerivedPath, copy...
#include "symbol-table.hh" // for SymbolStr, Symbol, SymbolTable
#include "types.hh" // for StringMap, BackedStringView
#include "util.hh" // for overloaded, enumerate
#include "value.hh" // for Value
#include "value/context.hh" // for NixStringContextElem, NixString...
namespace nix {

View file

@ -1,8 +1,24 @@
#include <list> // for list
#include <string> // for basic_string
#include "attr-set.hh" // for BindingsBuilder
#include "error.hh" // for Trace, Error, lvlInfo, ErrorInfo
#include "eval-error.hh" // for Abort, ThrownError, EvalErrorBuilder
#include "eval-settings.hh"
#include "primops.hh"
#include "eval.hh" // for EvalState, PrimOp, DebugTrace, ValMap
#include "fmt.hh" // for HintFmt
#include "pos-idx.hh" // for PosIdx
#include "pos-table.hh" // for PosTable
#include "ref.hh" // for ref
#include "symbol-table.hh" // for Symbol
#include "types.hh" // for BackedStringView
#include "util.hh" // for MaintainCount
#include "value.hh" // for Value
#include "value/context.hh" // for NixStringContext
namespace nix {
enum class ReplExitStatus;
/**
* builtins.abort
*/

View file

@ -1,5 +1,16 @@
#include "eval-settings.hh"
#include "primops.hh"
#include <list> // for list
#include <string> // for basic_string
#include "attr-set.hh" // for Bindings
#include "eval-settings.hh" // for EvalSettings, evalSettings
#include "eval.hh" // for EvalState, PrimOp, DebugTrace
#include "logging.hh" // for Logger, printError
#include "pos-idx.hh" // for PosIdx
#include "pos-table.hh" // for PosTable
#include "position.hh" // for Pos
#include "primops.hh" // for makePositionThunks, prim_second, prim_trace
#include "print.hh" // for ValuePrinter
#include "symbol-table.hh" // for SymbolTable
#include "value.hh" // for Value, nString
namespace nix {

View file

@ -1,8 +1,39 @@
#include "primops.hh"
#include "store-api.hh"
#include "value-to-json.hh"
#include <nlohmann/json.hpp>
#include <map> // for _Rb_tree_const_ite...
#include <memory> // for allocator, shared_ptr
#include <nlohmann/json.hpp> // for basic_json
#include <nlohmann/json_fwd.hpp> // for json
#include <optional> // for optional, operator==
#include <set> // for set
#include <string> // for char_traits, basic...
#include <string_view> // for operator==, basic_...
#include <utility> // for move, pair
#include <variant> // for visit
#include "attr-set.hh" // for Attr, Bindings
#include "config.hh" // for ExperimentalFeatur...
#include "content-address.hh" // for ContentAddressMethod
#include "derivations.hh" // for Derivation, Deriva...
#include "derived-path-map.hh" // for DerivedPathMap
#include "error.hh" // for Error, lvlChatty
#include "eval-error.hh" // for EvalError, EvalErr...
#include "eval.hh" // for EvalState, PrimOp
#include "experimental-features.hh" // for ExperimentalFeature
#include "fmt.hh" // for HintFmt
#include "hash.hh" // for parseHashTypeOpt
#include "logging.hh" // for Logger, printMsg
#include "path.hh" // for StorePath, StorePa...
#include "pos-idx.hh" // for PosIdx, noPos
#include "pos-table.hh" // for PosTable
#include "position.hh" // for Pos, operator<<
#include "primops.hh" // for getAttr, mkOutputS...
#include "ref.hh" // for ref
#include "store-api.hh" // for Store
#include "symbol-table.hh" // for Symbol, SymbolStr
#include "sync.hh" // for Sync
#include "types.hh" // for Strings, BackedStr...
#include "util.hh" // for get, tokenizeString
#include "value-to-json.hh" // for printValueAsJSON
#include "value.hh" // for Value, nNull
#include "value/context.hh" // for NixStringContextElem
namespace nix {

View file

@ -1,7 +1,20 @@
#include "primops.hh"
#include "store-api.hh"
#include "make-content-addressed.hh"
#include "url.hh"
#include <optional> // for optional
#include <string> // for allocator, char_tr...
#include "attr-set.hh" // for Attr, Bindings
#include "error.hh" // for Error, Trace
#include "eval.hh" // for EvalState, PrimOp
#include "experimental-features.hh" // for ExperimentalFeature
#include "fmt.hh" // for HintFmt
#include "make-content-addressed.hh" // for makeContentAddressed
#include "path-info.hh" // for ValidPathInfo
#include "path.hh" // for StorePath
#include "pos-idx.hh" // for PosIdx
#include "realisation.hh" // for RealisedPath
#include "store-api.hh" // for Store, copyClosure
#include "url.hh" // for ParsedURL, parseURL
#include "util.hh" // for getEnv, operator+
#include "value.hh" // for Value, nString
#include "value/context.hh" // for NixStringContext
namespace nix {

View file

@ -1,10 +1,23 @@
#include "primops.hh"
#include "eval-inline.hh"
#include "eval-settings.hh"
#include "store-api.hh"
#include "fetchers.hh"
#include "url.hh"
#include "url-parts.hh"
#include <optional> // for optional
#include <regex> // for regex_match
#include <string> // for allocator, char_traits, basic_string
#include <string_view> // for operator==, basic_string_view, string_view
#include <utility> // for move
#include "attr-set.hh" // for Attr, BindingsBuilder, Bindings
#include "attrs.hh" // for Attrs
#include "error.hh" // for Error
#include "eval-error.hh" // for EvalError, EvalErrorBuilder
#include "eval-settings.hh" // for EvalSettings, evalSettings
#include "eval.hh" // for EvalState, PrimOp
#include "fetchers.hh" // for Input, Tree
#include "hash.hh" // for Hash, HashType
#include "pos-idx.hh" // for PosIdx
#include "ref.hh" // for ref
#include "symbol-table.hh" // for Symbol, SymbolStr, SymbolTable
#include "types.hh" // for BackedStringView
#include "url-parts.hh" // for revRegex
#include "value.hh" // for Value, nAttrs
#include "value/context.hh" // for NixStringContext
namespace nix {

View file

@ -1,15 +1,36 @@
#include "primops.hh"
#include "eval-inline.hh"
#include "eval-settings.hh"
#include "store-api.hh"
#include "fetchers.hh"
#include "filetransfer.hh"
#include "registry.hh"
#include "url.hh"
#include <ctime>
#include <iomanip>
#include <regex>
#include <assert.h> // for assert
#include <stdint.h> // for uint64_t
#include <ctime> // for gmtime
#include <iomanip> // for put_time, operator<<
#include <map> // for operator==, map
#include <optional> // for optional, operator==
#include <regex> // for regex_match, regex...
#include <string> // for char_traits, basic...
#include <string_view> // for operator==, basic_...
#include <utility> // for move, pair
#include "attr-set.hh" // for Attr, BindingsBuilder
#include "attrs.hh" // for maybeGetStrAttr
#include "config.hh" // for Setting, Experimen...
#include "content-address.hh" // for FileIngestionMethod
#include "eval-error.hh" // for EvalError, EvalErr...
#include "eval-settings.hh" // for EvalSettings, eval...
#include "eval.hh" // for EvalState, PrimOp
#include "experimental-features.hh" // for ExperimentalFeature
#include "fetchers.hh" // for Input, Tree, downl...
#include "fmt.hh" // for fmt
#include "hash.hh" // for Hash, HashType, Base
#include "path-info.hh" // for ValidPathInfo
#include "path.hh" // for StorePath
#include "pos-idx.hh" // for PosIdx
#include "ref.hh" // for ref
#include "registry.hh" // for lookupInRegistries
#include "store-api.hh" // for Store
#include "symbol-table.hh" // for Symbol, SymbolTable
#include "types.hh" // for BackedStringView
#include "url.hh" // for ParsedURL
#include "util.hh" // for baseNameOf
#include "value.hh" // for Value, nAttrs, nBool
#include "value/context.hh" // for NixStringContext
namespace nix {

View file

@ -1,8 +1,27 @@
#include "primops.hh"
#include "eval-inline.hh"
#include <sstream>
#include <toml.hpp>
#include <stddef.h> // for size_t
#include <stdint.h> // for int64_t
#include <exception> // for exception
#include <functional> // for function
#include <sstream> // for char_traits, basic_ostringstream
#include <stdexcept> // for runtime_error
#include <string> // for basic_string, operator<<, operat...
#include <toml/comments.hpp> // for operator<<
#include <toml/datetime.hpp> // for operator<<
#include <toml/get.hpp> // for get
#include <toml/parser.hpp> // for parse
#include <toml/serializer.hpp> // for operator<<
#include <toml/types.hpp> // for value_t
#include <toml/value.hpp> // for value, table
#include <unordered_map> // for unordered_map, _Node_iterator
#include <utility> // for pair
#include <vector> // for vector
#include "attr-set.hh" // for BindingsBuilder
#include "config.hh" // for ExperimentalFeatureSettings, exp...
#include "eval-error.hh" // for EvalError, EvalErrorBuilder
#include "eval.hh" // for EvalState, PrimOp
#include "experimental-features.hh" // for ExperimentalFeature, Xp
#include "pos-idx.hh" // for PosIdx
#include "value.hh" // for Value, NixFloat
namespace nix {

View file

@ -1,5 +1,11 @@
#include "hash.hh"
#include "primops.hh"
#include "eval-error.hh" // for EvalError, EvalErrorBuilder
#include "eval.hh" // for EvalState, PrimOp
#include "pos-idx.hh" // for PosIdx
#include "primops.hh" // for realisePath
#include "source-path.hh" // for SourcePath
#include "value.hh" // for Value
#include "value/context.hh" // for NixStringContext
namespace nix {

View file

@ -1,6 +1,26 @@
#include "derivations.hh"
#include "primops.hh"
#include "store-api.hh"
#include <dlfcn.h> // for dlerror, dlopen, dlsym, RTLD_LAZY, RTLD_...
#include <memory> // for allocator, __shared_ptr_access, shared_ptr
#include <optional> // for optional, nullopt, nullopt_t
#include <string> // for basic_string, char_traits, string, opera...
#include <utility> // for pair
#include "attr-set.hh" // for BindingsBuilder, Bindings, Attr
#include "canon-path.hh" // for CanonPath
#include "derivations.hh" // for Derivation, DerivationOutput, isDerivation
#include "derived-path.hh" // for makeConstantStorePathRef, SingleDerivedPath
#include "eval-error.hh" // for EvalError, EvalErrorBuilder
#include "eval.hh" // for EvalState, PrimOp, Env, resolveExprPath
#include "logging.hh" // for Logger, debug
#include "nixexpr.hh" // for StaticEnv, Expr
#include "path.hh" // for StorePath
#include "pos-idx.hh" // for PosIdx
#include "primops.hh" // for realisePath, prim_importNative, mkOutput...
#include "ref.hh" // for ref
#include "source-path.hh" // for SourcePath
#include "store-api.hh" // for Store
#include "symbol-table.hh" // for Symbol
#include "util.hh" // for enumerate
#include "value.hh" // for Value, allocRootValue
#include "value/context.hh" // for NixStringContextElem
namespace nix {

View file

@ -1,6 +1,11 @@
#include "json-to-value.hh"
#include "primops.hh"
#include "value-to-json.hh"
#include <sstream> // for basic_ostringstream, basic_ios, basic_os...
#include "eval.hh" // for PrimOp, EvalState
#include "json-to-value.hh" // for JSONParseError, parseJSON
#include "pos-idx.hh" // for PosIdx
#include "pos-table.hh" // for PosTable
#include "value-to-json.hh" // for printValueAsJSON
#include "value.hh" // for Value
#include "value/context.hh" // for NixStringContext
namespace nix {

View file

@ -1,5 +1,19 @@
#include "gc-small-vector.hh"
#include "primops.hh"
#include <string.h> // for memcpy, size_t
#include <algorithm> // for stable_sort
#include <boost/container/vector.hpp> // for vector
#include <functional> // for function
#include <set> // for set
#include <string> // for basic_string, allocator, opera...
#include <utility> // for pair
#include "attr-set.hh" // for BindingsBuilder, Bindings
#include "eval-error.hh" // for EvalError, EvalErrorBuilder
#include "eval.hh" // for EvalState, PrimOp
#include "gc-small-vector.hh" // for SmallTemporaryValueVector, Sma...
#include "pos-idx.hh" // for PosIdx, noPos
#include "primops.hh" // for getAttr, CompareValues, prim_l...
#include "symbol-table.hh" // for Symbol, SymbolTable
#include "util.hh" // for enumerate
#include "value.hh" // for Value, ValueVector
namespace nix {

View file

@ -1,8 +1,42 @@
#include "eval-settings.hh"
#include "fetch-to-store.hh"
#include "path-references.hh"
#include "primops.hh"
#include "store-api.hh"
#include <sys/stat.h> // for stat, S_ISDIR, S_I...
#include <list> // for list
#include <optional> // for optional, operator!=
#include <set> // for _Rb_tree_const_ite...
#include <string> // for basic_string, char...
#include <string_view> // for string_view
#include <utility> // for move, pair
#include <variant> // for get_if
#include "attr-set.hh" // for Attr, Bindings
#include "canon-path.hh" // for CanonPath
#include "content-address.hh" // for FileIngestionMethod
#include "derivations.hh" // for hashPlaceholder
#include "derived-path.hh" // for SingleDerivedPath
#include "error.hh" // for Error, SysError
#include "eval-error.hh" // for EvalError, EvalErr...
#include "eval-settings.hh" // for EvalSettings, eval...
#include "eval.hh" // for EvalState, PrimOp
#include "experimental-features.hh" // for ExperimentalFeature
#include "fetch-to-store.hh" // for fetchToStore
#include "globals.hh" // for Settings, settings
#include "hash.hh" // for Hash, newHashAllow...
#include "input-accessor.hh" // for InputAccessor
#include "outputs-spec.hh" // for OutputNameView
#include "path-info.hh" // for ValidPathInfo
#include "path-references.hh" // for PathRefScanSink
#include "path.hh" // for StorePath, StorePa...
#include "pos-idx.hh" // for PosIdx, noPos
#include "pos-table.hh" // for PosTable
#include "primops.hh" // for RealisePathFlags
#include "ref.hh" // for ref, make_ref
#include "search-path.hh" // for SearchPath
#include "serialise.hh" // for operator<<, Sink
#include "source-path.hh" // for SourcePath, Symlin...
#include "store-api.hh" // for Store
#include "symbol-table.hh" // for Symbol, SymbolStr
#include "types.hh" // for BackedStringView
#include "util.hh" // for rewriteStrings
#include "value.hh" // for Value, nPath, nString
#include "value/context.hh" // for NixStringContext
namespace nix {

View file

@ -1,5 +1,24 @@
#include "names.hh"
#include "primops.hh"
#include <assert.h> // for assert
#include <stddef.h> // for size_t
#include <iterator> // for distance
#include <memory> // for shared_ptr, __shared_ptr_access, make_sh...
#include <regex> // for regex_error, match_results, cregex_iterator
#include <string> // for basic_string, char_traits, string
#include <string_view> // for basic_string_view
#include <unordered_map> // for unordered_map, operator==, _Node_iterator
#include <utility> // for move, pair
#include <vector> // for vector
#include "attr-set.hh" // for BindingsBuilder
#include "eval-error.hh" // for EvalError, EvalErrorBuilder
#include "eval.hh" // for EvalState, PrimOp, makeRegexCache, prim_...
#include "names.hh" // for DrvName, compareVersions, nextComponent
#include "pos-idx.hh" // for PosIdx
#include "primops.hh" // for RegexCache
#include "symbol-table.hh" // for Symbol
#include "types.hh" // for BackedStringView, Strings
#include "util.hh" // for baseNameOf, enumerate
#include "value.hh" // for Value, nString
#include "value/context.hh" // for NixStringContext
namespace nix {

View file

@ -1,8 +1,23 @@
#include "eval-settings.hh"
#include "primops.hh"
#include <optional> // for optional
#include <string> // for basic_string, char...
#include <utility> // for move
#include "canon-path.hh" // for CanonPath
#include "error.hh" // for Error
#include "eval-error.hh" // for EvalError, EvalErr...
#include "eval-settings.hh" // for EvalSettings, eval...
#include "eval.hh" // for EvalState, PrimOp
#include "pos-idx.hh" // for PosIdx
#include "pos-table.hh" // for PosTable
#include "primops.hh" // for prim_exec
#include "types.hh" // for BackedStringView
#include "util.hh" // for getEnv, runProgram
#include "value.hh" // for Value
#include "value/context.hh" // for NixStringContext
namespace nix {
struct Expr;
/**
* builtins.exec
*/

View file

@ -1,5 +1,9 @@
#include "primops.hh"
#include "value-to-xml.hh"
#include <sstream> // for basic_ostringstream, basic_ios, basic_os...
#include "eval.hh" // for PrimOp, EvalState (ptr only)
#include "pos-idx.hh" // for PosIdx
#include "value.hh" // for Value
#include "value-to-xml.hh" // for printValueAsXML
#include "value/context.hh" // for NixStringContext
namespace nix {

View file

@ -1,4 +1,12 @@
#include "primops.hh"
#include <stdlib.h> // for abort
#include <string> // for basic_string, char_traits, string
#include "attr-set.hh" // for BindingsBuilder
#include "eval-error.hh" // for TypeError, EvalErrorBuilder
#include "eval.hh" // for PrimOp, EvalState
#include "nixexpr.hh" // for ExprLambda, Formal, Formals
#include "pos-idx.hh" // for PosIdx
#include "symbol-table.hh" // for Symbol
#include "value.hh" // for Value, nAttrs, nBool, nFloat, nFunction
namespace nix {