move everything from util to core

25 files changed, 32 insertions, 26 deletions

diff --git a/nihil.posix/CMakeLists.txt b/nihil.posix/CMakeLists.txt
index 3fcf625..4fc7d0c 100644
--- a/nihil.posix/CMakeLists.txt
+++ b/nihil.posix/CMakeLists.txt
@@ -4,7 +4,6 @@ add_library(nihil.posix STATIC)
 target_link_libraries(nihil.posix PRIVATE
 	nihil.std
 	nihil.core
-	nihil.util
 )
 
 target_sources(nihil.posix
@@ -58,8 +57,8 @@ if(NIHIL_TESTS)
 
 	target_link_libraries(nihil.posix.test PRIVATE
 		nihil.std
+		nihil.core
 		nihil.posix
-		nihil.util
 		Catch2::Catch2WithMain
 	)
 
diff --git a/nihil.posix/ensure_dir.ccm b/nihil.posix/ensure_dir.ccm
index 9ae6d80..6534736 100644
--- a/nihil.posix/ensure_dir.ccm
+++ b/nihil.posix/ensure_dir.ccm
@@ -2,7 +2,7 @@
 export module nihil.posix:ensure_dir;
 
 import nihil.std;
-import nihil.util;
+import nihil.core;
 
 namespace nihil {
 
diff --git a/nihil.posix/execlp.ccm b/nihil.posix/execlp.ccm
index ba80504..02f9f6f 100644
--- a/nihil.posix/execlp.ccm
+++ b/nihil.posix/execlp.ccm
@@ -2,7 +2,8 @@
 export module nihil.posix:execlp;
 
 import nihil.std;
-import nihil.util;
+import nihil.core;
+
 import :argv;
 import :execvp;
 
diff --git a/nihil.posix/execv.ccm b/nihil.posix/execv.ccm
index 2a77326..5c5a891 100644
--- a/nihil.posix/execv.ccm
+++ b/nihil.posix/execv.ccm
@@ -10,7 +10,7 @@ extern char **environ; // NOLINT
 export module nihil.posix:execv;
 
 import nihil.std;
-import nihil.util;
+import nihil.core;
 import :argv;
 import :executor;
 import :fd;
diff --git a/nihil.posix/execvp.ccm b/nihil.posix/execvp.ccm
index 0a0106d..df28fe8 100644
--- a/nihil.posix/execvp.ccm
+++ b/nihil.posix/execvp.ccm
@@ -3,7 +3,7 @@ export module nihil.posix:execvp;
 
 import nihil.std;
 import nihil.core;
-import nihil.util;
+
 import :argv;
 import :execv;
 import :find_in_path;
diff --git a/nihil.posix/fd.ccm b/nihil.posix/fd.ccm
index 1de343b..54a4502 100644
--- a/nihil.posix/fd.ccm
+++ b/nihil.posix/fd.ccm
@@ -7,7 +7,7 @@ module;
 export module nihil.posix:fd;
 
 import nihil.std;
-import nihil.util;
+import nihil.core;
 
 namespace nihil {
 
diff --git a/nihil.posix/fd.test.cc b/nihil.posix/fd.test.cc
index a0828e5..c164290 100644
--- a/nihil.posix/fd.test.cc
+++ b/nihil.posix/fd.test.cc
@@ -6,8 +6,8 @@
 #include <catch2/catch_test_macros.hpp>
 
 import nihil.std;
+import nihil.core;
 import nihil.posix;
-import nihil.util;
 
 using namespace std::literals;
 
diff --git a/nihil.posix/find_in_path.ccm b/nihil.posix/find_in_path.ccm
index 353750b..f68e61d 100644
--- a/nihil.posix/find_in_path.ccm
+++ b/nihil.posix/find_in_path.ccm
@@ -6,7 +6,7 @@ module;
 export module nihil.posix:find_in_path;
 
 import nihil.std;
-import nihil.util;
+import nihil.core;
 import :fd;
 import :getenv;
 import :paths;
diff --git a/nihil.posix/find_in_path.test.cc b/nihil.posix/find_in_path.test.cc
index 65cbe87..2c07ce2 100644
--- a/nihil.posix/find_in_path.test.cc
+++ b/nihil.posix/find_in_path.test.cc
@@ -3,8 +3,8 @@
 #include <catch2/catch_test_macros.hpp>
 
 import nihil.std;
+import nihil.core;
 import nihil.posix;
-import nihil.util;
 
 namespace {
 
diff --git a/nihil.posix/getenv.ccm b/nihil.posix/getenv.ccm
index f3490a2..bc7d841 100644
--- a/nihil.posix/getenv.ccm
+++ b/nihil.posix/getenv.ccm
@@ -9,7 +9,7 @@ module;
 export module nihil.posix:getenv;
 
 import nihil.std;
-import nihil.util;
+import nihil.core;
 
 namespace nihil {
 
diff --git a/nihil.posix/getenv.test.cc b/nihil.posix/getenv.test.cc
index 83c46dc..2c3d882 100644
--- a/nihil.posix/getenv.test.cc
+++ b/nihil.posix/getenv.test.cc
@@ -5,8 +5,8 @@
 #include <catch2/catch_test_macros.hpp>
 
 import nihil.std;
+import nihil.core;
 import nihil.posix;
-import nihil.util;
 
 namespace {
 TEST_CASE("getenv: existing value", "[getenv]")
diff --git a/nihil.posix/open.ccm b/nihil.posix/open.ccm
index a2fc9f4..c204633 100644
--- a/nihil.posix/open.ccm
+++ b/nihil.posix/open.ccm
@@ -7,7 +7,7 @@ module;
 export module nihil.posix:open;
 
 import nihil.std;
-import nihil.util;
+import nihil.core;
 import :fd;
 
 namespace nihil {
diff --git a/nihil.posix/open.test.cc b/nihil.posix/open.test.cc
index 932c03b..f530e6d 100644
--- a/nihil.posix/open.test.cc
+++ b/nihil.posix/open.test.cc
@@ -3,8 +3,8 @@
 #include <catch2/catch_test_macros.hpp>
 
 import nihil.std;
+import nihil.core;
 import nihil.posix;
-import nihil.util;
 
 namespace {
 
diff --git a/nihil.posix/open_in_path.ccm b/nihil.posix/open_in_path.ccm
index 577ab9d..beacefa 100644
--- a/nihil.posix/open_in_path.ccm
+++ b/nihil.posix/open_in_path.ccm
@@ -2,7 +2,8 @@
 export module nihil.posix:open_in_path;
 
 import nihil.std;
-import nihil.util;
+import nihil.core;
+
 import :fd;
 import :getenv;
 import :open;
diff --git a/nihil.posix/open_in_path.test.cc b/nihil.posix/open_in_path.test.cc
index ace8f1e..4bf0d7c 100644
--- a/nihil.posix/open_in_path.test.cc
+++ b/nihil.posix/open_in_path.test.cc
@@ -3,8 +3,8 @@
 #include <catch2/catch_test_macros.hpp>
 
 import nihil.std;
+import nihil.core;
 import nihil.posix;
-import nihil.util;
 
 namespace {
 
diff --git a/nihil.posix/process.ccm b/nihil.posix/process.ccm
index e990f62..98195b3 100644
--- a/nihil.posix/process.ccm
+++ b/nihil.posix/process.ccm
@@ -6,7 +6,7 @@ module;
 export module nihil.posix:process;
 
 import nihil.std;
-import nihil.util;
+import nihil.core;
 
 namespace nihil {
 
diff --git a/nihil.posix/read_file.ccm b/nihil.posix/read_file.ccm
index f7d06cb..0648b91 100644
--- a/nihil.posix/read_file.ccm
+++ b/nihil.posix/read_file.ccm
@@ -2,7 +2,8 @@
 export module nihil.posix:read_file;
 
 import nihil.std;
-import nihil.util;
+import nihil.core;
+
 import :fd;
 import :open;
 
diff --git a/nihil.posix/rename.ccm b/nihil.posix/rename.ccm
index 6b640b1..145fea3 100644
--- a/nihil.posix/rename.ccm
+++ b/nihil.posix/rename.ccm
@@ -2,7 +2,7 @@
 export module nihil.posix:rename;
 
 import nihil.std;
-import nihil.util;
+import nihil.core;
 
 namespace nihil {
 
diff --git a/nihil.posix/spawn.ccm b/nihil.posix/spawn.ccm
index ea84f4d..0945466 100644
--- a/nihil.posix/spawn.ccm
+++ b/nihil.posix/spawn.ccm
@@ -4,7 +4,8 @@ export module nihil.posix:spawn;
 // spawn(): fork and execute a child process.
 
 import nihil.std;
-import nihil.util;
+import nihil.core;
+
 import :argv;
 import :executor;
 import :fd;
diff --git a/nihil.posix/stat.ccm b/nihil.posix/stat.ccm
index ee8113b..ac19f97 100644
--- a/nihil.posix/stat.ccm
+++ b/nihil.posix/stat.ccm
@@ -8,7 +8,8 @@ module;
 export module nihil.posix:stat;
 
 import nihil.std;
-import nihil.util;
+import nihil.core;
+
 import :fd;
 
 namespace nihil {
diff --git a/nihil.posix/stat.test.cc b/nihil.posix/stat.test.cc
index cb199f6..4d6c658 100644
--- a/nihil.posix/stat.test.cc
+++ b/nihil.posix/stat.test.cc
@@ -1,8 +1,8 @@
 // This source code is released into the public domain.
 
 import nihil.std;
+import nihil.core;
 import nihil.posix;
-import nihil.util;
 
 #include <sys/stat.h>
 
diff --git a/nihil.posix/tempfile.ccm b/nihil.posix/tempfile.ccm
index 15edccb..892d12b 100644
--- a/nihil.posix/tempfile.ccm
+++ b/nihil.posix/tempfile.ccm
@@ -2,7 +2,8 @@
 export module nihil.posix:tempfile;
 
 import nihil.std;
-import nihil.util;
+import nihil.core;
+
 import :fd;
 import :getenv;
 import :open;
diff --git a/nihil.posix/unistd.ccm b/nihil.posix/unistd.ccm
index 65cd015..6f3b914 100644
--- a/nihil.posix/unistd.ccm
+++ b/nihil.posix/unistd.ccm
@@ -6,7 +6,7 @@ module;
 export module nihil.posix:unistd;
 
 import nihil.std;
-import nihil.util;
+import nihil.core;
 
 // Symbols from unistd.h that might be useful.
 
diff --git a/nihil.posix/unlink.ccm b/nihil.posix/unlink.ccm
index f2f5faa..6496d8f 100644
--- a/nihil.posix/unlink.ccm
+++ b/nihil.posix/unlink.ccm
@@ -8,7 +8,7 @@ export module nihil.posix:unlink;
 // unlink: simple wrapper around ::unlink()
 
 import nihil.std;
-import nihil.util;
+import nihil.core;
 
 namespace nihil {
 
diff --git a/nihil.posix/write_file.ccm b/nihil.posix/write_file.ccm
index 471ef85..9f26bb1 100644
--- a/nihil.posix/write_file.ccm
+++ b/nihil.posix/write_file.ccm
@@ -2,7 +2,8 @@
 export module nihil.posix:write_file;
 
 import nihil.std;
-import nihil.util;
+import nihil.core;
+
 import :fd;
 import :open;
 import :rename;