diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | nihil.error/error.ccm | 2 | ||||
| -rw-r--r-- | nihil.flagset/CMakeLists.txt | 22 | ||||
| -rw-r--r-- | nihil.posix/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | nihil.posix/fd.ccm | 2 | ||||
| -rw-r--r-- | nihil.posix/open.ccm | 1 | ||||
| -rw-r--r-- | nihil.posix/tempfile.ccm | 2 | ||||
| -rw-r--r-- | nihil.util/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | nihil.util/flagset.ccm (renamed from nihil.flagset/flagset.ccm) | 2 | ||||
| -rw-r--r-- | nihil.util/flagset.test.cc (renamed from nihil.flagset/test.cc) | 2 | ||||
| -rw-r--r-- | nihil.util/nihil.util.ccm | 1 |
11 files changed, 8 insertions, 30 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bd684ef..8c02a3e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,7 +65,6 @@ add_subdirectory(nihil.std) add_subdirectory(nihil.cli) add_subdirectory(nihil.core) add_subdirectory(nihil.error) -add_subdirectory(nihil.flagset) add_subdirectory(nihil.generator) add_subdirectory(nihil.match) add_subdirectory(nihil.monad) diff --git a/nihil.error/error.ccm b/nihil.error/error.ccm index 2d5166a..833f7f1 100644 --- a/nihil.error/error.ccm +++ b/nihil.error/error.ccm @@ -225,7 +225,7 @@ export struct error : std::exception // Allow error to be implicitly converted to std::expected and std::unexpected, to make // using it with std::expected easier. - template<typename T> + template <typename T> operator std::expected<T, error> () && // NOLINT { return std::unexpected{std::move(*this)}; diff --git a/nihil.flagset/CMakeLists.txt b/nihil.flagset/CMakeLists.txt deleted file mode 100644 index 40d106e..0000000 --- a/nihil.flagset/CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -# This source code is released into the public domain. - -add_library(nihil.flagset STATIC) -target_link_libraries(nihil.flagset PRIVATE nihil.std) -target_sources(nihil.flagset - PUBLIC FILE_SET modules TYPE CXX_MODULES FILES - flagset.ccm -) - -if(NIHIL_TESTS) - enable_testing() - - add_executable(nihil.flagset.test test.cc) - target_link_libraries(nihil.flagset.test PRIVATE - nihil.flagset - Catch2::Catch2WithMain - ) - - include(CTest) - include(Catch) - catch_discover_tests(nihil.flagset.test) -endif() diff --git a/nihil.posix/CMakeLists.txt b/nihil.posix/CMakeLists.txt index 7ce4d13..c4a3556 100644 --- a/nihil.posix/CMakeLists.txt +++ b/nihil.posix/CMakeLists.txt @@ -5,7 +5,6 @@ target_link_libraries(nihil.posix PRIVATE nihil.std nihil.core nihil.error - nihil.flagset nihil.monad nihil.util ) diff --git a/nihil.posix/fd.ccm b/nihil.posix/fd.ccm index 8210b6d..40bfb0a 100644 --- a/nihil.posix/fd.ccm +++ b/nihil.posix/fd.ccm @@ -7,9 +7,9 @@ module; export module nihil.posix:fd; import nihil.std; -import nihil.flagset; import nihil.error; import nihil.monad; +import nihil.util; namespace nihil { diff --git a/nihil.posix/open.ccm b/nihil.posix/open.ccm index a5a9e5d..ab3d6e1 100644 --- a/nihil.posix/open.ccm +++ b/nihil.posix/open.ccm @@ -8,7 +8,6 @@ export module nihil.posix:open; import nihil.std; import nihil.error; -import nihil.flagset; import nihil.util; import :fd; diff --git a/nihil.posix/tempfile.ccm b/nihil.posix/tempfile.ccm index 121c636..a4d3756 100644 --- a/nihil.posix/tempfile.ccm +++ b/nihil.posix/tempfile.ccm @@ -3,7 +3,7 @@ export module nihil.posix:tempfile; import nihil.std; import nihil.error; -import nihil.flagset; +import nihil.util; import :fd; import :getenv; import :open; diff --git a/nihil.util/CMakeLists.txt b/nihil.util/CMakeLists.txt index 5d6be7c..2755103 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 + flagset.ccm guard.ccm parse_size.ccm next_word.ccm @@ -28,6 +29,7 @@ if(NIHIL_TESTS) add_executable(nihil.util.test capture_stream.test.cc ctype.test.cc + flagset.test.cc guard.test.cc parse_size.test.cc next_word.test.cc diff --git a/nihil.flagset/flagset.ccm b/nihil.util/flagset.ccm index 796a2c2..4c42223 100644 --- a/nihil.flagset/flagset.ccm +++ b/nihil.util/flagset.ccm @@ -1,5 +1,5 @@ // This source code is released into the public domain. -export module nihil.flagset; +export module nihil.util:flagset; /* * flagset: a type-safe flags type. diff --git a/nihil.flagset/test.cc b/nihil.util/flagset.test.cc index 90eef4a..85cd0d3 100644 --- a/nihil.flagset/test.cc +++ b/nihil.util/flagset.test.cc @@ -3,7 +3,7 @@ #include <catch2/catch_test_macros.hpp> import nihil.std; -import nihil.flagset; +import nihil.util; namespace { struct test_tag diff --git a/nihil.util/nihil.util.ccm b/nihil.util/nihil.util.ccm index 1911ced..6b4bc30 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 :flagset; export import :guard; export import :parse_size; export import :next_word; |