26 files changed, 15 insertions, 32 deletions
diff --git a/nihil.posix/CMakeLists.txt b/nihil.posix/CMakeLists.txt
index a4c174b..3fcf625 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.error
 	nihil.util
 )
 
@@ -59,7 +58,6 @@ if(NIHIL_TESTS)
 
 	target_link_libraries(nihil.posix.test PRIVATE
 		nihil.std
-		nihil.error
 		nihil.posix
 		nihil.util
 		Catch2::Catch2WithMain
diff --git a/nihil.posix/ensure_dir.ccm b/nihil.posix/ensure_dir.ccm
index 8d3e7a8..9ae6d80 100644
--- a/nihil.posix/ensure_dir.ccm
+++ b/nihil.posix/ensure_dir.ccm
@@ -2,13 +2,11 @@
 export module nihil.posix:ensure_dir;
 
 import nihil.std;
-import nihil.error;
+import nihil.util;
 
 namespace nihil {
 
-/*
- * Create the given directory and any parent directories.
- */
+// Create the given directory and any parent directories.
 export [[nodiscard]] auto
 ensure_dir(std::filesystem::path const &dir) -> std::expected<void, error>
 {
diff --git a/nihil.posix/execl.ccm b/nihil.posix/execl.ccm
index 99b9169..e6b809c 100644
--- a/nihil.posix/execl.ccm
+++ b/nihil.posix/execl.ccm
@@ -2,7 +2,6 @@
 export module nihil.posix:execl;
 
 import nihil.std;
-import nihil.error;
 import :argv;
 import :execv;
 import :fd;
diff --git a/nihil.posix/execlp.ccm b/nihil.posix/execlp.ccm
index 12f2c24..ba80504 100644
--- a/nihil.posix/execlp.ccm
+++ b/nihil.posix/execlp.ccm
@@ -2,7 +2,7 @@
 export module nihil.posix:execlp;
 
 import nihil.std;
-import nihil.error;
+import nihil.util;
 import :argv;
 import :execvp;
 
diff --git a/nihil.posix/execshell.ccm b/nihil.posix/execshell.ccm
index e0263e5..9e640c3 100644
--- a/nihil.posix/execshell.ccm
+++ b/nihil.posix/execshell.ccm
@@ -2,7 +2,6 @@
 export module nihil.posix:execshell;
 
 import nihil.std;
-import nihil.error;
 import :execv;
 import :execl;
 
diff --git a/nihil.posix/execv.ccm b/nihil.posix/execv.ccm
index 3bf5745..2a77326 100644
--- a/nihil.posix/execv.ccm
+++ b/nihil.posix/execv.ccm
@@ -10,8 +10,6 @@ extern char **environ; // NOLINT
 export module nihil.posix:execv;
 
 import nihil.std;
-import nihil.error;
-import nihil.match;
 import nihil.util;
 import :argv;
 import :executor;
diff --git a/nihil.posix/execvp.ccm b/nihil.posix/execvp.ccm
index 5b11e7a..0a0106d 100644
--- a/nihil.posix/execvp.ccm
+++ b/nihil.posix/execvp.ccm
@@ -3,7 +3,6 @@ export module nihil.posix:execvp;
 
 import nihil.std;
 import nihil.core;
-import nihil.error;
 import nihil.util;
 import :argv;
 import :execv;
diff --git a/nihil.posix/fd.ccm b/nihil.posix/fd.ccm
index c00676d..1de343b 100644
--- a/nihil.posix/fd.ccm
+++ b/nihil.posix/fd.ccm
@@ -7,7 +7,6 @@ module;
 export module nihil.posix:fd;
 
 import nihil.std;
-import nihil.error;
 import nihil.util;
 
 namespace nihil {
diff --git a/nihil.posix/fd.test.cc b/nihil.posix/fd.test.cc
index 65b2ad3..a0828e5 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.error;
 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 dabe358..353750b 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.error;
+import nihil.util;
 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 b2f6240..65cbe87 100644
--- a/nihil.posix/find_in_path.test.cc
+++ b/nihil.posix/find_in_path.test.cc
@@ -2,8 +2,9 @@
 
 #include <catch2/catch_test_macros.hpp>
 
-import nihil.error;
+import nihil.std;
 import nihil.posix;
+import nihil.util;
 
 namespace {
 
diff --git a/nihil.posix/getenv.ccm b/nihil.posix/getenv.ccm
index ddffeb3..f3490a2 100644
--- a/nihil.posix/getenv.ccm
+++ b/nihil.posix/getenv.ccm
@@ -9,7 +9,6 @@ module;
 export module nihil.posix:getenv;
 
 import nihil.std;
-import nihil.error;
 import nihil.util;
 
 namespace nihil {
diff --git a/nihil.posix/getenv.test.cc b/nihil.posix/getenv.test.cc
index 3ba1d94..83c46dc 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.error;
 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 ab3d6e1..a2fc9f4 100644
--- a/nihil.posix/open.ccm
+++ b/nihil.posix/open.ccm
@@ -7,7 +7,6 @@ module;
 export module nihil.posix:open;
 
 import nihil.std;
-import nihil.error;
 import nihil.util;
 import :fd;
 
diff --git a/nihil.posix/open.test.cc b/nihil.posix/open.test.cc
index e49f4c4..932c03b 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.error;
 import nihil.posix;
+import nihil.util;
 
 namespace {
 
diff --git a/nihil.posix/open_in_path.ccm b/nihil.posix/open_in_path.ccm
index 0733c8d..577ab9d 100644
--- a/nihil.posix/open_in_path.ccm
+++ b/nihil.posix/open_in_path.ccm
@@ -2,7 +2,7 @@
 export module nihil.posix:open_in_path;
 
 import nihil.std;
-import nihil.error;
+import nihil.util;
 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 ebd1405..ace8f1e 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.error;
 import nihil.posix;
+import nihil.util;
 
 namespace {
 
diff --git a/nihil.posix/posix.ccm b/nihil.posix/posix.ccm
index c80724d..a6c675b 100644
--- a/nihil.posix/posix.ccm
+++ b/nihil.posix/posix.ccm
@@ -3,8 +3,6 @@ module;
 
 export module nihil.posix;
 
-import nihil.error;
-
 export import :argv;
 export import :ensure_dir;
 export import :execl;
diff --git a/nihil.posix/process.ccm b/nihil.posix/process.ccm
index 9fbf34c..e990f62 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.error;
+import nihil.util;
 
 namespace nihil {
 
diff --git a/nihil.posix/read_file.ccm b/nihil.posix/read_file.ccm
index 337d0e4..f7d06cb 100644
--- a/nihil.posix/read_file.ccm
+++ b/nihil.posix/read_file.ccm
@@ -1,7 +1,7 @@
 // This source code is released into the public domain.
 export module nihil.posix:read_file;
 
-import nihil.error;
+import nihil.std;
 import nihil.util;
 import :fd;
 import :open;
diff --git a/nihil.posix/rename.ccm b/nihil.posix/rename.ccm
index c46005e..6b640b1 100644
--- a/nihil.posix/rename.ccm
+++ b/nihil.posix/rename.ccm
@@ -2,7 +2,6 @@
 export module nihil.posix:rename;
 
 import nihil.std;
-import nihil.error;
 import nihil.util;
 
 namespace nihil {
diff --git a/nihil.posix/stat.test.cc b/nihil.posix/stat.test.cc
index 535273b..cb199f6 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.error;
 import nihil.posix;
+import nihil.util;
 
 #include <sys/stat.h>
 
diff --git a/nihil.posix/tempfile.ccm b/nihil.posix/tempfile.ccm
index a4d3756..15edccb 100644
--- a/nihil.posix/tempfile.ccm
+++ b/nihil.posix/tempfile.ccm
@@ -2,7 +2,6 @@
 export module nihil.posix:tempfile;
 
 import nihil.std;
-import nihil.error;
 import nihil.util;
 import :fd;
 import :getenv;
diff --git a/nihil.posix/unistd.ccm b/nihil.posix/unistd.ccm
index 14c19ee..65cd015 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.error;
+import nihil.util;
 
 // Symbols from unistd.h that might be useful.
 
diff --git a/nihil.posix/unlink.ccm b/nihil.posix/unlink.ccm
index d6c47cd..f2f5faa 100644
--- a/nihil.posix/unlink.ccm
+++ b/nihil.posix/unlink.ccm
@@ -8,7 +8,6 @@ export module nihil.posix:unlink;
 // unlink: simple wrapper around ::unlink()
 
 import nihil.std;
-import nihil.error;
 import nihil.util;
 
 namespace nihil {
diff --git a/nihil.posix/write_file.ccm b/nihil.posix/write_file.ccm
index e706274..471ef85 100644
--- a/nihil.posix/write_file.ccm
+++ b/nihil.posix/write_file.ccm
@@ -2,7 +2,6 @@
 export module nihil.posix:write_file;
 
 import nihil.std;
-import nihil.error;
 import nihil.util;
 import :fd;
 import :open;