diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | nihil.error/error.ccm | 6 | ||||
| -rw-r--r-- | nihil.guard/CMakeLists.txt | 22 | ||||
| -rw-r--r-- | nihil.posix/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | nihil.posix/write_file.ccm | 2 | ||||
| -rw-r--r-- | nihil.util/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | nihil.util/guard.ccm (renamed from nihil.guard/guard.ccm) | 2 | ||||
| -rw-r--r-- | nihil.util/guard.test.cc (renamed from nihil.guard/test.cc) | 2 | ||||
| -rw-r--r-- | nihil.util/nihil.util.ccm | 1 |
9 files changed, 9 insertions, 30 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a2c9187..bd684ef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,7 +67,6 @@ add_subdirectory(nihil.core) add_subdirectory(nihil.error) add_subdirectory(nihil.flagset) add_subdirectory(nihil.generator) -add_subdirectory(nihil.guard) add_subdirectory(nihil.match) add_subdirectory(nihil.monad) add_subdirectory(nihil.posix) diff --git a/nihil.error/error.ccm b/nihil.error/error.ccm index b821e0a..2d5166a 100644 --- a/nihil.error/error.ccm +++ b/nihil.error/error.ccm @@ -46,7 +46,7 @@ export struct error_proxy // ... an std::string; so we can move the string into place if it's an rvalue. error_proxy(auto &&what) // NOLINT - requires (std::same_as<std::remove_cvref_t<decltype(what)>, std::string>) + requires(std::same_as<std::remove_cvref_t<decltype(what)>, std::string>) : m_error(std::forward<decltype(what)>(what)) { } @@ -222,8 +222,8 @@ export struct error : std::exception return m_what->c_str(); } - // Allow error to be implicitly converted to std::expected and std::unexpected, to make using it - // with std::expected easier. + // Allow error to be implicitly converted to std::expected and std::unexpected, to make + // using it with std::expected easier. template<typename T> operator std::expected<T, error> () && // NOLINT diff --git a/nihil.guard/CMakeLists.txt b/nihil.guard/CMakeLists.txt deleted file mode 100644 index a5e0fc2..0000000 --- a/nihil.guard/CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -# This source code is released into the public domain. - -add_library(nihil.guard STATIC) -target_link_libraries(nihil.guard PRIVATE nihil.std) -target_sources(nihil.guard - PUBLIC FILE_SET modules TYPE CXX_MODULES FILES - guard.ccm -) - -if(NIHIL_TESTS) - enable_testing() - - add_executable(nihil.guard.test test.cc) - target_link_libraries(nihil.guard.test PRIVATE - nihil.guard - Catch2::Catch2WithMain - ) - - include(CTest) - include(Catch) - catch_discover_tests(nihil.guard.test) -endif() diff --git a/nihil.posix/CMakeLists.txt b/nihil.posix/CMakeLists.txt index 25f13f1..7ce4d13 100644 --- a/nihil.posix/CMakeLists.txt +++ b/nihil.posix/CMakeLists.txt @@ -6,7 +6,6 @@ target_link_libraries(nihil.posix PRIVATE nihil.core nihil.error nihil.flagset - nihil.guard nihil.monad nihil.util ) diff --git a/nihil.posix/write_file.ccm b/nihil.posix/write_file.ccm index 4bdd6e2..ad1129f 100644 --- a/nihil.posix/write_file.ccm +++ b/nihil.posix/write_file.ccm @@ -3,8 +3,8 @@ export module nihil.posix:write_file; import nihil.std; import nihil.error; -import nihil.guard; import nihil.monad; +import nihil.util; import :fd; import :open; import :rename; diff --git a/nihil.util/CMakeLists.txt b/nihil.util/CMakeLists.txt index 2fb5111..5d6be7c 100644 --- a/nihil.util/CMakeLists.txt +++ b/nihil.util/CMakeLists.txt @@ -14,6 +14,7 @@ target_sources(nihil.util capture_stream.ccm construct.ccm ctype.ccm + guard.ccm parse_size.ccm next_word.ccm save_errno.ccm @@ -27,6 +28,7 @@ if(NIHIL_TESTS) add_executable(nihil.util.test capture_stream.test.cc ctype.test.cc + guard.test.cc parse_size.test.cc next_word.test.cc skipws.test.cc diff --git a/nihil.guard/guard.ccm b/nihil.util/guard.ccm index fdda45c..77394fc 100644 --- a/nihil.guard/guard.ccm +++ b/nihil.util/guard.ccm @@ -1,5 +1,5 @@ // This source code is released into the public domain. -export module nihil.guard; +export module nihil.util:guard; import nihil.std; diff --git a/nihil.guard/test.cc b/nihil.util/guard.test.cc index f1b3f21..2c3ac2f 100644 --- a/nihil.guard/test.cc +++ b/nihil.util/guard.test.cc @@ -2,7 +2,7 @@ #include <catch2/catch_test_macros.hpp> -import nihil.guard; +import nihil.util; TEST_CASE("guard: basic", "[guard]") { int n = 0; diff --git a/nihil.util/nihil.util.ccm b/nihil.util/nihil.util.ccm index 132978e..1911ced 100644 --- a/nihil.util/nihil.util.ccm +++ b/nihil.util/nihil.util.ccm @@ -4,6 +4,7 @@ export module nihil.util; export import :capture_stream; export import :construct; export import :ctype; +export import :guard; export import :parse_size; export import :next_word; export import :save_errno; |