lib/generators: mkKeyValueLine -> mkKeyValueLine (#20920)

Rename, since the previous name was potentially confusing.
NixOS · Dec 6, 2016 · 271c0f5 · 271c0f5
1 parent 80f2e53
commit 271c0f5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/lib/generators.nix b/lib/generators.nix
@@ -21,10 +21,10 @@ rec {
    * character sep. If sep appears in k, it is escaped.
    * Helper for synaxes with different separators.
    *
-   * mkKeyValueLine ":" "f:oo" "bar"
+   * mkKeyValueDefault ":" "f:oo" "bar"
    * > "f\:oo:bar"
    */
-  mkKeyValueLine = sep: k: v:
+  mkKeyValueDefault = sep: k: v:
     "${libStr.escape [sep] k}${sep}${toString v}";
 
 
@@ -33,7 +33,7 @@ rec {
    * mkKeyValue is the same as in toINI.
    */
   toKeyValue = {
-    mkKeyValue ? mkKeyValueLine "="
+    mkKeyValue ? mkKeyValueDefault "="
   }: attrs:
     let mkLine = k: v: mkKeyValue k v + "\n";
     in libStr.concatStrings (libAttr.mapAttrsToList mkLine attrs);
@@ -63,7 +63,7 @@ rec {
     # apply transformations (e.g. escapes) to section names
     mkSectionName ? (name: libStr.escape [ "[" "]" ] name),
     # format a setting line from key and value
-    mkKeyValue    ? mkKeyValueLine "="
+    mkKeyValue    ? mkKeyValueDefault "="
   }: attrsOfAttrs:
     let
         # map function to string for each key val

diff --git a/lib/tests.nix b/lib/tests.nix
@@ -135,8 +135,8 @@ runTests {
   # these tests assume attributes are converted to lists
   # in alphabetical order
 
-  testMkKeyValueLine = {
-    expr = generators.mkKeyValueLine ":" "f:oo" "bar";
+  testMkKeyValueDefault = {
+    expr = generators.mkKeyValueDefault ":" "f:oo" "bar";
     expected = ''f\:oo:bar'';
   };