diff options
| author | Guillaume Maudoux <guillaume.maudoux@tweag.io> | 2022-04-29 00:12:25 +0200 |
|---|---|---|
| committer | Guillaume Maudoux <guillaume.maudoux@tweag.io> | 2022-04-29 00:12:25 +0200 |
| commit | e93b59fbc5ada40e77d6f2b2a8bbd8e482418d6a (patch) | |
| tree | f9436753bba299d648a6721845a9465b34a50062 /src/libexpr/attr-path.hh | |
| parent | f6baa4d18845297f3f7fc2434b7ade93a45718e7 (diff) | |
| parent | 35393dc2c65765acb6cc99d6a976eab62c28a51d (diff) | |
Merge remote-tracking branch 'origin/master' into coerce-string
Diffstat (limited to 'src/libexpr/attr-path.hh')
| -rw-r--r-- | src/libexpr/attr-path.hh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libexpr/attr-path.hh b/src/libexpr/attr-path.hh index ff1135a06..117e0051b 100644 --- a/src/libexpr/attr-path.hh +++ b/src/libexpr/attr-path.hh @@ -10,14 +10,14 @@ namespace nix { MakeError(AttrPathNotFound, Error); MakeError(NoPositionInfo, Error); -std::pair<Value *, Pos> findAlongAttrPath( +std::pair<Value *, PosIdx> findAlongAttrPath( EvalState & state, const std::string & attrPath, Bindings & autoArgs, Value & vIn); /* Heuristic to find the filename and lineno or a nix value. */ -Pos findPackageFilename(EvalState & state, Value & v, std::string what); +std::pair<std::string, uint32_t> findPackageFilename(EvalState & state, Value & v, std::string what); std::vector<Symbol> parseAttrPath(EvalState & state, std::string_view s); |