Arniiiii · Mar 24, 2026 · Mar 24, 2026 · Apr 16, 2026
diff --git a/nix/zug.nix b/nix/zug.nix
@@ -5,7 +5,7 @@
   cmake,
   ninja,
   boost,
-  catch2,
+  catch2_3,
   sources ? ../.,
   withTests ? false,
   withExamples ? false,

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -31,7 +31,6 @@ foreach(_file IN LISTS zug_unit_tests)
   add_executable(${_target} EXCLUDE_FROM_ALL "${_file}")
   set_target_properties(${_target} PROPERTIES OUTPUT_NAME ${_output})
   add_dependencies(tests ${_target})
-  target_compile_definitions(${_target} PUBLIC CATCH_CONFIG_MAIN)
-  target_link_libraries(${_target} PUBLIC zug-dev Catch2::Catch2)
+  target_link_libraries(${_target} PUBLIC zug-dev Catch2::Catch2WithMain)
   add_test("test/${_output}" ${_output})
 endforeach()
diff --git a/test/__inline_var_tests/CMakeLists.txt b/test/__inline_var_tests/CMakeLists.txt
@@ -7,5 +7,5 @@ message("adding unit test: inline_var_tests")
 file(GLOB_RECURSE inline_var_test_files "*.cpp")
 add_executable(inline_var_tests EXCLUDE_FROM_ALL ${inline_var_test_files})
 add_dependencies(tests inline_var_tests)
-target_link_libraries(inline_var_tests PUBLIC zug-dev)
+target_link_libraries(inline_var_tests PUBLIC zug-dev Catch2::Catch2WithMain)
 add_test("test/inline_var_tests" inline_var_tests)
diff --git a/test/__inline_var_tests/inline_var.cpp b/test/__inline_var_tests/inline_var.cpp
@@ -11,7 +11,7 @@
 
 #include <zug/detail/inline_constexpr.hpp>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 using namespace zug::detail;
 

diff --git a/test/__inline_var_tests/main.cpp b/test/__inline_var_tests/main.cpp
@@ -1,2 +1 @@
-#define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
diff --git a/test/compose.cpp b/test/compose.cpp
@@ -8,7 +8,7 @@
 
 #include <zug/compose.hpp>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <array>
 #include <functional>

diff --git a/test/into.cpp b/test/into.cpp
@@ -11,7 +11,7 @@
 #include <zug/transducer/filter.hpp>
 #include <zug/transducer/map.hpp>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 using namespace zug;
 

diff --git a/test/into_vector.cpp b/test/into_vector.cpp
@@ -12,7 +12,7 @@
 #include <zug/transducer/map.hpp>
 #include <zug/transducer/transducer.hpp>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 using namespace zug;
 

diff --git a/test/meta.cpp b/test/meta.cpp
@@ -9,7 +9,7 @@
 #include <zug/meta.hpp>
 #include <zug/util.hpp>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 using namespace zug;
 

diff --git a/test/reduce.cpp b/test/reduce.cpp
@@ -6,7 +6,7 @@
 // See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <zug/reduce.hpp>
 #include <zug/reducing/first.hpp>

diff --git a/test/reductor.cpp b/test/reductor.cpp
@@ -6,7 +6,7 @@
 // See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <zug/reducing/first.hpp>
 #include <zug/reducing/last.hpp>

diff --git a/test/run.cpp b/test/run.cpp
@@ -6,7 +6,7 @@
 // See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <zug/compose.hpp>
 #include <zug/run.hpp>

diff --git a/test/sequence.cpp b/test/sequence.cpp
@@ -6,7 +6,7 @@
 // See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <zug/compose.hpp>
 #include <zug/sequence.hpp>

diff --git a/test/state_traits.cpp b/test/state_traits.cpp
@@ -16,7 +16,7 @@
 #include <zug/transducer/transducer.hpp>
 #include <zug/util.hpp>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 using namespace zug;
 

diff --git a/test/transduce.cpp b/test/transduce.cpp
@@ -11,7 +11,7 @@
 #include <zug/transducer/take.hpp>
 #include <zug/util.hpp>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <vector>
 

diff --git a/test/transducer/cat.cpp b/test/transducer/cat.cpp
@@ -6,7 +6,7 @@
 // See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <zug/into_vector.hpp>
 #include <zug/transducer/cat.hpp>

diff --git a/test/transducer/chain.cpp b/test/transducer/chain.cpp
@@ -6,7 +6,7 @@
 // See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <zug/into_vector.hpp>
 #include <zug/transducer/chain.hpp>

diff --git a/test/transducer/count.cpp b/test/transducer/count.cpp
@@ -6,7 +6,7 @@
 // See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <zug/compose.hpp>
 #include <zug/into_vector.hpp>

diff --git a/test/transducer/cycle.cpp b/test/transducer/cycle.cpp
@@ -6,7 +6,7 @@
 // See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <zug/compose.hpp>
 #include <zug/into_vector.hpp>

diff --git a/test/transducer/dedupe.cpp b/test/transducer/dedupe.cpp
@@ -6,7 +6,7 @@
 // See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <zug/compose.hpp>
 #include <zug/into_vector.hpp>

diff --git a/test/transducer/distinct.cpp b/test/transducer/distinct.cpp
@@ -6,7 +6,7 @@
 // See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <zug/compose.hpp>
 #include <zug/into_vector.hpp>

