Update Catch2 version 3.5.3

Author: TLCFEM

Include/catch/catch_amalgamated.cpp

@@ -5,8 +5,8 @@
 
 // SPDX-License-Identifier: BSL-1.0
 
-//  Catch v3.5.2
-//  Generated: 2024-01-15 14:06:36.675713
+//  Catch v3.5.3
+//  Generated: 2024-03-01 22:05:56.038084
 //  ----------------------------------------------------------
 //  This file is an amalgamation of multiple different files.
 //  You probably shouldn't edit it directly.
@@ -72,8 +72,8 @@ namespace Catch {
                     FDuration mean = FDuration(0);
                     int i = 0;
                     for(auto it = first; it < last; ++it, ++i) {
-                        samples.push_back(FDuration(*it));
-                        mean += FDuration(*it);
+                        samples.push_back(*it);
+                        mean += *it;
                     }
                     mean /= i;
 
@@ -432,7 +432,7 @@ namespace {
 
 namespace Catch {
     Approx::Approx(double value)
-        : m_epsilon(std::numeric_limits<float>::epsilon() * 100.)
+        : m_epsilon(static_cast<double>(std::numeric_limits<float>::epsilon()) * 100.)
         , m_margin(0.0)
         , m_scale(0.0)
         , m_value(value) {}
@@ -810,6 +810,7 @@ namespace Catch {
                     m_messages.back().message += " := ";
                     start = pos;
                 }
+            default: ; // noop
             }
         }
         assert(openings.empty() && "Mismatched openings");
@@ -1196,8 +1197,10 @@ namespace Catch {
         StringRef extractFilenamePart(StringRef filename) {
             size_t lastDot = filename.size();
             while(lastDot > 0 && filename[lastDot - 1] != '.') { --lastDot; }
-            --lastDot;
+            // In theory we could have filename without any extension in it
+            if(lastDot == 0) { return StringRef(); }
 
+            --lastDot;
             size_t nameStart = lastDot;
             while(nameStart > 0 && filename[nameStart - 1] != '/' && filename[nameStart - 1] != '\\') { --nameStart; }
 
@@ -1473,13 +1476,13 @@ namespace Catch {
             }
         } // end unnamed namespace
 
-        std::string convertIntoString(StringRef string, bool escape_invisibles) {
+        std::string convertIntoString(StringRef string, bool escapeInvisibles) {
             std::string ret;
             // This is enough for the "don't escape invisibles" case, and a good
             // lower bound on the "escape invisibles" case.
             ret.reserve(string.size() + 2);
 
-            if(!escape_invisibles) {
+            if(!escapeInvisibles) {
                 ret += '"';
                 ret += string;
                 ret += '"';
@@ -1547,6 +1550,7 @@ namespace Catch {
     }
 
     std::string StringMaker<char*>::convert(char* str) {
+        // NOLINT(readability-non-const-parameter)
         if(str) { return Detail::convertIntoString(str); }
         else { return {"{null string}"}; }
     }
@@ -1617,7 +1621,7 @@ namespace Catch {
 
     std::string StringMaker<char>::convert(char c) { return ::Catch::Detail::stringify(static_cast<signed char>(c)); }
 
-    std::string StringMaker<unsigned char>::convert(unsigned char c) { return ::Catch::Detail::stringify(static_cast<char>(c)); }
+    std::string StringMaker<unsigned char>::convert(unsigned char value) { return ::Catch::Detail::stringify(static_cast<char>(value)); }
 
     int StringMaker<float>::precision = 5;
 
@@ -1699,7 +1703,7 @@ namespace Catch {
     }
 
     Version const& libraryVersion() {
-        static Version version(3, 5, 2, "", 0);
+        static Version version(3, 5, 3, "", 0);
         return version;
     }
 }
@@ -2253,7 +2257,7 @@ namespace Catch {
             while(std::getline(f, line)) {
                 line = trim(line);
                 if(!line.empty() && !startsWith(line, '#')) {
-                    if(!startsWith(line, '"')) line = '"' + line + '"';
+                    if(!startsWith(line, '"')) line = '"' + CATCH_MOVE(line) + '"';
                     config.testsOrTags.push_back(line);
                     config.testsOrTags.emplace_back(",");
                 }
@@ -2572,22 +2576,22 @@ namespace Catch {
 }     // end namespace Catch
 
 namespace Catch {
-    Detail::unique_ptr<ColourImpl> makeColourImpl(ColourMode implSelection, IStream* stream) {
+    Detail::unique_ptr<ColourImpl> makeColourImpl(ColourMode colourSelection, IStream* stream) {
 #if defined( CATCH_CONFIG_COLOUR_WIN32 )
-        if(implSelection == ColourMode::Win32) { return Detail::make_unique<Win32ColourImpl>(stream); }
+        if(colourSelection == ColourMode::Win32) { return Detail::make_unique<Win32ColourImpl>(stream); }
 #endif
-        if(implSelection == ColourMode::ANSI) { return Detail::make_unique<ANSIColourImpl>(stream); }
-        if(implSelection == ColourMode::None) { return Detail::make_unique<NoColourImpl>(stream); }
+        if(colourSelection == ColourMode::ANSI) { return Detail::make_unique<ANSIColourImpl>(stream); }
+        if(colourSelection == ColourMode::None) { return Detail::make_unique<NoColourImpl>(stream); }
 
-        if(implSelection == ColourMode::PlatformDefault) {
+        if(colourSelection == ColourMode::PlatformDefault) {
 #if defined( CATCH_CONFIG_COLOUR_WIN32 )
             if(Win32ColourImpl::useImplementationForStream(*stream)) { return Detail::make_unique<Win32ColourImpl>(stream); }
 #endif
             if(ANSIColourImpl::useImplementationForStream(*stream)) { return Detail::make_unique<ANSIColourImpl>(stream); }
             return Detail::make_unique<NoColourImpl>(stream);
         }
 
-        CATCH_ERROR("Could not create colour impl for selection " << static_cast<int>(implSelection));
+        CATCH_ERROR("Could not create colour impl for selection " << static_cast<int>(colourSelection));
     }
 
     bool isColourImplAvailable(ColourMode colourSelection) {
@@ -2772,7 +2776,11 @@ namespace Catch {
 #endif // Platform
 
 namespace Catch {
-    ITransientExpression::~ITransientExpression() = default;
+    void ITransientExpression::streamReconstructedExpression(std::ostream& os) const {
+        // We can't make this function pure virtual to keep ITransientExpression
+        // constexpr, so we write error message instead
+        os << "Some class derived from ITransientExpression without overriding streamReconstructedExpression";
+    }
 
     void formatReconstructedExpression(std::ostream& os, std::string const& lhs, StringRef op, std::string const& rhs) {
         if(lhs.size() + rhs.size() < 40 && lhs.find('\n') == std::string::npos && rhs.find('\n') == std::string::npos) os << lhs << ' ' << op << ' ' << rhs;
@@ -3311,7 +3319,7 @@ namespace Catch {
         : m_os{os}
         , m_indent_level{indent_level} { m_os << '{'; }
 
-    JsonObjectWriter::JsonObjectWriter(JsonObjectWriter&& source)
+    JsonObjectWriter::JsonObjectWriter(JsonObjectWriter&& source) noexcept
         : m_os{source.m_os}
         , m_indent_level{source.m_indent_level}
         , m_should_comma{source.m_should_comma}
@@ -3339,7 +3347,7 @@ namespace Catch {
         : m_os{os}
         , m_indent_level{indent_level} { m_os << '['; }
 
-    JsonArrayWriter::JsonArrayWriter(JsonArrayWriter&& source)
+    JsonArrayWriter::JsonArrayWriter(JsonArrayWriter&& source) noexcept
         : m_os{source.m_os}
         , m_indent_level{source.m_indent_level}
         , m_should_comma{source.m_should_comma}
@@ -3923,7 +3931,10 @@ namespace Catch {
             auto kv = splitKVPair(parts[i]);
             auto key = kv.key, value = kv.value;
 
-            if(key.empty() || value.empty()) { return {}; }
+            if(key.empty() || value.empty()) {
+                // NOLINT(bugprone-branch-clone)
+                return {};
+            }
             else if(key[0] == 'X') {
                 // This is a reporter-specific option, we don't check these
                 // apart from basic sanity checks
@@ -4703,15 +4714,24 @@ namespace Catch {
     }
 
     bool replaceInPlace(std::string& str, std::string const& replaceThis, std::string const& withThis) {
-        bool replaced = false;
         std::size_t i = str.find(replaceThis);
-        while(i != std::string::npos) {
-            replaced = true;
-            str = str.substr(0, i) + withThis + str.substr(i + replaceThis.size());
-            if(i < str.size() - withThis.size()) i = str.find(replaceThis, i + withThis.size());
+        if(i == std::string::npos) { return false; }
+        std::size_t copyBegin = 0;
+        std::string origStr = CATCH_MOVE(str);
+        str.clear();
+        // There is at least one replacement, so reserve with the best guess
+        // we can make without actually counting the number of occurences.
+        str.reserve(origStr.size() - replaceThis.size() + withThis.size());
+        do {
+            str.append(origStr, copyBegin, i - copyBegin);
+            str += withThis;
+            copyBegin = i + replaceThis.size();
+            if(copyBegin < origStr.size()) i = origStr.find(replaceThis, copyBegin);
             else i = std::string::npos;
         }
-        return replaced;
+        while(i != std::string::npos);
+        if(copyBegin < origStr.size()) { str.append(origStr, copyBegin, origStr.size()); }
+        return true;
     }
 
     std::vector<StringRef> splitStringRef(StringRef str, char delimiter) {
@@ -6875,8 +6895,8 @@ namespace Catch {
         StreamingReporterBase::testRunEnded(_testRunStats);
     }
 
-    void ConsoleReporter::testRunStarting(TestRunInfo const& _testInfo) {
-        StreamingReporterBase::testRunStarting(_testInfo);
+    void ConsoleReporter::testRunStarting(TestRunInfo const& _testRunInfo) {
+        StreamingReporterBase::testRunStarting(_testRunInfo);
         if(m_config->testSpec().hasFilters()) { m_stream << m_colour->guardColour(Colour::BrightYellow) << "Filters: " << m_config->testSpec() << '\n'; }
         m_stream << "Randomness seeded to: " << getSeed() << '\n';
     }
@@ -6993,8 +7013,7 @@ namespace Catch {
             BySectionInfo(SectionInfo const& other)
                 : m_other(other) {}
 
-            BySectionInfo(BySectionInfo const& other)
-                : m_other(other.m_other) {}
+            BySectionInfo(BySectionInfo const& other) = default;
 
             bool operator()(Detail::unique_ptr<CumulativeReporterBase::SectionNode> const& node) const { return ((node->stats.sectionInfo.name == m_other.name) && (node->stats.sectionInfo.lineInfo == m_other.lineInfo)); }
 
@@ -7455,8 +7474,8 @@ namespace Catch {
 
     std::string JsonReporter::getDescription() { return "Outputs listings as JSON. Test listing is Work-in-Progress!"; }
 
-    void JsonReporter::testRunStarting(TestRunInfo const& testInfo) {
-        StreamingReporterBase::testRunStarting(testInfo);
+    void JsonReporter::testRunStarting(TestRunInfo const& runInfo) {
+        StreamingReporterBase::testRunStarting(runInfo);
         endListing();
 
         assert(isInside( Writer::Object ));
@@ -7715,7 +7734,7 @@ namespace Catch {
 
         static void normalizeNamespaceMarkers(std::string& str) {
             std::size_t pos = str.find("::");
-            while(pos != str.npos) {
+            while(pos != std::string::npos) {
                 str.replace(pos, 2, ".");
                 pos += 1;
                 pos = str.find("::", pos);