Remove CATCH_CONFIG_DISABLE_MATCHERS

Now that the recommended distribution and usage method is proper
library, users can just avoid including the matcher headers to get
basically the same effect.

tests/ExtraTests/ToDo.txt

@@ -4,7 +4,6 @@ yet:
     CATCH_CONFIG_COUNTER                    // Use __COUNTER__ to generate unique names for test cases
     CATCH_CONFIG_WINDOWS_SEH                // Enable SEH handling on Windows
     CATCH_CONFIG_FAST_COMPILE               // Sacrifices some (rather minor) features for compilation speed
-    CATCH_CONFIG_DISABLE_MATCHERS           // Do not compile Matchers in this compilation unit
     CATCH_CONFIG_POSIX_SIGNALS              // Enable handling POSIX signals
     CATCH_CONFIG_WINDOWS_CRTDBG             // Enable leak checking using Windows's CRT Debug Heap
     CATCH_CONFIG_DEFAULT_REPORTER

tests/SelfTest/IntrospectiveTests/CmdLine.tests.cpp

@@ -286,9 +286,7 @@ TEST_CASE( "Parse test names and tags" ) {
 
 TEST_CASE( "Process can be configured on command line", "[config][command-line]" ) {
 
-#ifndef CATCH_CONFIG_DISABLE_MATCHERS
     using namespace Catch::Matchers;
-#endif
 
     Catch::ConfigData config;
     auto cli = Catch::makeCommandLineParser(config);
@@ -367,9 +365,7 @@ TEST_CASE( "Process can be configured on command line", "[config][command-line]"
             auto result = cli.parse({"test", "--reporter", "unsupported"});
             CHECK(!result);
 
-#ifndef CATCH_CONFIG_DISABLE_MATCHERS
             REQUIRE_THAT(result.errorMessage(), Contains("Unrecognized reporter"));
-#endif
         }
     }
 
@@ -401,10 +397,7 @@ TEST_CASE( "Process can be configured on command line", "[config][command-line]"
         SECTION("-x must be numeric") {
             auto result = cli.parse({"test", "-x", "oops"});
             CHECK(!result);
-
-#ifndef CATCH_CONFIG_DISABLE_MATCHERS
             REQUIRE_THAT(result.errorMessage(), Contains("convert") && Contains("oops"));
-#endif
         }
     }
 
@@ -476,9 +469,7 @@ TEST_CASE( "Process can be configured on command line", "[config][command-line]"
         SECTION( "error" ) {
             auto result = cli.parse({"test", "--use-colour", "wrong"});
             CHECK( !result );
-#ifndef CATCH_CONFIG_DISABLE_MATCHERS
             CHECK_THAT( result.errorMessage(), Contains( "colour mode must be one of" ) );
-#endif
         }
     }
 

tests/SelfTest/IntrospectiveTests/Tag.tests.cpp

@@ -22,14 +22,12 @@ TEST_CASE( "Tag alias can be registered against tag patterns" ) {
             FAIL( "expected exception" );
         }
         catch( std::exception& ex ) {
-#ifndef CATCH_CONFIG_DISABLE_MATCHERS
             std::string what = ex.what();
             using namespace Catch::Matchers;
             CHECK_THAT( what, Contains( "[@zzz]" ) );
             CHECK_THAT( what, Contains( "file" ) );
             CHECK_THAT( what, Contains( "2" ) );
             CHECK_THAT( what, Contains( "10" ) );
-#endif
         }
     }
 

tests/SelfTest/UsageTests/Compilation.tests.cpp

@@ -79,9 +79,7 @@ namespace { namespace CompilationTests {
         REQUIRE_THROWS(throws_int(true));
         CHECK_THROWS_AS(throws_int(true), int);
         REQUIRE_NOTHROW(throws_int(false));
-#ifndef CATCH_CONFIG_DISABLE_MATCHERS
         REQUIRE_THAT("aaa", Catch::EndsWith("aaa"));
-#endif
         return true;
     }
 

tests/SelfTest/UsageTests/Exception.tests.cpp

@@ -162,8 +162,6 @@ TEST_CASE("thrown std::strings are translated", "[.][failing][!throws]") {
 }
 
 
-#ifndef CATCH_CONFIG_DISABLE_MATCHERS
-
 TEST_CASE( "Exception messages can be tested for", "[!throws]" ) {
     using namespace Catch::Matchers;
     SECTION( "exact match" )
@@ -178,8 +176,6 @@ TEST_CASE( "Exception messages can be tested for", "[!throws]" ) {
     }
 }
 
-#endif
-
 TEST_CASE( "Mismatching exception messages failing the test", "[.][failing][!throws]" ) {
     REQUIRE_THROWS_WITH( thisThrows(), "expected exception" );
     REQUIRE_THROWS_WITH( thisThrows(), "should fail" );

tests/SelfTest/UsageTests/Matchers.tests.cpp

@@ -22,8 +22,6 @@
 
 namespace { namespace MatchersTests {
 
-#ifndef CATCH_CONFIG_DISABLE_MATCHERS
-
 #ifndef MATCHERS_TEST_HELPERS_INCLUDED // Don't compile this more than once per TU
 #define MATCHERS_TEST_HELPERS_INCLUDED
 
@@ -558,8 +556,6 @@ namespace { namespace MatchersTests {
 
 } } // namespace MatchersTests
 
-#endif // CATCH_CONFIG_DISABLE_MATCHERS
-
 #ifdef __clang__
 #pragma clang diagnostic pop
 #endif