public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #121875 from Infinisil/small-module-arg-optimization

Browse Source 
lib/modules: Small optimization
This commit is contained in:
Maximilian Bosch 2021-05-06 10:33:22 +02:00 committed by GitHub
commit 77b82f3535
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/modules.nix
View File

@ -299,13 +299,11 @@ rec {
# a module will resolve strictly the attributes used as argument but # a module will resolve strictly the attributes used as argument but
# not their values. The values are forwarding the result of the # not their values. The values are forwarding the result of the
# evaluation of the option. # evaluation of the option.
requiredArgs = builtins.attrNames (lib.functionArgs f);
context = name: ''while evaluating the module argument `${name}' in "${key}":''; context = name: ''while evaluating the module argument `${name}' in "${key}":'';
extraArgs = builtins.listToAttrs (map (name: { extraArgs = builtins.mapAttrs (name: _:
inherit name; builtins.addErrorContext (context name)
value = builtins.addErrorContext (context name) (args.${name} or config._module.args.${name})
(args.${name} or config._module.args.${name}); ) (lib.functionArgs f);
}) requiredArgs);
# Note: we append in the opposite order such that we can add an error # Note: we append in the opposite order such that we can add an error
# context on the explicited arguments of "args" too. This update # context on the explicited arguments of "args" too. This update