diff options
author | Robert Hensing <robert@roberthensing.nl> | 2020-10-20 13:47:24 +0200 |
---|---|---|
committer | Robert Hensing <robert@roberthensing.nl> | 2020-10-22 13:46:47 +0200 |
commit | afa6c51f27fb86fda71f91a51b093a5fc3de797d (patch) | |
tree | 99dc279dd61c53c85643f66a1c0c83e7004a9c3b /lib/types.nix | |
parent | 5aa2a98dfa0b54fef1b5cc7059ac8c4b1248a739 (diff) |
lib: Use Nix's static scope checking, fix error message, optimize
Nix can perform static scope checking, but whenever code is inside
a `with` expression, the analysis breaks down, because it can't
know statically what's in the attribute set whose attributes were
brought into scope. In those cases, Nix has to assume that
everything works out.
Except it doesnt. Removing `with` from lib/ revealed an undefined
variable in an error message.
If that doesn't convince you that we're better off without `with`,
I can tell you that this PR results in a 3% evaluation performance
improvement because Nix can look up local variables by index.
This adds up with applications like the module system.
Furthermore, removing `with` makes the binding site of each
variable obvious, which helps with comprehension.
Diffstat (limited to 'lib/types.nix')
-rw-r--r-- | lib/types.nix | 60 |
1 files changed, 55 insertions, 5 deletions
diff --git a/lib/types.nix b/lib/types.nix index dd287734388a..1144c018b265 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -1,12 +1,62 @@ # Definitions related to run-time type checking. Used in particular # to type-check NixOS configurations. { lib }: -with lib.lists; -with lib.attrsets; -with lib.options; -with lib.trivial; -with lib.strings; + let + inherit (lib) + elem + flip + functionArgs + isAttrs + isBool + isDerivation + isFloat + isFunction + isInt + isList + isString + isStorePath + setFunctionArgs + toDerivation + toList + ; + inherit (lib.lists) + all + concatLists + count + elemAt + filter + foldl' + head + imap1 + last + length + tail + unique + ; + inherit (lib.attrsets) + attrNames + filterAttrs + hasAttr + mapAttrs + optionalAttrs + zipAttrsWith + ; + inherit (lib.options) + getFiles + getValues + mergeDefaultOption + mergeEqualOption + mergeOneOption + showFiles + showOption + ; + inherit (lib.strings) + concatMapStringsSep + concatStringsSep + escapeNixString + isCoercibleToString + ; inherit (lib.modules) mergeDefinitions; outer_types = |