Update to snitch

cschreib · cschreib · commit 2ef943f863cf · 2022-12-27T16:42:32.000Z
diff --git a/oup.sublime-project b/oup.sublime-project
@@ -70,8 +70,8 @@
 					"shell_cmd": "make -j12 oup_speed_benchmark",
 				},
 				{
-					"name": "snatch",
-					"shell_cmd": "make -j12 snatch",
+					"name": "snitch",
+					"shell_cmd": "make -j12 snitch",
 				},
 			],
 			"working_dir": "$folder/build",
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -31,10 +31,10 @@ endfunction()
 
 include(FetchContent)
 
-FetchContent_Declare(snatch
-                     GIT_REPOSITORY https://github.com/cschreib/snatch.git
-                     GIT_TAG        13c39e2cff643a8ce6672f02531a1f2f89ffafd2)
-FetchContent_MakeAvailable(snatch)
+FetchContent_Declare(snitch
+                     GIT_REPOSITORY https://github.com/cschreib/snitch.git
+                     GIT_TAG        08ac40f24b4ddaf6e9b205374af8d79313fa7eeb)
+FetchContent_MakeAvailable(snitch)
 
 set(RUNTIME_TEST_FILES
   ${PROJECT_SOURCE_DIR}/tests/tests_common.cpp
@@ -61,7 +61,7 @@ set(RUNTIME_TEST_FILES
 
 add_executable(oup_runtime_tests ${RUNTIME_TEST_FILES})
 target_link_libraries(oup_runtime_tests PRIVATE oup::oup)
-target_link_libraries(oup_runtime_tests PRIVATE snatch::snatch)
+target_link_libraries(oup_runtime_tests PRIVATE snitch::snitch)
 add_platform_definitions(oup_runtime_tests)
 
 add_custom_target(oup_runtime_tests_run
diff --git a/tests/runtime_tests_lifetime.cpp b/tests/runtime_tests_lifetime.cpp
@@ -1,6 +1,5 @@
 #include "memory_tracker.hpp"
 #include "testing.hpp"
-#include "tests_common.hpp"
 
 #include <algorithm>
 #include <vector>
diff --git a/tests/runtime_tests_make_observable.cpp b/tests/runtime_tests_make_observable.cpp
@@ -1,6 +1,5 @@
 #include "memory_tracker.hpp"
 #include "testing.hpp"
-#include "tests_common.hpp"
 
 TEMPLATE_LIST_TEST_CASE("make observable", "[make_observable][owner]", owner_types) {
     if constexpr (can_use_make_observable<TestType>) {
diff --git a/tests/runtime_tests_observer_assignment_copy.cpp b/tests/runtime_tests_observer_assignment_copy.cpp
@@ -1,6 +1,5 @@
 #include "memory_tracker.hpp"
 #include "testing.hpp"
-#include "tests_common.hpp"
 
 TEMPLATE_LIST_TEST_CASE(
     "observer copy assignment operator valid to empty", "[assignment][observer]", owner_types) {
@@ -217,10 +216,10 @@ TEMPLATE_LIST_TEST_CASE(
     {
         TestType               ptr = make_pointer_deleter_1<TestType>();
         observer_ptr<TestType> optr{ptr};
-        SNATCH_WARNING_PUSH;
-        SNATCH_WARNING_DISABLE_SELF_ASSIGN;
+        SNITCH_WARNING_PUSH;
+        SNITCH_WARNING_DISABLE_SELF_ASSIGN;
         optr = optr;
-        SNATCH_WARNING_POP;
+        SNITCH_WARNING_POP;
 
         CHECK(optr.get() == ptr.get());
         CHECK(optr.expired() == false);
@@ -236,10 +235,10 @@ TEMPLATE_LIST_TEST_CASE(
 
     {
         observer_ptr<TestType> optr;
-        SNATCH_WARNING_PUSH;
-        SNATCH_WARNING_DISABLE_SELF_ASSIGN;
+        SNITCH_WARNING_PUSH;
+        SNITCH_WARNING_DISABLE_SELF_ASSIGN;
         optr = optr;
-        SNATCH_WARNING_POP;
+        SNITCH_WARNING_POP;
 
         CHECK(optr.get() == nullptr);
         CHECK(optr.expired() == true);
diff --git a/tests/runtime_tests_observer_assignment_from_owner.cpp b/tests/runtime_tests_observer_assignment_from_owner.cpp
@@ -1,6 +1,5 @@
 #include "memory_tracker.hpp"
 #include "testing.hpp"
-#include "tests_common.hpp"
 
 TEMPLATE_LIST_TEST_CASE(
     "observer from owner assignment operator valid to empty",
diff --git a/tests/runtime_tests_observer_assignment_move.cpp b/tests/runtime_tests_observer_assignment_move.cpp
@@ -1,6 +1,5 @@
 #include "memory_tracker.hpp"
 #include "testing.hpp"
-#include "tests_common.hpp"
 
 TEMPLATE_LIST_TEST_CASE(
     "observer move assignment operator valid to empty", "[assignment][observer]", owner_types) {
diff --git a/tests/runtime_tests_observer_cast_copy.cpp b/tests/runtime_tests_observer_cast_copy.cpp
@@ -1,6 +1,5 @@
 #include "memory_tracker.hpp"
 #include "testing.hpp"
-#include "tests_common.hpp"
 
 TEMPLATE_LIST_TEST_CASE("observer static_cast copy from valid", "[cast][observer]", owner_types) {
     volatile memory_tracker mem_track;
@@ -16,7 +15,7 @@ TEMPLATE_LIST_TEST_CASE("observer static_cast copy from valid", "[cast][observer
 
             CHECK(optr1.get() == raw_ptr);
             CHECK(optr2.get() == raw_ptr);
-            CHECK(snatch::type_name<return_type> == snatch::type_name<expected_return_type>);
+            CHECK(snitch::type_name<return_type> == snitch::type_name<expected_return_type>);
             CHECK_INSTANCES(1, 1);
         };
 
@@ -43,7 +42,7 @@ TEMPLATE_LIST_TEST_CASE("observer static_cast copy from empty", "[cast][observer
 
             CHECK(optr1.get() == nullptr);
             CHECK(optr2.get() == nullptr);
-            CHECK(snatch::type_name<return_type> == snatch::type_name<expected_return_type>);
+            CHECK(snitch::type_name<return_type> == snitch::type_name<expected_return_type>);
             CHECK_INSTANCES(0, 1);
         };
 
@@ -71,7 +70,7 @@ TEMPLATE_LIST_TEST_CASE("observer const_cast copy from valid", "[cast][observer]
 
             CHECK(optr1.get() == raw_ptr);
             CHECK(optr2.get() == raw_ptr);
-            CHECK(snatch::type_name<return_type> == snatch::type_name<expected_return_type>);
+            CHECK(snitch::type_name<return_type> == snitch::type_name<expected_return_type>);
             CHECK_INSTANCES(1, 1);
         };
 
@@ -96,7 +95,7 @@ TEMPLATE_LIST_TEST_CASE("observer const_cast copy from empty", "[cast][observer]
 
             CHECK(optr1.get() == nullptr);
             CHECK(optr2.get() == nullptr);
-            CHECK(snatch::type_name<return_type> == snatch::type_name<expected_return_type>);
+            CHECK(snitch::type_name<return_type> == snitch::type_name<expected_return_type>);
             CHECK_INSTANCES(0, 1);
         };
 
@@ -123,7 +122,7 @@ TEMPLATE_LIST_TEST_CASE("observer dynamic_cast copy from valid", "[cast][observe
 
                 CHECK(optr1.get() == raw_ptr);
                 CHECK(optr2.get() == raw_ptr);
-                CHECK(snatch::type_name<return_type> == snatch::type_name<expected_return_type>);
+                CHECK(snitch::type_name<return_type> == snitch::type_name<expected_return_type>);
                 CHECK_INSTANCES(1, 1);
             };
 
@@ -155,7 +154,7 @@ TEMPLATE_LIST_TEST_CASE("observer dynamic_cast copy from empty", "[cast][observe
 
                 CHECK(optr1.get() == nullptr);
                 CHECK(optr2.get() == nullptr);
-                CHECK(snatch::type_name<return_type> == snatch::type_name<expected_return_type>);
+                CHECK(snitch::type_name<return_type> == snitch::type_name<expected_return_type>);
                 CHECK_INSTANCES(0, 1);
             };
 
@@ -190,7 +189,7 @@ TEMPLATE_LIST_TEST_CASE(
 
             CHECK(optr1.get() == raw_ptr);
             CHECK(optr2.get() == nullptr);
-            CHECK(snatch::type_name<return_type> == snatch::type_name<expected_return_type>);
+            CHECK(snitch::type_name<return_type> == snitch::type_name<expected_return_type>);
             CHECK_INSTANCES(1, 1);
         }
 
diff --git a/tests/runtime_tests_observer_cast_move.cpp b/tests/runtime_tests_observer_cast_move.cpp
@@ -1,6 +1,5 @@
 #include "memory_tracker.hpp"
 #include "testing.hpp"
-#include "tests_common.hpp"
 
 TEMPLATE_LIST_TEST_CASE("observer static_cast move from valid", "[cast][observer]", owner_types) {
     volatile memory_tracker mem_track;
@@ -16,7 +15,7 @@ TEMPLATE_LIST_TEST_CASE("observer static_cast move from valid", "[cast][observer
 
             CHECK(optr1.get() == nullptr);
             CHECK(optr2.get() == raw_ptr);
-            CHECK(snatch::type_name<return_type> == snatch::type_name<expected_return_type>);
+            CHECK(snitch::type_name<return_type> == snitch::type_name<expected_return_type>);
             CHECK_INSTANCES(1, 1);
         };
 
@@ -43,7 +42,7 @@ TEMPLATE_LIST_TEST_CASE("observer static_cast move from empty", "[cast][observer
 
             CHECK(optr1.get() == nullptr);
             CHECK(optr2.get() == nullptr);
-            CHECK(snatch::type_name<return_type> == snatch::type_name<expected_return_type>);
+            CHECK(snitch::type_name<return_type> == snitch::type_name<expected_return_type>);
             CHECK_INSTANCES(0, 1);
         };
 
@@ -71,7 +70,7 @@ TEMPLATE_LIST_TEST_CASE("observer const_cast move from valid", "[cast][observer]
 
             CHECK(optr1.get() == nullptr);
             CHECK(optr2.get() == raw_ptr);
-            CHECK(snatch::type_name<return_type> == snatch::type_name<expected_return_type>);
+            CHECK(snitch::type_name<return_type> == snitch::type_name<expected_return_type>);
             CHECK_INSTANCES(1, 1);
         };
 
@@ -96,7 +95,7 @@ TEMPLATE_LIST_TEST_CASE("observer const_cast move from empty", "[cast][observer]
 
             CHECK(optr1.get() == nullptr);
             CHECK(optr2.get() == nullptr);
-            CHECK(snatch::type_name<return_type> == snatch::type_name<expected_return_type>);
+            CHECK(snitch::type_name<return_type> == snitch::type_name<expected_return_type>);
             CHECK_INSTANCES(0, 1);
         };
 
@@ -123,7 +122,7 @@ TEMPLATE_LIST_TEST_CASE("observer dynamic_cast move from valid", "[cast][observe
 
                 CHECK(optr1.get() == nullptr);
                 CHECK(optr2.get() == raw_ptr);
-                CHECK(snatch::type_name<return_type> == snatch::type_name<expected_return_type>);
+                CHECK(snitch::type_name<return_type> == snitch::type_name<expected_return_type>);
                 CHECK_INSTANCES(1, 1);
             };
 
@@ -155,7 +154,7 @@ TEMPLATE_LIST_TEST_CASE("observer dynamic_cast move from empty", "[cast][observe
 
                 CHECK(optr1.get() == nullptr);
                 CHECK(optr2.get() == nullptr);
-                CHECK(snatch::type_name<return_type> == snatch::type_name<expected_return_type>);
+                CHECK(snitch::type_name<return_type> == snitch::type_name<expected_return_type>);
                 CHECK_INSTANCES(0, 1);
             };
 
@@ -189,7 +188,7 @@ TEMPLATE_LIST_TEST_CASE(
 
             CHECK(optr1.get() == nullptr);
             CHECK(optr2.get() == nullptr);
-            CHECK(snatch::type_name<return_type> == snatch::type_name<expected_return_type>);
+            CHECK(snitch::type_name<return_type> == snitch::type_name<expected_return_type>);
             CHECK_INSTANCES(1, 1);
         }
 
diff --git a/tests/runtime_tests_observer_comparison.cpp b/tests/runtime_tests_observer_comparison.cpp
@@ -1,6 +1,5 @@
 #include "memory_tracker.hpp"
 #include "testing.hpp"
-#include "tests_common.hpp"
 
 TEMPLATE_LIST_TEST_CASE(
     "observer comparison valid vs nullptr", "[comparison][observer]", owner_types) {
diff --git a/tests/runtime_tests_observer_construction.cpp b/tests/runtime_tests_observer_construction.cpp
@@ -1,6 +1,5 @@
 #include "memory_tracker.hpp"
 #include "testing.hpp"
-#include "tests_common.hpp"
 
 TEMPLATE_LIST_TEST_CASE("observer default constructor", "[construction][observer]", owner_types) {
     volatile memory_tracker mem_track;
diff --git a/tests/runtime_tests_observer_construction_copy.cpp b/tests/runtime_tests_observer_construction_copy.cpp
@@ -1,6 +1,5 @@
 #include "memory_tracker.hpp"
 #include "testing.hpp"
-#include "tests_common.hpp"
 
 TEMPLATE_LIST_TEST_CASE(
     "observer copy constructor valid", "[construction][observer][from_observer]", owner_types) {
diff --git a/tests/runtime_tests_observer_construction_from_owner.cpp b/tests/runtime_tests_observer_construction_from_owner.cpp
@@ -1,6 +1,5 @@
 #include "memory_tracker.hpp"
 #include "testing.hpp"
-#include "tests_common.hpp"
 
 TEMPLATE_LIST_TEST_CASE(
     "observer from empty owner constructor", "[construction][observer][from_owner]", owner_types) {
diff --git a/tests/runtime_tests_observer_construction_move.cpp b/tests/runtime_tests_observer_construction_move.cpp
@@ -1,6 +1,5 @@
 #include "memory_tracker.hpp"
 #include "testing.hpp"
-#include "tests_common.hpp"
 
 TEMPLATE_LIST_TEST_CASE(
     "observer move from valid observer constructor",
diff --git a/tests/runtime_tests_observer_from_this.cpp b/tests/runtime_tests_observer_from_this.cpp
@@ -1,6 +1,5 @@
 #include "memory_tracker.hpp"
 #include "testing.hpp"
-#include "tests_common.hpp"
 
 TEMPLATE_LIST_TEST_CASE("observer from this", "[observer_from_this]", owner_types) {
     if constexpr (has_eoft<TestType>) {
@@ -74,12 +73,12 @@ TEMPLATE_LIST_TEST_CASE(
             } else {
                 REQUIRE_THROWS_MATCHES(
                     (make_observer_from_this<TestType>(orig_ptr)), oup::bad_observer_from_this,
-                    snatch::matchers::with_what_contains{
+                    snitch::matchers::with_what_contains{
                         "observer_from_this() called with uninitialized control block"});
                 REQUIRE_THROWS_MATCHES(
                     (make_const_observer_from_this<TestType>(orig_ptr)),
                     oup::bad_observer_from_this,
-                    snatch::matchers::with_what_contains{
+                    snitch::matchers::with_what_contains{
                         "observer_from_this() called with uninitialized control block"});
             }
 
@@ -110,11 +109,11 @@ TEMPLATE_LIST_TEST_CASE("observer from this no owner stack", "[observer_from_thi
             } else {
                 REQUIRE_THROWS_MATCHES(
                     (make_observer_from_this<TestType>(&obj)), oup::bad_observer_from_this,
-                    snatch::matchers::with_what_contains{
+                    snitch::matchers::with_what_contains{
                         "observer_from_this() called with uninitialized control block"});
                 REQUIRE_THROWS_MATCHES(
                     (make_const_observer_from_this<TestType>(&obj)), oup::bad_observer_from_this,
-                    snatch::matchers::with_what_contains{
+                    snitch::matchers::with_what_contains{
                         "observer_from_this() called with uninitialized control block"});
             }
 
@@ -147,12 +146,12 @@ TEMPLATE_LIST_TEST_CASE(
             } else {
                 REQUIRE_THROWS_MATCHES(
                     (make_observer_from_this<TestType>(orig_ptr)), oup::bad_observer_from_this,
-                    snatch::matchers::with_what_contains{
+                    snitch::matchers::with_what_contains{
                         "observer_from_this() called with uninitialized control block"});
                 REQUIRE_THROWS_MATCHES(
                     (make_const_observer_from_this<TestType>(orig_ptr)),
                     oup::bad_observer_from_this,
-                    snatch::matchers::with_what_contains{
+                    snitch::matchers::with_what_contains{
                         "observer_from_this() called with uninitialized control block"});
             }
         }
@@ -388,7 +387,7 @@ TEMPLATE_LIST_TEST_CASE("observer from this in constructor", "[observer_from_thi
             next_test_object_constructor_calls_observer_from_this = true;
             REQUIRE_THROWS_MATCHES(
                 (make_pointer_deleter_1<TestType>()), oup::bad_observer_from_this,
-                snatch::matchers::with_what_contains{
+                snitch::matchers::with_what_contains{
                     "observer_from_this() called with uninitialized control block"});
             next_test_object_constructor_calls_observer_from_this = false;
         }
diff --git a/tests/runtime_tests_observer_misc.cpp b/tests/runtime_tests_observer_misc.cpp
@@ -1,6 +1,5 @@
 #include "memory_tracker.hpp"
 #include "testing.hpp"
-#include "tests_common.hpp"
 
 TEMPLATE_LIST_TEST_CASE("observer size", "[size][observer]", owner_types) {
     CHECK(sizeof(observer_ptr<TestType>) == 2 * sizeof(void*));
diff --git a/tests/runtime_tests_owner_assignment_move.cpp b/tests/runtime_tests_owner_assignment_move.cpp
@@ -1,6 +1,5 @@
 #include "memory_tracker.hpp"
 #include "testing.hpp"
-#include "tests_common.hpp"
 
 TEMPLATE_LIST_TEST_CASE(
     "owner move assignment operator valid to empty", "[assignment][owner]", owner_types) {
diff --git a/tests/runtime_tests_owner_cast_move.cpp b/tests/runtime_tests_owner_cast_move.cpp
diff --git a/tests/runtime_tests_owner_comparison.cpp b/tests/runtime_tests_owner_comparison.cpp
diff --git a/tests/runtime_tests_owner_construction.cpp b/tests/runtime_tests_owner_construction.cpp
diff --git a/tests/runtime_tests_owner_misc.cpp b/tests/runtime_tests_owner_misc.cpp
diff --git a/tests/testing.hpp b/tests/testing.hpp
diff --git a/tests/tests_common.hpp b/tests/tests_common.hpp
