diff options
| author | eldritch horrors <pennae@lix.systems> | 2024-03-04 05:56:04 +0100 |
|---|---|---|
| committer | eldritch horrors <pennae@lix.systems> | 2024-03-04 05:56:04 +0100 |
| commit | 3f3badffc908a61a522b13bb6783442082d6d8d9 (patch) | |
| tree | 767640053ddb3ee38028c0ac6b1fa6ec1edc16c6 | |
| parent | 2df9c2c00f0645245d374915b10e6eca58856505 (diff) | |
Merge pull request #9395 from nbraud/buitlins
builtins.concatMap: Fix typo in error message
(cherry picked from commit 4292d997568eb30503e287f98e24821ff0bc2816)
Change-Id: Ia33d1b02e41f699ef0c8c2d6487c9f70b2cc8cf4
| -rw-r--r-- | src/libexpr/primops.cc | 2 | ||||
| -rw-r--r-- | tests/unit/libexpr/error_traces.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc index 44a97461a..9cd9fa6f1 100644 --- a/src/libexpr/primops.cc +++ b/src/libexpr/primops.cc @@ -3456,7 +3456,7 @@ static void prim_concatMap(EvalState & state, const PosIdx pos, Value * * args, for (unsigned int n = 0; n < nrLists; ++n) { Value * vElem = args[1]->listElems()[n]; 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(); } diff --git a/tests/unit/libexpr/error_traces.cc b/tests/unit/libexpr/error_traces.cc index 285651256..628e73f25 100644 --- a/tests/unit/libexpr/error_traces.cc +++ b/tests/unit/libexpr/error_traces.cc @@ -906,12 +906,12 @@ namespace nix { ASSERT_TRACE2("concatMap (x: 1) [ \"foo\" ] # TODO", TypeError, 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", TypeError, 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")); } |