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

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.
This commit is contained in:
Profpatsch 2018-04-02 21:00:47 +02:00
parent b90104ea0e
commit fd54a946ca
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/debug.nix
View File

@ -11,10 +11,6 @@ in
rec { 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; traceIf = p: msg: x: if p then trace msg x else x;
traceValFn = f: x: trace (f x) x; traceValFn = f: x: trace (f x) x;
@ -98,6 +94,12 @@ rec {
+ "and will be removed in the next release." ) + "and will be removed in the next release." )
(if c x then true else traceSeq (showVal x) false); (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, /* Evaluate a set of tests. A test is an attribute set {expr,
expected}, denoting an expression and its expected result. The expected}, denoting an expression and its expected result. The
result is a list of failed tests, each represented as {name, result is a list of failed tests, each represented as {name,

4
lib/modules.nix
View File

@ -159,7 +159,7 @@ rec {
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.listToAttrs (map (name: {
inherit name; inherit name;
value = addErrorContext (context name) value = builtins.addErrorContext (context name)
(args.${name} or config._module.args.${name}); (args.${name} or config._module.args.${name});
}) requiredArgs); }) requiredArgs);
@ -309,7 +309,7 @@ rec {
res.mergedValue; res.mergedValue;
in opt // 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; definitions = map (def: def.value) res.defsFinal;
files = map (def: def.file) res.defsFinal; files = map (def: def.file) res.defsFinal;
inherit (res) isDefined; inherit (res) isDefined;