Move around matcher macro implementation

src/CMakeLists.txt

@@ -33,7 +33,7 @@ set(BENCHMARK_SOURCES
 SOURCE_GROUP("benchmark" FILES ${BENCHMARK_HEADERS} ${BENCHMARK_SOURCES})
 
 set(INTERNAL_HEADERS
-    ${SOURCES_DIR}/internal/catch_capture_matchers.hpp
+    ${SOURCES_DIR}/matchers/internal/catch_matchers_impl.hpp
     ${SOURCES_DIR}/internal/catch_container_nonmembers.hpp
     ${SOURCES_DIR}/catch_approx.hpp
     ${SOURCES_DIR}/internal/catch_assertionhandler.hpp
@@ -130,7 +130,7 @@ set(IMPL_SOURCES
     ${SOURCES_DIR}/catch_approx.cpp
     ${SOURCES_DIR}/internal/catch_assertionhandler.cpp
     ${SOURCES_DIR}/catch_assertion_result.cpp
-    ${SOURCES_DIR}/internal/catch_capture_matchers.cpp
+    ${SOURCES_DIR}/matchers/internal/catch_matchers_impl.cpp
     ${SOURCES_DIR}/internal/catch_commandline.cpp
     ${SOURCES_DIR}/internal/catch_common.cpp
     ${SOURCES_DIR}/catch_config.cpp

src/catch2/internal/catch_assertionhandler.cpp

@@ -14,7 +14,6 @@
 #include <catch2/internal/catch_enforce.hpp>
 #include <catch2/internal/catch_debugger.hpp>
 #include <catch2/interfaces/catch_interfaces_registry_hub.hpp>
-#include <catch2/internal/catch_capture_matchers.hpp>
 #include <catch2/internal/catch_run_context.hpp>
 #include <catch2/matchers/catch_matchers_string.hpp>
 

src/catch2/matchers/catch_matchers.hpp

@@ -6,7 +6,7 @@
 #define TWOBLUECUBES_CATCH_MATCHERS_HPP_INCLUDED
 
 #include <catch2/internal/catch_common.hpp>
-#include <catch2/internal/catch_capture_matchers.hpp>
+#include <catch2/matchers/internal/catch_matchers_impl.hpp>
 
 #include <string>
 #include <vector>

src/catch2/matchers/internal/catch_matchers_impl.cpp

@@ -2,7 +2,7 @@
  *  Distributed under the Boost Software License, Version 1.0. (See accompanying
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
-#include <catch2/internal/catch_capture_matchers.hpp>
+#include <catch2/matchers/internal/catch_matchers_impl.hpp>
 #include <catch2/matchers/catch_matchers.hpp>
 #include <catch2/interfaces/catch_interfaces_registry_hub.hpp>
 

src/catch2/matchers/internal/catch_matchers_impl.hpp

@@ -34,8 +34,8 @@ namespace Catch {
     };
 
     namespace Matchers {
-    template <typename ArgT>
-    struct MatcherBase;
+        template <typename ArgT>
+        struct MatcherBase;
     }
 
     using StringMatcher = Matchers::MatcherBase<std::string>;