add nihil.std

3 files changed, 6 insertions, 18 deletions

diff --git a/nihil.monad/CMakeLists.txt b/nihil.monad/CMakeLists.txt
index c293d40..f82e464 100644
--- a/nihil.monad/CMakeLists.txt
+++ b/nihil.monad/CMakeLists.txt
@@ -1,7 +1,7 @@
 # This source code is released into the public domain.
 
 add_library(nihil.monad STATIC)
-target_link_libraries(nihil.monad PRIVATE nihil.error)
+target_link_libraries(nihil.monad PRIVATE nihil.std nihil.error)
 target_sources(nihil.monad
 	PUBLIC FILE_SET modules TYPE CXX_MODULES FILES
 	monad.ccm
diff --git a/nihil.monad/monad.ccm b/nihil.monad/monad.ccm
index 898f1ee..cd17e0f 100644
--- a/nihil.monad/monad.ccm
+++ b/nihil.monad/monad.ccm
@@ -22,16 +22,10 @@
  * IN THE SOFTWARE.
  */
 
-module;
-
-#include <coroutine>
-#include <exception>
-#include <expected>
-#include <optional>
-#include <utility>
-
 export module nihil.monad;
 
+import nihil.std;
+
 namespace nihil {
 
 /**********************************************************************
@@ -228,8 +222,7 @@ struct expected_promise<void, E> : expected_promise_base<void, E> {
 		self.data->emplace(std::move(err));
 	}
 
-	void return_value(this expected_promise &self,
-			  std::expected<void, E> o)
+	void return_value(this expected_promise &self, std::expected<void, E> o)
 	{
 		self.data->emplace(std::move(o));
 	}
diff --git a/nihil.monad/test.cc b/nihil.monad/test.cc
index 347acdb..2cc743c 100644
--- a/nihil.monad/test.cc
+++ b/nihil.monad/test.cc
@@ -1,13 +1,8 @@
-/*
- * This source code is released into the public domain.
- */
-
-#include <coroutine>
-#include <expected>
-#include <optional>
+// This source code is released into the public domain.
 
 #include <catch2/catch_test_macros.hpp>
 
+import nihil.std;
 import nihil.error;
 import nihil.monad;