Fold conv package into fmt

Both packages had nearly identical dependency requirements, so merging
them should help reduce the complexity of the build graph.

libc/calls/calls.mk

@@ -39,15 +39,14 @@ LIBC_CALLS_A_CHECKS =					\
 
 LIBC_CALLS_A_DIRECTDEPS =				\
 	LIBC_FMT					\
-	LIBC_STR					\
-	LIBC_RAND					\
-	LIBC_CONV					\
-	LIBC_STUBS					\
 	LIBC_NEXGEN32E					\
-	LIBC_NT_NTDLL					\
 	LIBC_NT_ADVAPI32				\
 	LIBC_NT_KERNEL32				\
 	LIBC_NT_KERNELBASE				\
+	LIBC_NT_NTDLL					\
+	LIBC_RAND					\
+	LIBC_STR					\
+	LIBC_STUBS					\
 	LIBC_SYSV_CALLS					\
 	LIBC_SYSV
 

libc/calls/clock_gettime.c

@@ -23,8 +23,8 @@
 #include "libc/calls/internal.h"
 #include "libc/calls/struct/timespec.h"
 #include "libc/calls/struct/timeval.h"
-#include "libc/conv/conv.h"
 #include "libc/dce.h"
+#include "libc/fmt/conv.h"
 #include "libc/mach.h"
 #include "libc/nt/struct/filetime.h"
 #include "libc/nt/struct/systemtime.h"

libc/calls/commandv.c

@@ -20,9 +20,9 @@
 #include "libc/bits/progn.internal.h"
 #include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
-#include "libc/conv/conv.h"
 #include "libc/dce.h"
 #include "libc/errno.h"
+#include "libc/fmt/conv.h"
 #include "libc/nt/ntdll.h"
 #include "libc/runtime/runtime.h"
 #include "libc/str/str.h"

libc/calls/fstat-nt.c

@@ -20,7 +20,7 @@
 #include "libc/bits/safemacros.internal.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/struct/stat.h"
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"
 #include "libc/nt/enum/fileflagandattributes.h"
 #include "libc/nt/enum/fileinfobyhandleclass.h"
 #include "libc/nt/enum/filetype.h"

libc/calls/getpriority-nt.c

@@ -21,7 +21,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/kntprioritycombos.internal.h"
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"
 #include "libc/nexgen32e/ffs.h"
 #include "libc/nt/enum/processcreationflags.h"
 #include "libc/nt/enum/threadpriority.h"

libc/calls/getrusage-nt.c

@@ -20,7 +20,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/struct/rusage.h"
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"
 #include "libc/nt/accounting.h"
 #include "libc/nt/runtime.h"
 #include "libc/nt/thread.h"

libc/calls/getsetpriority-nt.c

@@ -18,7 +18,7 @@
 │ 02110-1301 USA                                                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/calls.h"
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"
 #include "libc/sysv/consts/prio.h"
 #include "libc/sysv/errfuns.h"
 

libc/calls/gettimeofday-nt.c

@@ -19,7 +19,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/internal.h"
 #include "libc/calls/struct/timeval.h"
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"
 #include "libc/nt/struct/filetime.h"
 #include "libc/nt/struct/systemtime.h"
 #include "libc/nt/synchronization.h"

libc/calls/hefty/fork-nt.c

@@ -22,7 +22,7 @@
 #include "libc/calls/hefty/ntspawn.h"
 #include "libc/calls/hefty/spawn.h"
 #include "libc/calls/internal.h"
-#include "libc/conv/itoa.h"
+#include "libc/fmt/itoa.h"
 #include "libc/nt/enum/filemapflags.h"
 #include "libc/nt/enum/pageflags.h"
 #include "libc/nt/enum/startf.h"

libc/calls/hefty/hefty.mk

@@ -37,7 +37,6 @@ LIBC_CALLS_HEFTY_A_CHECKS =				\
 LIBC_CALLS_HEFTY_A_DIRECTDEPS =				\
 	LIBC_ALG					\
 	LIBC_CALLS					\