diff --git a/test/transducer/drop.cpp b/test/transducer/drop.cpp
@@ -6,7 +6,7 @@
 // See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <zug/compose.hpp>
 #include <zug/into_vector.hpp>

diff --git a/test/transducer/drop_while.cpp b/test/transducer/drop_while.cpp
@@ -6,7 +6,7 @@
 // See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <zug/compose.hpp>
 #include <zug/into_vector.hpp>

diff --git a/test/transducer/each.cpp b/test/transducer/each.cpp
@@ -6,7 +6,7 @@
 // See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <zug/into_vector.hpp>
 #include <zug/transducer/each.hpp>

diff --git a/test/transducer/eager.cpp b/test/transducer/eager.cpp
@@ -6,7 +6,7 @@
 // See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <zug/compose.hpp>
 #include <zug/into_vector.hpp>

diff --git a/test/transducer/enumerate.cpp b/test/transducer/enumerate.cpp
@@ -6,7 +6,7 @@
 // See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <zug/into_vector.hpp>
 #include <zug/transducer/enumerate.hpp>

diff --git a/test/transducer/filter.cpp b/test/transducer/filter.cpp
@@ -6,7 +6,7 @@
 // See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <zug/compose.hpp>
 #include <zug/into_vector.hpp>

diff --git a/test/transducer/interelave.cpp b/test/transducer/interelave.cpp
@@ -6,7 +6,7 @@
 // See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <zug/compose.hpp>
 #include <zug/into_vector.hpp>

diff --git a/test/transducer/interleave.cpp b/test/transducer/interleave.cpp
@@ -6,7 +6,7 @@
 // See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <zug/into_vector.hpp>
 #include <zug/transducer/interleave.hpp>

diff --git a/test/transducer/interpose.cpp b/test/transducer/interpose.cpp
@@ -6,7 +6,7 @@
 // See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <zug/compose.hpp>
 #include <zug/into_vector.hpp>

diff --git a/test/transducer/iter.cpp b/test/transducer/iter.cpp
@@ -6,7 +6,7 @@
 // See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <zug/into_vector.hpp>
 #include <zug/transducer/iter.hpp>

diff --git a/test/transducer/map.cpp b/test/transducer/map.cpp
@@ -12,7 +12,7 @@
 #include <zug/transducer/map.hpp>
 #include <zug/transducer/take.hpp>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 using namespace zug;
 

diff --git a/test/transducer/map_indexed.cpp b/test/transducer/map_indexed.cpp
@@ -6,7 +6,7 @@
 // See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <zug/transduce.hpp>
 #include <zug/transducer/map_indexed.hpp>

diff --git a/test/transducer/mapcat.cpp b/test/transducer/mapcat.cpp
@@ -6,7 +6,7 @@
 // See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <zug/into_vector.hpp>
 #include <zug/transducer/mapcat.hpp>

diff --git a/test/transducer/partition.cpp b/test/transducer/partition.cpp
@@ -6,7 +6,7 @@
 // See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <zug/into.hpp>
 #include <zug/into_vector.hpp>

diff --git a/test/transducer/partition_by.cpp b/test/transducer/partition_by.cpp
@@ -6,7 +6,7 @@
 // See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <zug/compose.hpp>
 #include <zug/into_vector.hpp>

diff --git a/test/transducer/product.cpp b/test/transducer/product.cpp
@@ -6,7 +6,7 @@
 // See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <zug/compose.hpp>
 #include <zug/into_vector.hpp>

diff --git a/test/transducer/random_sample.cpp b/test/transducer/random_sample.cpp
@@ -6,7 +6,7 @@
 // See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <cstdint>
 #include <limits>

diff --git a/test/transducer/range.cpp b/test/transducer/range.cpp
@@ -6,7 +6,8 @@
 // See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
 
 #include <zug/into_vector.hpp>
 #include <zug/reducing/last.hpp>

diff --git a/test/transducer/read.cpp b/test/transducer/read.cpp
@@ -6,7 +6,7 @@
 // See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <zug/into_vector.hpp>
 #include <zug/transducer/read.hpp>

diff --git a/test/transducer/readbuf.cpp b/test/transducer/readbuf.cpp
@@ -6,7 +6,7 @@
 // See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <zug/compose.hpp>
 #include <zug/into_vector.hpp>

diff --git a/test/transducer/remove.cpp b/test/transducer/remove.cpp
@@ -6,7 +6,7 @@
 // See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <zug/compose.hpp>
 #include <zug/transduce.hpp>

diff --git a/test/transducer/repeat.cpp b/test/transducer/repeat.cpp
@@ -6,7 +6,7 @@
 // See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <zug/compose.hpp>
 #include <zug/into_vector.hpp>

diff --git a/test/transducer/replace.cpp b/test/transducer/replace.cpp
@@ -6,7 +6,7 @@
 // See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <zug/into_vector.hpp>
 #include <zug/transduce.hpp>

diff --git a/test/transducer/scan.cpp b/test/transducer/scan.cpp
@@ -6,7 +6,7 @@
 // See accompanying file LICENSE or copy at http://boost.org/LICENSE_1_0.txt
 //
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #include <zug/into_vector.hpp>
 #include <zug/transducer/count.hpp>