wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-24 22:11:15 +02:00
Code Activity

Merge InputAccessor into SourceAccessor

Browse source 
After the removal of the InputAccessor::fetchToStore() method, the
only remaining functionality in InputAccessor was `fingerprint` and
`getLastModified()`, and there is no reason to keep those in a
separate class.
This commit is contained in:
Eelco Dolstra 2024-05-03 12:14:01 +02:00
parent 00ca2b05b8
commit ba5929c7be
35 changed files with 130 additions and 188 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libexpr/primops.cc
View file

@ -1828,12 +1828,12 @@ static RegisterPrimOp primop_hashFile({
.fun = prim_hashFile,
});
static Value * fileTypeToString(EvalState & state, InputAccessor::Type type)
static Value * fileTypeToString(EvalState & state, SourceAccessor::Type type)
{
return
type == InputAccessor::Type::tRegular ? &state.vStringRegular :
type == InputAccessor::Type::tDirectory ? &state.vStringDirectory :
type == InputAccessor::Type::tSymlink ? &state.vStringSymlink :
type == SourceAccessor::Type::tRegular ? &state.vStringRegular :
type == SourceAccessor::Type::tDirectory ? &state.vStringDirectory :
type == SourceAccessor::Type::tSymlink ? &state.vStringSymlink :
&state.vStringUnknown;
}