Unverified Commit f0fda3bf authored by Silvan Mosberger's avatar Silvan Mosberger Committed by GitHub
Browse files

Merge pull request #131267 from blaggacao/fix-functionArgs 

lib: fix functionArgs for functors
parents 1ab9b0e3 cf8e219b

lib/tests/misc.nix

+10 −0
Original line number Diff line number Diff line
@@ -132,6 +132,16 @@ runTests { 
    expected = [ 1 1 0 ];

  };



  testFunctionArgsFunctor = {

    expr = functionArgs { __functor = self: { a, b }: null; };

    expected = { a = false; b = false; };

  };



  testFunctionArgsSetFunctionArgs = {

    expr = functionArgs (setFunctionArgs (args: args.x) { x = false; });

    expected = { x = false; };

  };



# STRINGS



  testConcatMapStrings = {

lib/trivial.nix

+4 −1
Original line number Diff line number Diff line
@@ -334,7 +334,10 @@ rec { 
     has the same return type and semantics as builtins.functionArgs.

     setFunctionArgs : (a → b) → Map String Bool.

  */

  functionArgs = f: f.__functionArgs or (builtins.functionArgs f);

  functionArgs = f:

    if f ? __functor

    then f.__functionArgs or (lib.functionArgs (f.__functor f))

    else builtins.functionArgs f;



  /* Check whether something is a function or something

     annotated with function args.