maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(3p/nix/libexpr): Delete Bindings::sort

Browse source 
This function does nothing anymore since the attributes are always
in-order.
This commit is contained in:
Vincent Ambo 2020-05-22 03:35:07 +01:00
parent 986a8f6b75
commit 68e6e92a20
14 changed files with 6 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

2
third_party/nix/src/libexpr/primops/context.cc vendored
View file

@ -126,9 +126,7 @@ static void prim_getContext(EvalState& state, const Pos& pos, Value** args,
mkString(*(outputsVal.listElems()[i++] = state.allocValue()), output);
}
}
infoVal.attrs->sort();
}
v.attrs->sort();
}
static RegisterPrimOp r4("__getContext", 1, prim_getContext);

4
third_party/nix/src/libexpr/primops/fetchGit.cc vendored
View file

@ -252,10 +252,10 @@ static void prim_fetchGit(EvalState& state, const Pos& pos, Value** args,
gitInfo.shortRev);
mkInt(*state.allocAttr(v, state.symbols.Create("revCount")),
gitInfo.revCount);
v.attrs->sort();
if (state.allowedPaths)
if (state.allowedPaths) {
state.allowedPaths->insert(state.store->toRealPath(gitInfo.storePath));
}
}
static RegisterPrimOp r("fetchGit", 1, prim_fetchGit);

4
third_party/nix/src/libexpr/primops/fetchMercurial.cc vendored
View file

@ -226,10 +226,10 @@ static void prim_fetchMercurial(EvalState& state, const Pos& pos, Value** args,
mkString(*state.allocAttr(v, state.symbols.Create("shortRev")),
std::string(hgInfo.rev, 0, 12));
mkInt(*state.allocAttr(v, state.symbols.Create("revCount")), hgInfo.revCount);
v.attrs->sort();
if (state.allowedPaths)
if (state.allowedPaths) {
state.allowedPaths->insert(state.store->toRealPath(hgInfo.storePath));
}
}
static RegisterPrimOp r("fetchMercurial", 1, prim_fetchMercurial);

2
third_party/nix/src/libexpr/primops/fromTOML.cc vendored
View file

@ -35,8 +35,6 @@ static void prim_fromTOML(EvalState& state, const Pos& pos, Value** args,
} else
visit(v2, i.second);
}
v.attrs->sort();
}
else if (auto t2 = t->as_array()) {