fix(nix/yants): make (typedef …).checkType return a result set
Previously, for types defined using typedef (like all primitive types) type.checkType would return a boolean. This is largely fine since in most places `type.checkToBool (type.checkType x)` or similar is used. However, some functions actually take type.checkType up on the promise that it returns a set of the form: { ok = <bool>; err = <option string>; } This is the case for restrict which has checkToBool = v: v.ok; and will generate a proper set except if `t.checkToBool (t.checkType v) == false` in which case it will return t.checkType v. If t was a primitive type or defined using typedef, previously `t.checkType v` would be a boolean which meant as soon as (restrict …).checkToBool was called on a restrict checkType result in cases where the wrapped type didn't match, an unrelated error would be thrown: nix-repl> with nix.yants; restrict "foo" (_: true) int "lol" error: value is a boolean while a set was expected, at /home/lukas/src/depot/nix/yants/default.nix:38:39 This is fixed by making typedef return a proper set from checkType and adjusting its checkToBool accordingly. Unfortunately I don't think we can easily add test cases for this except by using recursive nix or VM tests as there is no way to introspect error messages. Change-Id: I96a7be065630f04ca33358f21809284911ec14fe Reviewed-on: https://cl.tvl.fyi/c/depot/+/2536 Tested-by: BuildkiteCI Reviewed-by: tazjin <mail@tazj.in> Reviewed-by: Profpatsch <mail@profpatsch.de>
This commit is contained in:
parent
e628862e97
commit
690994a28c
1 changed files with 7 additions and 3 deletions
|
@ -76,9 +76,13 @@ with builtins; let
|
|||
# error message constructor.
|
||||
typedef = name: check: typedef' {
|
||||
inherit name;
|
||||
checkType = check;
|
||||
checkToBool = r: r;
|
||||
toError = value: _result: typeError name value;
|
||||
checkType = v:
|
||||
let res = check v;
|
||||
in {
|
||||
ok = res;
|
||||
} // (lib.optionalAttrs (!res) {
|
||||
err = typeError name v;
|
||||
});
|
||||
};
|
||||
|
||||
checkEach = name: t: l: foldl' (acc: e:
|
||||
|
|
Loading…
Reference in a new issue