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

lib.types: remove assertMsg usage

Browse Source 
assertMsg sends our error message through a function call, even if the
error condition doesn't trigger. This requires a lot of thunk allocation
that can be easily avoided.
This commit is contained in:
Eman Resu
2026-05-26 13:23:08 -04:00
parent 855f2d0435
commit ce99cfa103
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/types.nix
+4 -4
View File
@@ -408,7 +408,7 @@ rec {
betweenDesc = lowest: highest: "${toString lowest} and ${toString highest} (both inclusive)";
between =
lowest: highest:
assert lib.assertMsg (lowest <= highest) "ints.between: lowest must be smaller than highest";
assert lowest <= highest || throw "ints.between: lowest must be smaller than highest";
addCheck int (x: x >= lowest && x <= highest)
// {
name = "intBetween";
@@ -495,7 +495,7 @@ rec {
{
between =
lowest: highest:
assert lib.assertMsg (lowest <= highest) "numbers.between: lowest must be smaller than highest";
assert lowest <= highest || throw "numbers.between: lowest must be smaller than highest";
addCheck number (x: x >= lowest && x <= highest)
// {
name = "numberBetween";
@@ -1728,9 +1728,9 @@ rec {
# converted to `finalType` using `coerceFunc`.
coercedTo =
coercedType: coerceFunc: finalType:
assert lib.assertMsg (
assert
coercedType.getSubModules == null
) "coercedTo: coercedType must not have submodules (it’s a ${coercedType.description})";
|| throw "coercedTo: coercedType must not have submodules (it’s a ${coercedType.description})";
mkOptionType rec {
name = "coercedTo";
description = "${optionDescriptionPhrase (class: class == "noun") finalType} or ${