lib/debug: deprecate `addErrorContextToAttrs`

The function isn’t used anywhere and `addErrorContext` is an undocumented
builtin.
The builtin is explicitely qualified at its two uses in the module system.

2 files changed, 8 insertions, 6 deletions

diff --git a/lib/debug.nix b/lib/debug.nix
index 16e8710168c3..a792806fa79e 100644
--- a/lib/debug.nix
+++ b/lib/debug.nix
@@ -11,10 +11,6 @@ in
 
 rec {
 
-  inherit (builtins) addErrorContext;
-
-  addErrorContextToAttrs = lib.mapAttrs (a: v: lib.addErrorContext "while evaluating ${a}" v);
-
   traceIf = p: msg: x: if p then trace msg x else x;
 
   traceValFn = f: x: trace (f x) x;
@@ -98,6 +94,12 @@ rec {
           + "and will be removed in the next release." )
     (if c x then true else traceSeq (showVal x) false);
 
+
+  addErrorContextToAttrs = attrs:
+    trace ( "Warning: `addErrorContextToAttrs` is deprecated "
+          + "and will be removed in the next release." )
+    (lib.mapAttrs (a: v: lib.addErrorContext "while evaluating ${a}" v) attrs);
+
   /* Evaluate a set of tests.  A test is an attribute set {expr,
      expected}, denoting an expression and its expected result.  The
      result is a list of failed tests, each represented as {name,
diff --git a/lib/modules.nix b/lib/modules.nix
index 4ef982c7ec96..6c8033322a54 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -159,7 +159,7 @@ rec {
       context = name: ''while evaluating the module argument `${name}' in "${key}":'';
       extraArgs = builtins.listToAttrs (map (name: {
         inherit name;
-        value = addErrorContext (context name)
+        value = builtins.addErrorContext (context name)
           (args.${name} or config._module.args.${name});
       }) requiredArgs);
 
@@ -309,7 +309,7 @@ rec {
           res.mergedValue;
 
     in opt //
-      { value = addErrorContext "while evaluating the option `${showOption loc}':" value;
+      { value = builtins.addErrorContext "while evaluating the option `${showOption loc}':" value;
         definitions = map (def: def.value) res.defsFinal;
         files = map (def: def.file) res.defsFinal;
         inherit (res) isDefined;