From 6e7822b8f3e495e3c2c12b121ca81d8565298589 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Mon, 20 Jul 2020 13:14:19 +0200
Subject: [PATCH] lib: toHex -> toHexString & toBase -> toBaseDigits

This makes the type of these functions more apparent from the name.
---
 lib/default.nix          |  2 +-
 lib/tests/misc.nix       |  8 ++++----
 lib/trivial.nix          | 20 ++++++++++----------
 nixos/lib/qemu-flags.nix |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/lib/default.nix b/lib/default.nix
index a5c768ff407..43b9ab5930c 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -67,7 +67,7 @@ let
     inherit (trivial) id const pipe concat or and bitAnd bitOr bitXor
       bitNot boolToString mergeAttrs flip mapNullable inNixShell min max
       importJSON warn info showWarnings nixpkgsVersion version mod compare
-      splitByAndCompare functionArgs setFunctionArgs isFunction toHex toBase;
+      splitByAndCompare functionArgs setFunctionArgs isFunction toHexString toBaseDigits;
     inherit (fixedPoints) fix fix' converge extends composeExtensions
       makeExtensible makeExtensibleWithCustomName;
     inherit (attrsets) attrByPath hasAttrByPath setAttrByPath
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index 7d38b56bc21..b066f577f32 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -102,13 +102,13 @@ runTests {
     expected = 9;
   };
 
-  testToHex = {
-    expr = toHex 250;
+  testToHexString = {
+    expr = toHexString 250;
     expected = "FA";
   };
 
-  testToBase = {
-    expr = toBase 2 6;
+  testToBaseDigits = {
+    expr = toBaseDigits 2 6;
     expected = [ 1 1 0 ];
   };
 
diff --git a/lib/trivial.nix b/lib/trivial.nix
index 1114e94b523..6eb1fb3a5b1 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -336,13 +336,13 @@ rec {
   /* Convert the given positive integer to a string of its hexadecimal
      representation. For example:
 
-     toHex 0 => "0"
+     toHexString 0 => "0"
 
-     toHex 16 => "10"
+     toHexString 16 => "10"
 
-     toHex 250 => "FA"
+     toHexString 250 => "FA"
   */
-  toHex = i:
+  toHexString = i:
     let
       toHexDigit = d:
         if d < 10
@@ -357,18 +357,18 @@ rec {
             "15" = "F";
           }.${toString d};
     in
-      lib.concatMapStrings toHexDigit (toBase 16 i);
+      lib.concatMapStrings toHexDigit (toBaseDigits 16 i);
 
-  /* `toBase base i` converts the positive integer i to a list of its
+  /* `toBaseDigits base i` converts the positive integer i to a list of its
      digits in the given base. For example:
 
-     toBase 10 123 => [ 1 2 3 ]
+     toBaseDigits 10 123 => [ 1 2 3 ]
 
-     toBase 2 6 => [ 1 1 0 ]
+     toBaseDigits 2 6 => [ 1 1 0 ]
 
-     toBase 16 250 => [ 15 10 ]
+     toBaseDigits 16 250 => [ 15 10 ]
   */
-  toBase = base: i:
+  toBaseDigits = base: i:
     let
       go = i:
         if i < base
diff --git a/nixos/lib/qemu-flags.nix b/nixos/lib/qemu-flags.nix
index 4774fd23168..0cf6977af4b 100644
--- a/nixos/lib/qemu-flags.nix
+++ b/nixos/lib/qemu-flags.nix
@@ -6,7 +6,7 @@ let
     pkgs.lib.optionalString (n < 16) "0" +
       (if n > 255
        then throw "Can't have more than 255 nets or nodes!"
-       else pkgs.lib.toHex n);
+       else pkgs.lib.toHexString n);
 in
 
 rec {