From 48a54314666e3b59334bbe0b1ed6732c6de532ac Mon Sep 17 00:00:00 2001
From: Marcel Gotsch <gotschmarcel@gmail.com>
Date: Sat, 27 Aug 2022 21:59:25 +0200
Subject: [PATCH] fixup! Report generator states for failed assertions

---
 src/catch2/generators/catch_generators.hpp          | 1 -
 src/catch2/interfaces/catch_interfaces_reporter.cpp | 1 -
 src/catch2/interfaces/catch_interfaces_reporter.hpp | 1 -
 src/catch2/internal/catch_run_context.hpp           | 1 -
 src/catch2/reporters/catch_reporter_console.cpp     | 4 ++--
 5 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/catch2/generators/catch_generators.hpp b/src/catch2/generators/catch_generators.hpp
index dc911b34..41d8e582 100644
--- a/src/catch2/generators/catch_generators.hpp
+++ b/src/catch2/generators/catch_generators.hpp
@@ -8,7 +8,6 @@
 #ifndef CATCH_GENERATORS_HPP_INCLUDED
 #define CATCH_GENERATORS_HPP_INCLUDED
 
-#include "catch2/interfaces/catch_interfaces_capture.hpp"
 #include <catch2/catch_tostring.hpp>
 #include <catch2/interfaces/catch_interfaces_generatortracker.hpp>
 #include <catch2/internal/catch_generator_info.hpp>
diff --git a/src/catch2/interfaces/catch_interfaces_reporter.cpp b/src/catch2/interfaces/catch_interfaces_reporter.cpp
index 80dd7c28..634a5e3e 100644
--- a/src/catch2/interfaces/catch_interfaces_reporter.cpp
+++ b/src/catch2/interfaces/catch_interfaces_reporter.cpp
@@ -5,7 +5,6 @@
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0
-#include "catch2/interfaces/catch_interfaces_capture.hpp"
 #include <catch2/interfaces/catch_interfaces_reporter.hpp>
 #include <catch2/interfaces/catch_interfaces_config.hpp>
 #include <catch2/internal/catch_console_colour.hpp>
diff --git a/src/catch2/interfaces/catch_interfaces_reporter.hpp b/src/catch2/interfaces/catch_interfaces_reporter.hpp
index 317374d4..ffb2aef5 100644
--- a/src/catch2/interfaces/catch_interfaces_reporter.hpp
+++ b/src/catch2/interfaces/catch_interfaces_reporter.hpp
@@ -8,7 +8,6 @@
 #ifndef CATCH_INTERFACES_REPORTER_HPP_INCLUDED
 #define CATCH_INTERFACES_REPORTER_HPP_INCLUDED
 
-#include "catch2/interfaces/catch_interfaces_capture.hpp"
 #include <catch2/catch_section_info.hpp>
 #include <catch2/catch_totals.hpp>
 #include <catch2/catch_assertion_result.hpp>
diff --git a/src/catch2/internal/catch_run_context.hpp b/src/catch2/internal/catch_run_context.hpp
index b72dd3e4..1c6684c5 100644
--- a/src/catch2/internal/catch_run_context.hpp
+++ b/src/catch2/internal/catch_run_context.hpp
@@ -8,7 +8,6 @@
 #ifndef CATCH_RUN_CONTEXT_HPP_INCLUDED
 #define CATCH_RUN_CONTEXT_HPP_INCLUDED
 
-#include "catch2/interfaces/catch_interfaces_capture.hpp"
 #include <catch2/interfaces/catch_interfaces_reporter.hpp>
 #include <catch2/internal/catch_test_registry.hpp>
 #include <catch2/internal/catch_fatal_condition_handler.hpp>
diff --git a/src/catch2/reporters/catch_reporter_console.cpp b/src/catch2/reporters/catch_reporter_console.cpp
index 7abcc57c..d2eb4a2e 100644
--- a/src/catch2/reporters/catch_reporter_console.cpp
+++ b/src/catch2/reporters/catch_reporter_console.cpp
@@ -160,14 +160,14 @@ private:
             return;
         }
 
-        stream << "with " << pluralise(stats.generatorInfos.size(), "generator"_sr) << "\n";
+        stream << "with " << pluralise(stats.generatorInfos.size(), "generator"_sr) << '\n';
         for ( auto const& info : stats.generatorInfos ) {
             stream << TextFlow::Column( "line:" ).indent( 2 )
                    << info.lineInfo.line << ": "
                    << "GENERATE(" << info.definition << ")\n"
                    << TextFlow::Column( "value: " ).indent( 2 )
                    << colourImpl->guardColour( Colour::GeneratorValue )
-                   << info.currentElement << "\n";
+                   << info.currentElement << '\n';
         }
     }
     void printMessage() const {