-	LIBC_CONV					\
 	LIBC_FMT					\
 	LIBC_MEM					\
 	LIBC_NEXGEN32E					\

libc/calls/hefty/mkntcmdline.c

@@ -20,7 +20,7 @@
 #include "libc/alg/arraylist2.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/hefty/ntspawn.h"
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"
 #include "libc/macros.h"
 #include "libc/mem/mem.h"
 #include "libc/nexgen32e/hascharacter.internal.h"

libc/calls/hefty/mkntenvblock.c

@@ -19,7 +19,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/alg/arraylist2.internal.h"
 #include "libc/calls/hefty/ntspawn.h"
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"
 #include "libc/macros.h"
 #include "libc/mem/mem.h"
 #include "libc/str/oldutf16.internal.h"

libc/calls/hefty/ntspawn.c

@@ -24,7 +24,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/hefty/ntspawn.h"
 #include "libc/calls/internal.h"
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"
 #include "libc/nt/enum/processcreationflags.h"
 #include "libc/nt/process.h"
 #include "libc/nt/runtime.h"

libc/calls/hefty/spawnve-sysv.c

@@ -22,8 +22,8 @@
 #include "libc/calls/hefty/internal.h"
 #include "libc/calls/hefty/spawn.h"
 #include "libc/calls/internal.h"
-#include "libc/conv/conv.h"
 #include "libc/dce.h"
+#include "libc/fmt/conv.h"
 #include "libc/mem/mem.h"
 #include "libc/paths.h"
 #include "libc/runtime/runtime.h"

libc/calls/isdebuggerpresent.c

@@ -21,8 +21,8 @@
 #include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
-#include "libc/conv/conv.h"
 #include "libc/dce.h"
+#include "libc/fmt/conv.h"
 #include "libc/log/log.h"
 #include "libc/nexgen32e/vendor.internal.h"
 #include "libc/nt/struct/teb.h"

libc/calls/nice.c

@@ -19,7 +19,7 @@
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/bits/safemacros.internal.h"
 #include "libc/calls/calls.h"
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"
 #include "libc/sysv/consts/prio.h"
 
 static int clamp(int p) {

libc/calls/openanon.c

@@ -20,10 +20,10 @@
 #include "libc/assert.h"
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
-#include "libc/conv/conv.h"
-#include "libc/conv/isslash.internal.h"
-#include "libc/conv/itoa.h"
 #include "libc/dce.h"
+#include "libc/fmt/conv.h"
+#include "libc/fmt/isslash.internal.h"
+#include "libc/fmt/itoa.h"
 #include "libc/nt/createfile.h"
 #include "libc/nt/enum/accessmask.h"
 #include "libc/nt/enum/creationdisposition.h"

libc/calls/setitimer-nt.c

@@ -20,8 +20,8 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/struct/itimerval.h"
-#include "libc/conv/conv.h"
 #include "libc/errno.h"
+#include "libc/fmt/conv.h"
 #include "libc/log/check.h"
 #include "libc/nexgen32e/nexgen32e.h"
 #include "libc/nt/files.h"

libc/calls/utimensat-nt.c

@@ -18,7 +18,7 @@
 │ 02110-1301 USA                                                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/calls/internal.h"
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"
 #include "libc/nt/createfile.h"
 #include "libc/nt/enum/accessmask.h"
 #include "libc/nt/enum/creationdisposition.h"

libc/calls/wait4-nt.c

@@ -20,7 +20,7 @@
 #include "libc/calls/calls.h"
 #include "libc/calls/internal.h"
 #include "libc/calls/struct/rusage.h"
-#include "libc/conv/conv.h"
+#include "libc/fmt/conv.h"
 #include "libc/macros.h"
 #include "libc/nt/accounting.h"
 #include "libc/nt/enum/status.h"