Rename some matcher-related files

The two changes are
`catch_matchers_templates` -> `catch_matchers_templated` and
`catch_matchers_generic` -> `catch_matchers_predicate`. The former
is mostly cosmetic, but the second was previously significantly
misleading, and as the library is now to be consumed by including
specific headers, this needed to be fixed.

docs/matchers.md

@@ -211,7 +211,7 @@ REQUIRE_THAT("Hello olleH",
 );
 ```
 
-> the predicate matcher lives in `catch2/matchers/catch_matchers_generic.hpp`
+> the predicate matcher lives in `catch2/matchers/catch_matchers_predicate.hpp`
 
 
 The other miscellaneous matcher utility is exception matching.
@@ -333,7 +333,7 @@ can compare one range-like (something that responds to `begin` and
 
 ```cpp
 #include <catch2/catch_test_macros.hpp>
-#include <catch2/matchers/catch_matchers_templates.hpp>
+#include <catch2/matchers/catch_matchers_templated.hpp>
 // ...
 
 template<typename Range>
@@ -378,7 +378,7 @@ a new style matcher, combining new style matchers is more expensive
 in terms of compilation time. Also note that you can combine old style
 and new style matchers arbitrarily.
 
-> `MatcherGenericBase` lives in `catch2/matchers/catch_matchers_templates.hpp`
+> `MatcherGenericBase` lives in `catch2/matchers/catch_matchers_templated.hpp`
 
 
 ---

src/CMakeLists.txt

@@ -78,9 +78,9 @@ set(INTERNAL_HEADERS
     ${SOURCES_DIR}/matchers/catch_matchers_contains.hpp
     ${SOURCES_DIR}/matchers/catch_matchers_exception.hpp
     ${SOURCES_DIR}/matchers/catch_matchers_floating.hpp
-    ${SOURCES_DIR}/matchers/catch_matchers_generic.hpp
+    ${SOURCES_DIR}/matchers/catch_matchers_predicate.hpp
     ${SOURCES_DIR}/matchers/catch_matchers_string.hpp
-    ${SOURCES_DIR}/matchers/catch_matchers_templates.hpp
+    ${SOURCES_DIR}/matchers/catch_matchers_templated.hpp
     ${SOURCES_DIR}/matchers/catch_matchers_vector.hpp
     ${SOURCES_DIR}/catch_message.h
     ${SOURCES_DIR}/catch_meta.hpp
@@ -162,9 +162,9 @@ set(IMPL_SOURCES
     ${SOURCES_DIR}/matchers/catch_matchers_container_properties.cpp
     ${SOURCES_DIR}/matchers/catch_matchers_exception.cpp
     ${SOURCES_DIR}/matchers/catch_matchers_floating.cpp
-    ${SOURCES_DIR}/matchers/catch_matchers_generic.cpp
+    ${SOURCES_DIR}/matchers/catch_matchers_predicate.cpp
     ${SOURCES_DIR}/matchers/catch_matchers_string.cpp
-    ${SOURCES_DIR}/matchers/catch_matchers_templates.cpp
+    ${SOURCES_DIR}/matchers/catch_matchers_templated.cpp
     ${SOURCES_DIR}/catch_message.cpp
     ${SOURCES_DIR}/catch_output_redirect.cpp
     ${SOURCES_DIR}/catch_registry_hub.cpp

src/catch2/matchers/catch_matchers_container_properties.hpp

@@ -4,7 +4,7 @@
 #ifndef TWOBLUECUBES_CATCH_MATCHERS_CONTAINER_PROPERTIES_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_MATCHERS_CONTAINER_PROPERTIES_HPP_INCLUDED
 
-#include <catch2/matchers/catch_matchers_templates.hpp>
+#include <catch2/matchers/catch_matchers_templated.hpp>
 #include <catch2/internal/catch_container_nonmembers.hpp>
 
 namespace Catch {

src/catch2/matchers/catch_matchers_contains.hpp

@@ -5,7 +5,7 @@
 #ifndef TWOBLUECUBES_CATCH_MATCHERS_CONTAINS_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_MATCHERS_CONTAINS_HPP_INCLUDED
 
-#include <catch2/matchers/catch_matchers_templates.hpp>
+#include <catch2/matchers/catch_matchers_templated.hpp>
 
 #include <algorithm>
 #include <functional>

src/catch2/matchers/catch_matchers_predicate.cpp

@@ -1,4 +1,4 @@
-#include <catch2/matchers/catch_matchers_generic.hpp>
+#include <catch2/matchers/catch_matchers_predicate.hpp>
 
 std::string Catch::Matchers::Generic::Detail::finalizeDescription(const std::string& desc) {
     if (desc.empty()) {

src/catch2/matchers/catch_matchers_templated.cpp

@@ -1,4 +1,4 @@
-#include <catch2/matchers/catch_matchers_templates.hpp>
+#include <catch2/matchers/catch_matchers_templated.hpp>
 
 namespace Catch {
 namespace Matchers {

src/catch2/matchers/catch_matchers_templated.hpp

@@ -1,5 +1,8 @@
-#ifndef TWOBLUECUBES_CATCH_MATCHERS_TEMPLATES_HPP_INCLUDED
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
-#define TWOBLUECUBES_CATCH_MATCHERS_TEMPLATES_HPP_INCLUDED
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef TWOBLUECUBES_CATCH_MATCHERS_TEMPLATED_HPP_INCLUDED
+#define TWOBLUECUBES_CATCH_MATCHERS_TEMPLATED_HPP_INCLUDED
 
 #include <catch2/catch_common.h>
 #include <catch2/matchers/catch_matchers.hpp>

tests/ExtraTests/X01-PrefixedMacros.cpp

@@ -5,7 +5,7 @@
 // This won't provide full coverage, but it might be worth checking
 // the other branch as well
 #include <catch2/catch_test_macros.hpp>
-#include <catch2/matchers/catch_matchers_generic.hpp>
+#include <catch2/matchers/catch_matchers_predicate.hpp>
 #include <catch2/matchers/catch_matchers_string.hpp>
 
 #include <type_traits>

tests/SelfTest/UsageTests/Matchers.tests.cpp

@@ -6,10 +6,10 @@
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/matchers/catch_matchers_exception.hpp>
 #include <catch2/matchers/catch_matchers_floating.hpp>
-#include <catch2/matchers/catch_matchers_generic.hpp>
+#include <catch2/matchers/catch_matchers_predicate.hpp>
 #include <catch2/matchers/catch_matchers_string.hpp>
 #include <catch2/matchers/catch_matchers_vector.hpp>
-#include <catch2/matchers/catch_matchers_templates.hpp>
+#include <catch2/matchers/catch_matchers_templated.hpp>
 
 #include <algorithm>
 #include <cmath>