lix-project/lix
20
57
Fork 31
Code Issues 351 Code Review (Gerrit) Projects 3 Releases Wiki Activity

remove unused ftn; reformat line breaks

Browse source
This commit is contained in:
Ben Burdette 2020-11-09 17:17:47 -07:00
parent 6c2933a8d7
commit 9f2b25ce55
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/libexpr/eval.cc
View file

@ -636,11 +636,6 @@ LocalNoInlineNoReturn(void throwTypeError(const Pos & pos, const char * s))
}); });
} }
LocalNoInlineNoReturn(void throwTypeError(const char * s, const string & s1))
{
throw TypeError(s, s1);
}
LocalNoInlineNoReturn(void throwTypeError(const Pos & pos, const char * s, const ExprLambda & fun, const Symbol & s2)) LocalNoInlineNoReturn(void throwTypeError(const Pos & pos, const char * s, const ExprLambda & fun, const Symbol & s2))
{ {
throw TypeError({ throw TypeError({
@ -1371,12 +1366,14 @@ void EvalState::autoCallFunction(Bindings & args, Value & fun, Value & res)
actualArgs->attrs->push_back(*j); actualArgs->attrs->push_back(*j);
} else if (!i.def) { } else if (!i.def) {
throwUndefinedVarError(i.pos, R"(cannot auto-call a function that has an argument without a default value ('%1%') throwUndefinedVarError(i.pos, R"(cannot auto-call a function that has an argument without a default value ('%1%')
An 'auto-call' is when a nix expression is evaluated without any external arguments. If that An 'auto-call' is when a nix expression is evaluated without any external arguments.
nix expression is a function, and that function's arguments all have default values, then all is well. If that nix expression is a function, and that function's arguments all have default
values, then all is well.
But if the function arguments don't have default values, evaluation fails. But if the function arguments don't have default values, evaluation fails.
The classic case for this error is evaluating a nix file with nix-build that expects to be evaluated by callPackage. The classic case for this error is evaluating a nix file with nix-build that expects
to be evaluated by callPackage.
# in 'callPackage' format: expression is a function that takes an argument 'stdenv'. # in 'callPackage' format: expression is a function that takes an argument 'stdenv'.
# callPackage would implicitly pull 'stdenv' from nixpkgs, then call this function. # callPackage would implicitly pull 'stdenv' from nixpkgs, then call this function.
{ stdenv }: { stdenv }: