Skip to content

Commit 4292d99

Browse files
authored
Merge pull request #9395 from nbraud/buitlins
builtins.concatMap: Fix typo in error message
2 parents c4a74d6 + d592808 commit 4292d99

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/libexpr/primops.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3459,7 +3459,7 @@ static void prim_concatMap(EvalState & state, const PosIdx pos, Value * * args,
34593459
for (unsigned int n = 0; n < nrLists; ++n) {
34603460
Value * vElem = args[1]->listElems()[n];
34613461
state.callFunction(*args[0], *vElem, lists[n], pos);
3462-
state.forceList(lists[n], lists[n].determinePos(args[0]->determinePos(pos)), "while evaluating the return value of the function passed to buitlins.concatMap");
3462+
state.forceList(lists[n], lists[n].determinePos(args[0]->determinePos(pos)), "while evaluating the return value of the function passed to builtins.concatMap");
34633463
len += lists[n].listSize();
34643464
}
34653465

src/libexpr/tests/error_traces.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -906,12 +906,12 @@ namespace nix {
906906
ASSERT_TRACE2("concatMap (x: 1) [ \"foo\" ] # TODO",
907907
TypeError,
908908
hintfmt("value is %s while a list was expected", "an integer"),
909-
hintfmt("while evaluating the return value of the function passed to buitlins.concatMap"));
909+
hintfmt("while evaluating the return value of the function passed to builtins.concatMap"));
910910

911911
ASSERT_TRACE2("concatMap (x: \"foo\") [ 1 2 ] # TODO",
912912
TypeError,
913913
hintfmt("value is %s while a list was expected", "a string"),
914-
hintfmt("while evaluating the return value of the function passed to buitlins.concatMap"));
914+
hintfmt("while evaluating the return value of the function passed to builtins.concatMap"));
915915

916916
}
917917

0 commit comments

Comments
 (0)