From a6baa6dda6dd06c1024d20b82c9fa400bacf4cac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?=
 <martin.horenovsky@gmail.com>
Date: Sat, 28 Mar 2020 11:06:14 +0100
Subject: [PATCH] Cleanup in exception matchers

No more nested namespace for the matcher, and there is now a doxygen
explanatory comment on the factory function.
---
 src/catch2/matchers/catch_matchers_exception.cpp | 7 ++-----
 src/catch2/matchers/catch_matchers_exception.hpp | 6 ++----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/catch2/matchers/catch_matchers_exception.cpp b/src/catch2/matchers/catch_matchers_exception.cpp
index eec08f88..c8e8110d 100644
--- a/src/catch2/matchers/catch_matchers_exception.cpp
+++ b/src/catch2/matchers/catch_matchers_exception.cpp
@@ -10,7 +10,6 @@
 
 namespace Catch {
 namespace Matchers {
-namespace Exception {
 
 bool ExceptionMessageMatcher::match(std::exception const& ex) const {
     return ex.what() == m_message;
@@ -20,11 +19,9 @@ std::string ExceptionMessageMatcher::describe() const {
     return "exception message matches \"" + m_message + "\"";
 }
 
-}
-Exception::ExceptionMessageMatcher Message(std::string const& message) {
-    return Exception::ExceptionMessageMatcher(message);
+ExceptionMessageMatcher Message(std::string const& message) {
+    return ExceptionMessageMatcher(message);
 }
 
-// namespace Exception
 } // namespace Matchers
 } // namespace Catch
diff --git a/src/catch2/matchers/catch_matchers_exception.hpp b/src/catch2/matchers/catch_matchers_exception.hpp
index 74355cd8..5688218f 100644
--- a/src/catch2/matchers/catch_matchers_exception.hpp
+++ b/src/catch2/matchers/catch_matchers_exception.hpp
@@ -11,7 +11,6 @@
 
 namespace Catch {
 namespace Matchers {
-namespace Exception {
 
 class ExceptionMessageMatcher final : public MatcherBase<std::exception> {
     std::string m_message;
@@ -26,9 +25,8 @@ public:
     std::string describe() const override;
 };
 
-} // namespace Exception
-
-Exception::ExceptionMessageMatcher Message(std::string const& message);
+//! Creates a matcher that checks whether a std derived exception has the provided message
+ExceptionMessageMatcher Message(std::string const& message);
 
 } // namespace Matchers
 } // namespace Catch