diff options
author | Alois Wohlschlager <alois1@gmx-topmail.de> | 2024-02-03 16:13:04 +0100 |
---|---|---|
committer | Alois Wohlschlager <alois1@gmx-topmail.de> | 2024-02-03 19:01:39 +0100 |
commit | d33127863ecda07ddd292d9bad7f8717f69430a0 (patch) | |
tree | 8d91256287e4f49b427ea7ad97321d87fd22250f /lib/attrsets.nix | |
parent | b8b232ae7b8b144397fdb12d20f592e5e7c1a64d (diff) |
lib: make deprecation warnings consistent
The deprecation warnings in lib were wildly inconsistent. Different formulations were used in different places for the same meaning. Some warnings used builtins.trace instead of lib.warn, which prevents silencing; one even only had a comment instead. Make everything more uniform.
Diffstat (limited to 'lib/attrsets.nix')
-rw-r--r-- | lib/attrsets.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 99b6869184534..0e896a93156d5 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -3,7 +3,7 @@ let inherit (builtins) head tail length; - inherit (lib.trivial) id mergeAttrs; + inherit (lib.trivial) id mergeAttrs warn; inherit (lib.strings) concatStringsSep concatMapStringsSep escapeNixIdentifier sanitizeDerivationName; inherit (lib.lists) foldr foldl' concatMap concatLists elemAt all partition groupBy take foldl; in @@ -1197,9 +1197,10 @@ rec { (x // y) // mask; # DEPRECATED - zipWithNames = zipAttrsWithNames; + zipWithNames = warn + "lib.zipWithNames is a deprecated alias of lib.zipAttrsWithNames." zipAttrsWithNames; # DEPRECATED - zip = builtins.trace - "lib.zip is deprecated, use lib.zipAttrsWith instead" zipAttrsWith; + zip = warn + "lib.zip is a deprecated alias of lib.zipAttrsWith." zipAttrsWith; } |