puck/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Merge pull request #9395 from nbraud/buitlins

Browse source 
builtins.concatMap: Fix typo in error message
This commit is contained in:
Robert Hensing 2023-11-20 00:25:03 +01:00 committed by GitHub
parent c4a74d6dcc d5928085d5
commit 4292d99756
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libexpr/primops.cc
View file

@ -3459,7 +3459,7 @@ static void prim_concatMap(EvalState & state, const PosIdx pos, Value * * args,
for (unsigned int n = 0; n < nrLists; ++n) { for (unsigned int n = 0; n < nrLists; ++n) {
Value * vElem = args[1]->listElems()[n]; Value * vElem = args[1]->listElems()[n];
state.callFunction(*args[0], *vElem, lists[n], pos); state.callFunction(*args[0], *vElem, lists[n], pos);
state.forceList(lists[n], lists[n].determinePos(args[0]->determinePos(pos)), "while evaluating the return value of the function passed to buitlins.concatMap"); state.forceList(lists[n], lists[n].determinePos(args[0]->determinePos(pos)), "while evaluating the return value of the function passed to builtins.concatMap");
len += lists[n].listSize(); len += lists[n].listSize();
} }

4
src/libexpr/tests/error_traces.cc
View file

@ -906,12 +906,12 @@ namespace nix {
ASSERT_TRACE2("concatMap (x: 1) [ \"foo\" ] # TODO", ASSERT_TRACE2("concatMap (x: 1) [ \"foo\" ] # TODO",
TypeError, TypeError,
hintfmt("value is %s while a list was expected", "an integer"), hintfmt("value is %s while a list was expected", "an integer"),
hintfmt("while evaluating the return value of the function passed to buitlins.concatMap")); hintfmt("while evaluating the return value of the function passed to builtins.concatMap"));
ASSERT_TRACE2("concatMap (x: \"foo\") [ 1 2 ] # TODO", ASSERT_TRACE2("concatMap (x: \"foo\") [ 1 2 ] # TODO",
TypeError, TypeError,
hintfmt("value is %s while a list was expected", "a string"), hintfmt("value is %s while a list was expected", "a string"),
hintfmt("while evaluating the return value of the function passed to buitlins.concatMap")); hintfmt("while evaluating the return value of the function passed to builtins.concatMap"));
} }