From 98c77a0b2d7c10fc3ef811e9346d1e3cb99f1b32 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <contact@infinisil.com>
Date: Thu, 6 May 2021 04:59:27 +0200
Subject: [PATCH] lib/modules: Small optimization

---
 lib/modules.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

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