WIP: devirtualize RunContext

Devirtualize RegistryHub
Unify ITestCaseRegistry and TestRegistry
2025-09-12 00:15:39 +02:00 · 2023-03-21 11:32:44 +01:00 · 2023-03-21 11:30:22 +01:00 · 2023-03-21 11:30:19 +01:00 · 2023-03-21 11:30:17 +01:00 · 2023-03-21 11:30:12 +01:00
232 changed files with 4160 additions and 12339 deletions
--- a/.github/workflows/linux-bazel-builds.yml
+++ b/.github/workflows/linux-bazel-builds.yml
@@ -11,7 +11,7 @@ jobs:
        compilation_mode: [fastbuild, dbg, opt]

    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3

    - name: Mount bazel cache
      uses: actions/cache@v3
--- a/.github/workflows/linux-meson-builds.yml
+++ b/.github/workflows/linux-meson-builds.yml
@@ -18,12 +18,10 @@ jobs:
            other_pkgs: clang-11

    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v2

    - name: Prepare environment
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y meson ninja-build ${{matrix.other_pkgs}}
+      run: sudo apt-get install -y meson ninja-build ${{matrix.other_pkgs}}

    - name: Configure build
      env:
--- a/.github/workflows/linux-other-builds.yml
+++ b/.github/workflows/linux-other-builds.yml
@@ -29,13 +29,13 @@ jobs:
            build_type: Debug
            std: 14
            other_pkgs: g++-7
-            cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON -DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON
+            cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON
          - cxx: g++-7
            build_description: Extras + Examples
            build_type: Release
            std: 14
            other_pkgs: g++-7
-            cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON -DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON
+            cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON

          # Extras and examples with Clang-10
          - cxx: clang++-10
@@ -43,13 +43,13 @@ jobs:
            build_type: Debug
            std: 17
            other_pkgs: clang-10
-            cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON -DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON
+            cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON
          - cxx: clang++-10
            build_description: Extras + Examples
            build_type: Release
            std: 17
            other_pkgs: clang-10
-            cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON -DCATCH_ENABLE_CMAKE_HELPER_TESTS=ON
+            cmake_configurations: -DCATCH_BUILD_EXTRA_TESTS=ON -DCATCH_BUILD_EXAMPLES=ON

          # Configure tests with Clang-10
          - cxx: clang++-10
@@ -70,12 +70,10 @@ jobs:


    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v2

    - name: Prepare environment
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y ninja-build ${{matrix.other_pkgs}}
+      run: sudo apt-get install -y ninja-build ${{matrix.other_pkgs}}

    - name: Configure build
      working-directory: ${{runner.workspace}}
--- a/.github/workflows/linux-simple-builds.yml
+++ b/.github/workflows/linux-simple-builds.yml
@@ -83,7 +83,7 @@ jobs:
            other_pkgs: g++-10

    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v2

    - name: Add repositories for older GCC
      run: |
@@ -92,9 +92,7 @@ jobs:
      if: ${{ matrix.cxx == 'g++-5' || matrix.cxx == 'g++-6' }}

    - name: Prepare environment
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y ninja-build ${{matrix.other_pkgs}}
+      run: sudo apt-get install -y ninja-build ${{matrix.other_pkgs}}

    - name: Configure build
      working-directory: ${{runner.workspace}}
--- a/.github/workflows/mac-builds.yml
+++ b/.github/workflows/mac-builds.yml
@@ -22,7 +22,7 @@ jobs:
            extra_tests: ON

    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v2

    - name: Configure build
      working-directory: ${{runner.workspace}}
@@ -42,10 +42,11 @@ jobs:

    - name: Build tests + lib
      working-directory: ${{runner.workspace}}/build
-      run: make -j `sysctl -n hw.ncpu`
+      run: make -j 2

    - name: Run tests
      env:
          CTEST_OUTPUT_ON_FAILURE: 1
      working-directory: ${{runner.workspace}}/build
-      run: ctest -C ${{matrix.build_type}} -j `sysctl -n hw.ncpu`
+      # Hardcode 2 cores we know are there
+      run: ctest -C ${{matrix.build_type}} -j 2
--- a/.github/workflows/validate-header-guards.yml
+++ b/.github/workflows/validate-header-guards.yml
@@ -9,7 +9,7 @@ jobs:
    steps:

      - name: Checkout source code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2

      - name: Setup Dependencies
        uses: actions/setup-python@v2
--- a/.github/workflows/windows-simple-builds.yml
+++ b/.github/workflows/windows-simple-builds.yml
@@ -13,7 +13,7 @@ jobs:
        build_type: [Debug, Release]
        std: [14, 17]
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2

      - name: Configure build
        working-directory: ${{runner.workspace}}
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -43,15 +43,12 @@ expand_template(
        "#cmakedefine CATCH_CONFIG_NO_GLOBAL_NEXTAFTER": "",
        "#cmakedefine CATCH_CONFIG_NO_POSIX_SIGNALS": "",
        "#cmakedefine CATCH_CONFIG_NO_USE_ASYNC": "",
-        "#cmakedefine CATCH_CONFIG_NO_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT": "",
        "#cmakedefine CATCH_CONFIG_NO_WCHAR": "",
        "#cmakedefine CATCH_CONFIG_NO_WINDOWS_SEH": "",
        "#cmakedefine CATCH_CONFIG_NOSTDOUT": "",
        "#cmakedefine CATCH_CONFIG_POSIX_SIGNALS": "",
        "#cmakedefine CATCH_CONFIG_PREFIX_ALL": "",
-        "#cmakedefine CATCH_CONFIG_PREFIX_MESSAGES": "",
        "#cmakedefine CATCH_CONFIG_SHARED_LIBRARY": "",
-        "#cmakedefine CATCH_CONFIG_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT": "",
        "#cmakedefine CATCH_CONFIG_USE_ASYNC": "",
        "#cmakedefine CATCH_CONFIG_WCHAR": "",
        "#cmakedefine CATCH_CONFIG_WINDOWS_CRTDBG": "",
--- a/CMake/CatchConfigOptions.cmake
+++ b/CMake/CatchConfigOptions.cmake
@@ -18,12 +18,10 @@
 macro(AddOverridableConfigOption OptionBaseName)
  option(CATCH_CONFIG_${OptionBaseName} "Read docs/configuration.md for details" OFF)
  option(CATCH_CONFIG_NO_${OptionBaseName} "Read docs/configuration.md for details" OFF)
-  mark_as_advanced(CATCH_CONFIG_${OptionBaseName} CATCH_CONFIG_NO_${OptionBaseName})
 endmacro()

 macro(AddConfigOption OptionBaseName)
  option(CATCH_CONFIG_${OptionBaseName} "Read docs/configuration.md for details" OFF)
-  mark_as_advanced(CATCH_CONFIG_${OptionBaseName})
 endmacro()

 set(_OverridableOptions
@@ -43,7 +41,6 @@ set(_OverridableOptions
  "WCHAR"
  "WINDOWS_SEH"
  "GETENV"
-  "EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT"
 )

 foreach(OptionName ${_OverridableOptions})
@@ -64,7 +61,6 @@ set(_OtherConfigOptions
  "FAST_COMPILE"
  "NOSTDOUT"
  "PREFIX_ALL"
-  "PREFIX_MESSAGES"
  "WINDOWS_CRTDBG"
 )

@@ -72,17 +68,11 @@ set(_OtherConfigOptions
 foreach(OptionName ${_OtherConfigOptions})
  AddConfigOption(${OptionName})
 endforeach()
-if(DEFINED BUILD_SHARED_LIBS)
-    set(CATCH_CONFIG_SHARED_LIBRARY ${BUILD_SHARED_LIBS})
-else()
-    set(CATCH_CONFIG_SHARED_LIBRARY "")
-endif()
+set(CATCH_CONFIG_SHARED_LIBRARY ${BUILD_SHARED_LIBS})

 set(CATCH_CONFIG_DEFAULT_REPORTER "console" CACHE STRING "Read docs/configuration.md for details. The name of the reporter should be without quotes.")
 set(CATCH_CONFIG_CONSOLE_WIDTH "80" CACHE STRING "Read docs/configuration.md for details. Must form a valid integer literal.")

-mark_as_advanced(CATCH_CONFIG_SHARED_LIBRARY CATCH_CONFIG_DEFAULT_REPORTER CATCH_CONFIG_CONSOLE_WIDTH)
-
 # There is no good way to both turn this into a CMake cache variable,
 # and keep reasonable default semantics inside the project. Thus we do
 # not define it and users have to provide it as an outside variable.
--- a/CMake/CatchMiscFunctions.cmake
+++ b/CMake/CatchMiscFunctions.cmake
@@ -46,6 +46,7 @@ function(add_warnings_to_targets targets)
        set(CHECKED_WARNING_FLAGS
          "-Wabsolute-value"
          "-Wall"
+          "-Wc++20-compat"
          "-Wcall-to-pure-virtual-from-ctor-dtor"
          "-Wcast-align"
          "-Wcatch-value"
@@ -73,7 +74,6 @@ function(add_warnings_to_targets targets)
          "-Woverloaded-virtual"
          "-Wparentheses"
          "-Wpedantic"
-          "-Wredundant-decls"
          "-Wreorder"
          "-Wreturn-std-move"
          "-Wshadow"
@@ -83,7 +83,7 @@ function(add_warnings_to_targets targets)
          "-Wundef"
          "-Wuninitialized"
          "-Wunneeded-internal-declaration"
-          "-Wunreachable-code-aggressive"
+          "-Wunreachable-code"
          "-Wunused"
          "-Wunused-function"
          "-Wunused-parameter"
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,6 @@ cmake_dependent_option(CATCH_ENABLE_COVERAGE "Generate coverage for codecov.io"
 cmake_dependent_option(CATCH_ENABLE_WERROR "Enables Werror during build" ON "CATCH_DEVELOPMENT_BUILD" OFF)
 cmake_dependent_option(CATCH_BUILD_SURROGATES "Enable generating and building surrogate TUs for the main headers" OFF "CATCH_DEVELOPMENT_BUILD" OFF)
 cmake_dependent_option(CATCH_ENABLE_CONFIGURE_TESTS "Enable CMake configuration tests. WARNING: VERY EXPENSIVE" OFF "CATCH_DEVELOPMENT_BUILD" OFF)
-cmake_dependent_option(CATCH_ENABLE_CMAKE_HELPER_TESTS "Enable CMake helper tests. WARNING: VERY EXPENSIVE" OFF "CATCH_DEVELOPMENT_BUILD" OFF)


 # Catch2's build breaks if done in-tree. You probably should not build
@@ -32,7 +31,7 @@ if (CMAKE_BINARY_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
 endif()

 project(Catch2
-  VERSION 3.5.0 # CML version placeholder, don't delete
+  VERSION 3.3.2 # CML version placeholder, don't delete
  LANGUAGES CXX
  # HOMEPAGE_URL is not supported until CMake version 3.12, which
  # we do not target yet.
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -18,8 +18,7 @@
                "CATCH_BUILD_EXAMPLES": "ON",
                "CATCH_BUILD_EXTRA_TESTS": "ON",
                "CATCH_BUILD_SURROGATES": "ON",
-                "CATCH_ENABLE_CONFIGURE_TESTS": "ON",
-                "CATCH_ENABLE_CMAKE_HELPER_TESTS": "ON"
+                "CATCH_ENABLE_CONFIGURE_TESTS": "ON"
            }
        }
    ]   
--- a/WORKSPACE.bazel
+++ b/WORKSPACE.bazel
@@ -4,10 +4,10 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

 http_archive(
    name = "bazel_skylib",
-    sha256 = "66ffd9315665bfaafc96b52278f57c7e2dd09f5ede279ea6d39b2be471e7e3aa",
+    sha256 = "b8a1527901774180afc798aeb28c4634bdccf19c4d98e7bdd1ce79d1fe9aaad7",
    urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.4.2/bazel-skylib-1.4.2.tar.gz",
-        "https://github.com/bazelbuild/bazel-skylib/releases/download/1.4.2/bazel-skylib-1.4.2.tar.gz",
+        "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz",
+        "https://github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz",
    ],
 )

--- a/appveyor.yml
+++ b/appveyor.yml
@@ -70,3 +70,14 @@ environment:
      additional_flags: "/permissive- /std:c++latest"
      platform: x64
      configuration: Debug
+
+    - FLAVOR: VS 2017 x64 Debug
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      platform: x64
+      configuration: Debug
+
+    - FLAVOR: VS 2017 x64 Release Coverage
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      coverage: 1
+      platform: x64
+      configuration: Debug
--- a/docs/benchmarks.md
+++ b/docs/benchmarks.md
@@ -93,7 +93,7 @@ Fibonacci
 -------------------------------------------------------------------------------
 C:\path\to\Catch2\Benchmark.tests.cpp(10)
 ...............................................................................
-benchmark name                                  samples       iterations    est run time
+benchmark name                                  samples       iterations    estimated
                                                mean          low mean      high mean
                                                std dev       low std dev   high std dev
 -------------------------------------------------------------------------------
--- a/docs/ci-and-misc.md
+++ b/docs/ci-and-misc.md
@@ -82,7 +82,7 @@ variable set to "1".

 ### CodeCoverage module (GCOV, LCOV...)

-If you are using GCOV tool to get testing coverage of your code, and are not sure how to integrate it with CMake and Catch, there should be an external example over at https://github.com/claremacrae/catch_cmake_coverage
+If you are using GCOV tool to get testing coverage of your code, and are not sure how to integrate it with CMake and Catch, there should be an external example over at https://github.com/fkromer/catch_cmake_coverage


 ### pkg-config
--- a/docs/cmake-integration.md
+++ b/docs/cmake-integration.md
@@ -51,7 +51,7 @@ Include(FetchContent)
 FetchContent_Declare(
  Catch2
  GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-  GIT_TAG        v3.4.0 # or a later release
+  GIT_TAG        v3.0.1 # or a later release
 )

 FetchContent_MakeAvailable(Catch2)
@@ -126,7 +126,6 @@ catch_discover_tests(target
                     [OUTPUT_DIR dir]
                     [OUTPUT_PREFIX prefix]
                     [OUTPUT_SUFFIX suffix]
-                     [DISCOVERY_MODE <POST_BUILD|PRE_TEST>]
 )
 ```

@@ -199,16 +198,6 @@ If specified, `suffix` is added to each output file name, like so
 `--out dir/<test_name>suffix`. This can be used to add a file extension to
 the output file name e.g. ".xml".

-* `DISCOVERY_MODE mode`
-
-If specified allows control over when test discovery is performed.
-For a value of `POST_BUILD` (default) test discovery is performed at build time.
-For a value of `PRE_TEST` test discovery is delayed until just prior to test
-execution (useful e.g. in cross-compilation environments).
-``DISCOVERY_MODE`` defaults to the value of the
-``CMAKE_CATCH_DISCOVER_TESTS_DISCOVERY_MODE`` variable if it is not passed when
-calling ``catch_discover_tests``. This provides a mechanism for globally
-selecting a preferred test discovery behavior.

 ### `ParseAndAddCatchTests.cmake`

--- a/docs/command-line.md
+++ b/docs/command-line.md
@@ -85,102 +85,43 @@ Click one of the following links to take you straight to that option - or scroll

 <pre>&lt;test-spec> ...</pre>

-By providing a test spec, you filter which tests will be run. If you call
-Catch2 without any test spec, then it will run all non-hidden test
-cases. A test case is hidden if it has the `[!benchmark]` tag, any tag
-with a dot at the start, e.g. `[.]` or `[.foo]`.
+Test cases, wildcarded test cases, tags and tag expressions are all passed directly as arguments. Tags are distinguished by being enclosed in square brackets.

-There are three basic test specs that can then be combined into more
-complex specs:
+If no test specs are supplied then all test cases, except "hidden" tests, are run.
+A test is hidden by giving it any tag starting with (or just) a period (```.```) - or, in the deprecated case, tagged ```[hide]``` or given name starting with `'./'`. To specify hidden tests from the command line ```[.]``` or ```[hide]``` can be used *regardless of how they were declared*.

-  * Full test name, e.g. `"Test 1"`.
+Specs must be enclosed in quotes if they contain spaces. If they do not contain spaces the quotes are optional.

-    This allows only test cases whose name is "Test 1".
+Wildcards consist of the `*` character at the beginning and/or end of test case names and can substitute for any number of any characters (including none).

-  * Wildcarded test name, e.g. `"*Test"`, or `"Test*"`, or `"*Test*"`.
+Test specs are case insensitive.

-    This allows any test case whose name ends with, starts with, or contains
-    in the middle the string "Test". Note that the wildcard can only be at
-    the start or end.
+If a spec is prefixed with `exclude:` or the `~` character then the pattern matches an exclusion. This means that tests matching the pattern are excluded from the set - even if a prior inclusion spec included them. Subsequent inclusion specs will take precedence, however.
+Inclusions and exclusions are evaluated in left-to-right order.

-  * Tag name, e.g. `[some-tag]`.
+Test case examples:

-    This allows any test case tagged with "[some-tag]". Remember that some
-    tags are special, e.g. those that start with "." or with "!".
-
-
-You can also combine the basic test specs to create more complex test
-specs. You can:
-
-  * Concatenate specs to apply all of them, e.g. `[some-tag][other-tag]`.
-
-    This allows test cases that are tagged with **both** "[some-tag]" **and**
-    "[other-tag]". A test case with just "[some-tag]" will not pass the filter,
-    nor will test case with just "[other-tag]".
-
-  * Comma-join specs to apply any of them, e.g. `[some-tag],[other-tag]`.
-
-    This allows test cases that are tagged with **either** "[some-tag]" **or**
-    "[other-tag]". A test case with both will obviously also pass the filter.
-
-    Note that commas take precendence over simple concatenation. This means
-    that `[a][b],[c]` accepts tests that are tagged with either both "[a]" and
-    "[b]", or tests that are tagged with just "[c]".
-
-  * Negate the spec by prepending it with `~`, e.g. `~[some-tag]`.
-
-    This rejects any test case that is tagged with "[some-tag]". Note that
-    rejection takes precedence over other filters.
-
-    Note that negations always binds to the following _basic_ test spec.
-    This means that `~[foo][bar]` negates only the "[foo]" tag and not the
-    "[bar]" tag.
-
-Note that when Catch2 is deciding whether to include a test, first it
-checks whether the test matches any negative filters. If it does,
-the test is rejected. After that, the behaviour depends on whether there
-are positive filters as well. If there are no positive filters, all
-remaining non-hidden tests are included. If there are positive filters,
-only tests that match the positive filters are included.
-
-You can also match test names with special characters by escaping them
-with a backslash (`"\"`), e.g. a test named `"Do A, then B"` is matched
-by "Do A\, then B" test spec. Backslash also escapes itself.
-
-
-### Examples
-
-Given these TEST_CASEs,
 ```
-TEST_CASE("Test 1") {}
-
-TEST_CASE("Test 2", "[.foo]") {}
-
-TEST_CASE("Test 3", "[.bar]") {}
-
-TEST_CASE("Test 4", "[.][foo][bar]") {}
+thisTestOnly            Matches the test case called, 'thisTestOnly'
+"this test only"        Matches the test case called, 'this test only'
+these*                  Matches all cases starting with 'these'
+exclude:notThis         Matches all tests except, 'notThis'
+~notThis                Matches all tests except, 'notThis'
+~*private*              Matches all tests except those that contain 'private'
+a* ~ab* abc             Matches all tests that start with 'a', except those that
+                        start with 'ab', except 'abc', which is included
+~[tag1]                 Matches all tests except those tagged with '[tag1]'
+-# [#somefile]          Matches all tests from the file 'somefile.cpp'
 ```

-this is the result of these filters
-```
-./tests                      # Selects only the first test, others are hidden
-./tests "Test 1"             # Selects only the first test, other do not match
-./tests ~"Test 1"            # Selects no tests. Test 1 is rejected, other tests are hidden
-./tests "Test *"             # Selects all tests.
-./tests [bar]                # Selects tests 3 and 4. Other tests are not tagged [bar]
-./tests ~[foo]               # Selects test 1, because it is the only non-hidden test without [foo] tag
-./tests [foo][bar]           # Selects test 4.
-./tests [foo],[bar]          # Selects tests 2, 3, 4.
-./tests ~[foo][bar]          # Selects test 3. 2 and 4 are rejected due to having [foo] tag
-./tests ~"Test 2"[foo]       # Selects test 4, because test 2 is explicitly rejected
-./tests [foo][bar],"Test 1"  # Selects tests 1 and 4.
-./tests "Test 1*"            # Selects test 1, wildcard can match zero characters
-```
+Names within square brackets are interpreted as tags.
+A series of tags form an AND expression whereas a comma-separated sequence forms an OR expression. e.g.:

-_Note: Using plain asterisk on a command line can cause issues with shell
-expansion. Make sure that the asterisk is passed to Catch2 and is not
-interpreted by the shell._
+<pre>[one][two],[three]</pre>
+This matches all tests tagged `[one]` and `[two]`, as well as all tests tagged `[three]`

+Test names containing special characters, such as `,` or `[` can specify them on the command line using `\`.
+`\` also escapes itself.

 <a id="choosing-a-reporter-to-use"></a>
 ## Choosing a reporter to use
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -15,7 +15,6 @@
 [Enabling stringification](#enabling-stringification)<br>
 [Disabling exceptions](#disabling-exceptions)<br>
 [Overriding Catch's debug break (`-b`)](#overriding-catchs-debug-break--b)<br>
-[Static analysis support](#static-analysis-support)<br>

 Catch2 is designed to "just work" as much as possible, and most of the
 configuration options below are changed automatically during compilation,
@@ -26,8 +25,7 @@ with the same name.

 ## Prefixing Catch macros

-    CATCH_CONFIG_PREFIX_ALL       // Prefix all macros with CATCH_
-    CATCH_CONFIG_PREFIX_MESSAGES  // Prefix only INFO, UNSCOPED_INFO, WARN and CAPTURE
+    CATCH_CONFIG_PREFIX_ALL

 To keep test code clean and uncluttered Catch uses short macro names (e.g. ```TEST_CASE``` and ```REQUIRE```). Occasionally these may conflict with identifiers from platform headers or the system under test. In this case the above identifier can be defined. This will cause all the Catch user macros to be prefixed with ```CATCH_``` (e.g. ```CATCH_TEST_CASE``` and ```CATCH_REQUIRE```).

@@ -266,31 +264,6 @@ The macro will be used as is, that is, `CATCH_BREAK_INTO_DEBUGGER();`
 must compile and must break into debugger.


-## Static analysis support
-
-> Introduced in Catch2 3.4.0.
-
-Some parts of Catch2, e.g. `SECTION`s, can be hard for static analysis
-tools to reason about. Catch2 can change its internals to help static
-analysis tools reason about the tests.
-
-Catch2 automatically detects some static analysis tools (initial
-implementation checks for clang-tidy and Coverity), but you can override
-its detection (in either direction) via
-
-```
-CATCH_CONFIG_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT     // force enables static analysis help
-CATCH_CONFIG_NO_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT  // force disables static analysis help
-```
-
-_As the name suggests, this is currently experimental, and thus we provide
-no backwards compatibility guarantees._
-
-**DO NOT ENABLE THIS FOR BUILDS YOU INTEND TO RUN.** The changed internals
-are not meant to be runnable, only "scannable".
-
-
-
 ---

 [Home](Readme.md#top)
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -10,7 +10,6 @@
 [Does Catch2 support running tests in parallel?](#does-catch2-support-running-tests-in-parallel)<br>
 [Can I compile Catch2 into a dynamic library?](#can-i-compile-catch2-into-a-dynamic-library)<br>
 [What repeatability guarantees does Catch2 provide?](#what-repeatability-guarantees-does-catch2-provide)<br>
-[My build cannot find `catch2/catch_user_config.hpp`, how can I fix it?](#my-build-cannot-find-catch2catch_user_confighpp-how-can-i-fix-it)<br>


 ## How do I run global setup/teardown only if tests will be run?
@@ -29,7 +28,7 @@ depending on how often the cleanup needs to happen.
 ## Why cannot I derive from the built-in reporters?

 They are not made to be overridden, in that we do not attempt to maintain
-a consistent internal state if a member function is overridden, and by
+a consistent internal state if a member function is overriden, and by
 forbidding users from using them as a base class, we can refactor them
 as needed later.

@@ -84,30 +83,12 @@ and it is also generally repeatable across versions, but we might break
 it from time to time. E.g. we broke repeatability with previous versions
 in v2.13.4 so that test cases with similar names are shuffled better.

-Since Catch2 3.5.0 the random generators use custom distributions,
-that should be repeatable across different platforms, with few caveats.
-For details see the section on random generators in the [Generator
-documentation](generators.md#random-number-generators-details).
-
-Before this version, random generators relied on distributions from
-platform's stdlib. We thus can provide no extra guarantee on top of the
-ones given by your platform. **Important: `<random>`'s distributions
+Random generators currently rely on platform's stdlib, specifically
+the distributions from `<random>`. We thus provide no extra guarantee
+above what your platform does. **Important: `<random>`'s distributions
 are not specified to be repeatable across different platforms.**


-## My build cannot find `catch2/catch_user_config.hpp`, how can I fix it?
-
-`catch2/catch_user_config.hpp` is a generated header that contains user
-compile time configuration. It is generated by CMake/Meson/Bazel during
-build. If you are not using either of these, your three options are to
-
-1) Build Catch2 separately using build tool that will generate the header
-2) Use the amalgamated files to build Catch2
-3) Use CMake to configure a build. This will generate the header and you
-   can copy it into your own checkout of Catch2.
-
-
-
 ---

 [Home](Readme.md#top)
--- a/docs/generators.md
+++ b/docs/generators.md
@@ -134,7 +134,7 @@ type, making their usage much nicer. These are
 * `map<T>(func, GeneratorWrapper<U>&&)` for `MapGenerator<T, U, Func>` (map `U` to `T`)
 * `chunk(chunk-size, GeneratorWrapper<T>&&)` for `ChunkGenerator<T>`
 * `random(IntegerOrFloat a, IntegerOrFloat b)` for `RandomIntegerGenerator` or `RandomFloatGenerator`
-* `range(Arithmetic start, Arithmetic end)` for `RangeGenerator<Arithmetic>` with a step size of `1`
+* `range(Arithemtic start, Arithmetic end)` for `RangeGenerator<Arithmetic>` with a step size of `1`
 * `range(Arithmetic start, Arithmetic end, Arithmetic step)` for `RangeGenerator<Arithmetic>` with a custom step size
 * `from_range(InputIterator from, InputIterator to)` for `IteratorGenerator<T>`
 * `from_range(Container const&)` for `IteratorGenerator<T>`
@@ -189,31 +189,6 @@ TEST_CASE("type conversion", "[generators]") {
 }
 ```

-
-### Random number generators: details
-
-> This section applies from Catch2 3.5.0. Before that, random generators
-> were a thin wrapper around distributions from `<random>`.
-
-All of the `random(a, b)` generators in Catch2 currently generate uniformly
-distributed number in closed interval \[a; b\]. This  is different from
-`std::uniform_real_distribution`, which should return numbers in interval
-\[a; b) (but due to rounding can end up returning b anyway), but the
-difference is intentional, so that `random(a, a)` makes sense. If there is
-enough interest from users, we can provide API to pick any of CC, CO, OC,
-or OO ranges.
-
-Unlike `std::uniform_int_distribution`, Catch2's generators also support
-various single-byte integral types, such as `char` or `bool`.
-
-Given the same seed, the output from the integral generators is
-reproducible across different platforms. For floating point generators,
-we only promise reproducibility on platforms that obey the IEEE 754
-standard, and where `float` is 4 bytes and `double` is 8 bytes. We provide
-no guarantees for `long double`, as the internals of `long double` can
-vary wildly across different platforms.
-
-
 ## Generator interface

 You can also implement your own generators, by deriving from the
@@ -246,21 +221,3 @@ For full example of implementing your own generator, look into Catch2's
 examples, specifically
 [Generators: Create your own generator](../examples/300-Gen-OwnGenerator.cpp).

-
-### Handling empty generators
-
-The generator interface assumes that a generator always has at least one
-element. This is not always true, e.g. if the generator depends on an external
-datafile, the file might be missing.
-
-There are two ways to handle this, depending on whether you want this
-to be an error or not.
-
- * If empty generator **is** an error, throw an exception in constructor.
- * If empty generator **is not** an error, use the [`SKIP`](skipping-passing-failing.md#skipping-test-cases-at-runtime) in constructor.
-
-
-
---
-
-[Home](Readme.md#top)
--- a/docs/limitations.md
+++ b/docs/limitations.md
@@ -173,3 +173,13 @@ TEST_CASE("b") {

 If you are seeing a problem like this, i.e. weird test paths that trigger only under Clang with `libc++`, or only under very specific version of `libstdc++`, it is very likely you are seeing this. The only known workaround is to use a fixed version of your standard library.

+
+### libstdc++, `_GLIBCXX_DEBUG` macro and random ordering of tests
+
+Running a Catch2 binary compiled against libstdc++ with `_GLIBCXX_DEBUG`
+macro defined with `--order rand` will cause a debug check to trigger and
+abort the run due to self-assignment.
+[This is a known bug inside libstdc++](https://stackoverflow.com/questions/22915325/avoiding-self-assignment-in-stdshuffle/23691322)
+
+Workaround: Don't use `--order rand` when compiling against debug-enabled
+libstdc++.
--- a/docs/matchers.md
+++ b/docs/matchers.md
@@ -286,7 +286,7 @@ comparable. (e.g. you may compare `std::vector<int>` to `std::array<char>`).
 `UnorderedRangeEquals` is similar to `RangeEquals`, but the order
 does not matter. For example "1, 2, 3" would match "3, 2, 1", but not
 "1, 1, 2, 3" As with `RangeEquals`, `UnorderedRangeEquals` compares
-the individual elements using `operator==` by default.
+the individual elements using using `operator==` by default.

 Both `RangeEquals` and `UnorderedRangeEquals` optionally accept a
 predicate which can be used to compare the containers element-wise.
--- a/docs/opensource-users.md
+++ b/docs/opensource-users.md
@@ -95,9 +95,6 @@ A C++ client library for Consul. Consul is a distributed tool for discovering an
 ### [Reactive-Extensions/ RxCpp](https://github.com/Reactive-Extensions/RxCpp)
 A library of algorithms for values-distributed-in-time.

-### [SFML](https://github.com/SFML/SFML)
-Simple and Fast Multimedia Library.
-
 ### [SOCI](https://github.com/SOCI/soci)
 The C++ Database Access Library.

@@ -146,7 +143,7 @@ Newsbeuter is an open-source RSS/Atom feed reader for text terminals.
 A 2D, Zombie, RPG game which is being made on our own engine.

 ### [raspigcd](https://github.com/pantadeusz/raspigcd)
-Low level CLI app and library for execution of GCODE on Raspberry Pi without any additional microcontrollers (just RPi + Stepsticks).
+Low level CLI app and library for execution of GCODE on Raspberry Pi without any additional microcontrolers (just RPi + Stepsticks).

 ### [SpECTRE](https://github.com/sxs-collaboration/spectre)
 SpECTRE is a code for multi-scale, multi-physics problems in astrophysics and gravitational physics.
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -2,8 +2,6 @@

 # Release notes
 **Contents**<br>
-[3.5.0](#350)<br>
-[3.4.0](#340)<br>
 [3.3.2](#332)<br>
 [3.3.1](#331)<br>
 [3.3.0](#330)<br>
@@ -59,69 +57,6 @@



-## 3.5.0
-
-### Improvements
-* Introduced `CATCH_CONFIG_PREFIX_MESSAGES` to prefix only logging macros (#2544)
-  * This means `INFO`, `UNSCOPED_INFO`, `WARN` and `CAPTURE`.
-* Section hints in static analysis mode are now `const`
-  * This prevents Clang-Tidy from complaining about `misc-const-correctness`.
-* `from_range` generator supports C arrays and ranges that require ADL (#2737)
-* Stringification support for `std::optional` now also includes `std::nullopt` (#2740)
-* The Console reporter flushes output after writing benchmark runtime estimate.
-  * This means that you can immediately see for how long the benchmark is expected to run.
-* Added workaround to enable compilation with ICC 19.1 (#2551, #2766)
-* Compiling Catch2 for XBox should work out of the box (#2772)
-  * Catch2 should automatically disable getenv when compiled for XBox.
-* Compiling Catch2 with exceptions disabled no longer triggers `Wunused-function` (#2726)
-* **`random` Generators for integral types are now reproducible across different platforms**
-  * Unlike `<rando>`, Catch2's generators also support 1 byte integral types (`char`, `bool`, ...)
-* **`random` Generators for `float` and `double` are now reproducible across different platforms**
-  * `long double` varies across different platforms too much to be reproducible
-  * This guarantee applies only to platforms with IEEE 754 floats.
-
-### Fixes
-* UDL declaration inside Catch2 are now strictly conforming to the standard
-  * `operator "" _a` is UB, `operator ""_a` is fine. Seriously.
-* Fixed `CAPTURE` tests failing to compile in C++23 mode (#2744)
-* Fixed missing include in `catch_message.hpp` (#2758)
-* Fixed `CHECK_ELSE` suppressing failure from uncaught exceptions(#2723)
-
-### Miscellaneous
-* The documentation for specifying which tests to run through commandline has been completely rewritten (#2738)
-* Fixed installation when building Catch2 with meson (#2722, #2742)
-* Fixed `catch_discover_tests` when using custom reporter and `PRE_TEST` discovery mode (#2747)
-* `catch_discover_tests` supports multi-config CMake generator in `PRE_TEST` discovery mode (#2739, #2746)
-
-
-## 3.4.0
-
-### Improvements
-* `VectorEquals` supports elements that provide only `==` and not `!=` (#2648)
-* Catch2 supports compiling with IAR compiler (#2651)
-* Various small internal performance improvements
-* Various small internal compilation time improvements
-* XMLReporter now reports location info for INFO and WARN (#1251)
-  * This bumps up the xml format version to 3
-* Documented that `SKIP` in generator constructor can be used to handle empty  generator (#1593)
-* Added experimental static analysis support to `TEST_CASE` and `SECTION` macros (#2681)
-  * The two macros are redefined in a way that helps the SA tools reason about the possible paths through a test case with sections.
-  * The support is controlled by the `CATCH_CONFIG_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT` option and autodetects clang-tidy and Coverity.
-* `*_THROWS`, `*_THROWS_AS`, etc now suppress warning coming from `__attribute__((warn_unused_result))` on GCC  (#2691)
-  * Unlike plain `[[nodiscard]]`, this warning is not silenced by void cast. WTF GCC?
-
-### Fixes
-* Fixed `assertionStarting` events being sent after the expr is evaluated (#2678)
-* Errors in `TEST_CASE` tags are now reported nicely (#2650)
-
-### Miscellaneous
-* Bunch of improvements to `catch_discover_tests`
-  * Added DISCOVERY_MODE option, so the discovery can happen either post build or pre-run.
-  * Fixed handling of semicolons and backslashes in test names (#2674, #2676)
-* meson build can disable building tests (#2693)
-* meson build properly sets meson version 0.54.1 as the minimal supported version (#2688)
-
-
 ## 3.3.2

 ### Improvements
@@ -214,7 +149,7 @@

 ### Fixes
 * Cleaned out some warnings and static analysis issues
-  * Suppressed `-Wcomma` warning rarely occurring in templated test cases (#2543)
+  * Suppressed `-Wcomma` warning rarely occuring in templated test cases (#2543)
  * Constified implementation details in `INFO` (#2564)
  * Made `MatcherGenericBase` copy constructor const (#2566)
 * Fixed serialization of test filters so the output roundtrips
@@ -417,7 +352,7 @@ v3 releases.
 * Added `STATIC_CHECK` macro, similar to `STATIC_REQUIRE` (#2318)
  * When deferred tu runtime, it behaves like `CHECK`, and not like `REQUIRE`.
 * You can have multiple tests with the same name, as long as other parts of the test identity differ (#1915, #1999, #2175)
-  * Test identity includes test's name, test's tags and test's class name if applicable.
+  * Test identity includes test's name, test's tags and and test's class name if applicable.
 * Added new warning, `UnmatchedTestSpec`, to error on test specs with no matching tests
 * The `-w`, `--warn` warning flags can now be provided multiple times to enable multiple warnings
 * The case-insensitive handling of tags is now more reliable and takes up less memory
@@ -582,7 +517,7 @@ v3 releases.
  * The `SECTION`(s) before the `GENERATE` will not be run multiple times, the following ones will.
 * Added `-D`/`--min-duration` command line flag (#1910)
  * If a test takes longer to finish than the provided value, its name and duration will be printed.
-  * This flag is overridden by setting `-d`/`--duration`.
+  * This flag is overriden by setting `-d`/`--duration`.

 ### Fixes
 * `TAPReporter` no longer skips successful assertions (#1983)
@@ -650,7 +585,7 @@ v3 releases.
 ### Fixes
 * Fixed computation of benchmarking column widths in ConsoleReporter (#1885, #1886)
 * Suppressed clang-tidy's `cppcoreguidelines-pro-type-vararg` in assertions (#1901)
-  * It was a false positive triggered by the new warning support workaround
+  * It was a false positive trigered by the new warning support workaround
 * Fixed bug in test specification parser handling of OR'd patterns using escaping (#1905)

 ### Miscellaneous
@@ -987,7 +922,7 @@ v3 releases.

 ### Contrib
 * `ParseAndAddCatchTests` has learned how to use `DISABLED` CTest property (#1452)
-* `ParseAndAddCatchTests` now works when there is a whitespace before the test name (#1493)
+* `ParseAndAddCatchTests` now works when there is a whitspace before the test name (#1493)


 ### Miscellaneous
--- a/docs/reporter-events.md
+++ b/docs/reporter-events.md
@@ -96,12 +96,12 @@ void assertionStarting( AssertionInfo const& assertionInfo );
 void assertionEnded( AssertionStats const& assertionStats );
 ```

-The `assertionStarting` event is emitted before the expression in the
-assertion is captured or evaluated and `assertionEnded` is emitted
-afterwards. This means that given assertion like `REQUIRE(a + b == c + d)`,
-Catch2 first emits `assertionStarting` event, then `a + b` and `c + d`
-are evaluated, then their results are captured, the comparison is evaluated,
-and then `assertionEnded` event is emitted.
+`assertionStarting` is called after the expression is captured, but before
+the assertion expression is evaluated. This might seem like a minor
+distinction, but what it means is that if you have assertion like
+`REQUIRE( a + b == c + d )`, then what happens is that `a + b` and `c + d`
+are evaluated before `assertionStarting` is emitted, while the `==` is
+evaluated after the event.


 ## Benchmarking events
--- a/docs/reporters.md
+++ b/docs/reporters.md
@@ -52,7 +52,7 @@ its machine-readable XML output to file `result-junit.xml`, and the
 uses ANSI colour codes for colouring the output.

 Using multiple reporters (or one reporter and one-or-more [event
-listeners](event-listeners.md#top)) can have surprisingly complex semantics
+listeners](event-listener.md#top)) can have surprisingly complex semantics
 when using customization points provided to reporters by Catch2, namely
 capturing stdout/stderr from test cases.

--- a/docs/skipping-passing-failing.md
+++ b/docs/skipping-passing-failing.md
@@ -9,7 +9,7 @@ In some situations it may not be possible to meaningfully execute a test case,
 for example when the system under test is missing certain hardware capabilities.
 If the required conditions can only be determined at runtime, it often
 doesn't make sense to consider such a test case as either passed or failed,
-because it simply cannot run at all.
+because it simply can not run at all.

 To properly express such scenarios, Catch2 provides a way to explicitly
 _skip_ test cases, using the `SKIP` macro:
@@ -84,12 +84,6 @@ exit code, same as it does if no test cases have run. This behaviour can
 be overridden using the [--allow-running-no-tests](command-line.md#no-tests-override)
 flag.

-### `SKIP` inside generators
-
-You can also use the `SKIP` macro inside generator's constructor to handle
-cases where the generator is empty, but you do not want to fail the test
-case.
-

 ## Passing and failing test cases

--- a/docs/test-cases-and-sections.md
+++ b/docs/test-cases-and-sections.md
@@ -231,7 +231,7 @@ TEMPLATE_TEST_CASE( "vectors can be sized and resized", "[vector][template]", in

 > [Introduced](https://github.com/catchorg/Catch2/issues/1468) in Catch2 2.6.0.

-_template-type1_ through _template-typen_ is list of template
+_template-type1_ through _template-typen_ is list of template template
 types which should be combined with each of _template-arg1_ through
 _template-argm_, resulting in _n * m_ test cases. Inside the test case,
 the resulting type is available under the name of `TestType`.
--- a/docs/tostring.md
+++ b/docs/tostring.md
@@ -75,7 +75,7 @@ CATCH_TRANSLATE_EXCEPTION( MyType const& ex ) {

 Enums that already have a `<<` overload for `std::ostream` will convert to strings as expected.
 If you only need to convert enums to strings for test reporting purposes you can provide a `StringMaker` specialisations as any other type.
-However, as a convenience, Catch provides the `REGISTER_ENUM` helper macro that will generate the `StringMaker` specialisation for you with minimal code.
+However, as a convenience, Catch provides the `REGISTER_ENUM` helper macro that will generate the `StringMaker` specialiation for you with minimal code.
 Simply provide it the (qualified) enum name, followed by all the enum values, and you're done!

 E.g.
--- a/docs/tutorial.md
+++ b/docs/tutorial.md
@@ -119,7 +119,7 @@ This is best explained through an example ([code](../examples/100-Fix-Section.cp

 ```c++
 TEST_CASE( "vectors can be sized and resized", "[vector]" ) {
-    // This setup will be done 4 times in total, once for each section
+
    std::vector<int> v( 5 );

    REQUIRE( v.size() == 5 );
@@ -152,12 +152,11 @@ TEST_CASE( "vectors can be sized and resized", "[vector]" ) {
 }
 ```

-For each `SECTION` the `TEST_CASE` is **executed from the start**. This means
+For each `SECTION` the `TEST_CASE` is executed from the start. This means
 that each section is entered with a freshly constructed vector `v`, that
 we know has size 5 and capacity at least 5, because the two assertions
-are also checked before the section is entered. This behaviour may not be
-ideal for tests where setup is expensive. Each run through a test case will
-execute one, and only one, leaf section.
+are also checked before the section is entered. Each run through a test
+case will execute one, and only one, leaf section.

 Section can also be nested, in which case the parent section can be
 entered multiple times, once for each leaf section. Nested sections are
--- a/docs/why-catch.md
+++ b/docs/why-catch.md
@@ -30,7 +30,7 @@ So what does Catch2 bring to the party that differentiates it from these? Apart
 * Output is through modular reporter objects. Basic textual and XML reporters are included. Custom reporters can easily be added.
 * JUnit xml output is supported for integration with third-party tools, such as CI servers.
 * A default main() function is provided, but you can supply your own for complete control (e.g. integration into your own test runner GUI).
-* A command line parser is provided and can still be used if you choose to provide your own main() function.
+* A command line parser is provided and can still be used if you choose to provided your own main() function.
 * Alternative assertion macro(s) report failures but don't abort the test case
 * Good set of facilities for floating point comparisons (`Catch::Approx` and full set of matchers)
 * Internal and friendly macros are isolated so name clashes can be managed
@@ -41,8 +41,8 @@ So what does Catch2 bring to the party that differentiates it from these? Apart

 ## Who else is using Catch2?

-A whole lot of people. According to [the 2022 JetBrains C++ ecosystem survey](https://www.jetbrains.com/lp/devecosystem-2022/cpp/#Which-unit-testing-frameworks-do-you-regularly-use),
-about 12% of C++ programmers use Catch2 for unit testing, making it the
+A whole lot of people. According to the 2021 JetBrains C++ ecosystem survey,
+about 11% of C++ programmers use Catch2 for unit testing, making it the
 second most popular unit testing framework.

 You can also take a look at the (incomplete) list of [open source projects](opensource-users.md#top)
--- a/examples/010-TestCase.cpp
+++ b/examples/010-TestCase.cpp
@@ -1,11 +1,3 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-
 // 010-TestCase.cpp
 // And write tests in the same file:
 #include <catch2/catch_test_macros.hpp>
--- a/examples/020-TestCase-1.cpp
+++ b/examples/020-TestCase-1.cpp
@@ -1,11 +1,3 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-
 // 020-TestCase-1.cpp

 #include <catch2/catch_test_macros.hpp>
--- a/examples/020-TestCase-2.cpp
+++ b/examples/020-TestCase-2.cpp
@@ -1,11 +1,3 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-
 // 020-TestCase-2.cpp

 // main() provided by Catch in file 020-TestCase-1.cpp.
--- a/examples/030-Asn-Require-Check.cpp
+++ b/examples/030-Asn-Require-Check.cpp
@@ -1,11 +1,3 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-
 // 030-Asn-Require-Check.cpp

 // Catch has two natural expression assertion macro's:
--- a/examples/100-Fix-Section.cpp
+++ b/examples/100-Fix-Section.cpp
@@ -1,11 +1,3 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-
 // 100-Fix-Section.cpp

 // Catch has two ways to express fixtures:
--- a/examples/110-Fix-ClassFixture.cpp
+++ b/examples/110-Fix-ClassFixture.cpp
@@ -1,11 +1,3 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-
 // 110-Fix-ClassFixture.cpp

 // Catch has two ways to express fixtures:
--- a/examples/120-Bdd-ScenarioGivenWhenThen.cpp
+++ b/examples/120-Bdd-ScenarioGivenWhenThen.cpp
@@ -1,11 +1,3 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-
 // 120-Bdd-ScenarioGivenWhenThen.cpp

 // main() provided by linkage with Catch2WithMain
--- a/examples/210-Evt-EventListeners.cpp
+++ b/examples/210-Evt-EventListeners.cpp
@@ -1,11 +1,3 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-
 // 210-Evt-EventListeners.cpp

 // Contents:
--- a/examples/231-Cfg-OutputStreams.cpp
+++ b/examples/231-Cfg-OutputStreams.cpp
@@ -1,11 +1,3 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-
 // 231-Cfg-OutputStreams.cpp
 // Show how to replace the streams with a simple custom made streambuf.

--- a/examples/300-Gen-OwnGenerator.cpp
+++ b/examples/300-Gen-OwnGenerator.cpp
@@ -1,11 +1,3 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-
 // 300-Gen-OwnGenerator.cpp
 // Shows how to define a custom generator.

--- a/examples/301-Gen-MapTypeConversion.cpp
+++ b/examples/301-Gen-MapTypeConversion.cpp
@@ -1,11 +1,3 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-
 // 301-Gen-MapTypeConversion.cpp
 // Shows how to use map to modify generator's return type.

--- a/examples/302-Gen-Table.cpp
+++ b/examples/302-Gen-Table.cpp
@@ -1,11 +1,3 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-
 // 302-Gen-Table.cpp
 // Shows how to use table to run a test many times with different inputs. Lifted from examples on
 // issue #850.
@@ -52,11 +44,11 @@ TEST_CASE("Table allows pre-computed test inputs and outputs", "[example][genera

 /* Possible simplifications where less legacy toolchain support is needed:
 *
- * - With libstdc++6 or newer, the make_tuple() calls can be omitted
+ * - With libstdc++6 or newer, the make_tuple() calls can be ommitted
 * (technically C++17 but does not require -std in GCC/Clang). See
 *   https://stackoverflow.com/questions/12436586/tuple-vector-and-initializer-list
 *
- * - In C++17 mode std::tie() and the preceding variable declarations can be
+ * - In C++17 mode std::tie() and the preceding variable delcarations can be
 * replaced by structured bindings: auto [test_input, expected] = GENERATE(
 * table<std::string, size_t>({ ...
 */
--- a/examples/310-Gen-VariablesInGenerators.cpp
+++ b/examples/310-Gen-VariablesInGenerators.cpp
@@ -1,11 +1,3 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-
 // 310-Gen-VariablesInGenerator.cpp
 // Shows how to use variables when creating generators.

--- a/examples/311-Gen-CustomCapture.cpp
+++ b/examples/311-Gen-CustomCapture.cpp
@@ -1,11 +1,3 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-
 // 311-Gen-CustomCapture.cpp
 // Shows how to provide custom capture list to the generator expression

--- a/extras/Catch.cmake
+++ b/extras/Catch.cmake
@@ -35,9 +35,8 @@ same as the Catch name; see also ``TEST_PREFIX`` and ``TEST_SUFFIX``.
                         [TEST_LIST var]
                         [REPORTER reporter]
                         [OUTPUT_DIR dir]
-                         [OUTPUT_PREFIX prefix]
+                         [OUTPUT_PREFIX prefix}
                         [OUTPUT_SUFFIX suffix]
-                         [DISCOVERY_MODE <POST_BUILD|PRE_TEST>]
    )

  ``catch_discover_tests`` sets up a post-build command on the test executable
@@ -124,28 +123,14 @@ same as the Catch name; see also ``TEST_PREFIX`` and ``TEST_SUFFIX``.
    test executable and when the tests are executed themselves. This requires
    cmake/ctest >= 3.22.

-  `DISCOVERY_MODE mode``
-    Provides control over when ``catch_discover_tests`` performs test discovery.
-    By default, ``POST_BUILD`` sets up a post-build command to perform test discovery
-    at build time. In certain scenarios, like cross-compiling, this ``POST_BUILD``
-    behavior is not desirable. By contrast, ``PRE_TEST`` delays test discovery until
-    just prior to test execution. This way test discovery occurs in the target environment
-    where the test has a better chance at finding appropriate runtime dependencies.
-
-    ``DISCOVERY_MODE`` defaults to the value of the
-    ``CMAKE_CATCH_DISCOVER_TESTS_DISCOVERY_MODE`` variable if it is not passed when
-    calling ``catch_discover_tests``. This provides a mechanism for globally selecting
-    a preferred test discovery behavior without having to modify each call site.
-
 #]=======================================================================]

 #------------------------------------------------------------------------------
 function(catch_discover_tests TARGET)
-
  cmake_parse_arguments(
    ""
    ""
-    "TEST_PREFIX;TEST_SUFFIX;WORKING_DIRECTORY;TEST_LIST;REPORTER;OUTPUT_DIR;OUTPUT_PREFIX;OUTPUT_SUFFIX;DISCOVERY_MODE"
+    "TEST_PREFIX;TEST_SUFFIX;WORKING_DIRECTORY;TEST_LIST;REPORTER;OUTPUT_DIR;OUTPUT_PREFIX;OUTPUT_SUFFIX"
    "TEST_SPEC;EXTRA_ARGS;PROPERTIES;DL_PATHS"
    ${ARGN}
  )
@@ -156,128 +141,57 @@ function(catch_discover_tests TARGET)
  if(NOT _TEST_LIST)
    set(_TEST_LIST ${TARGET}_TESTS)
  endif()
+
  if (_DL_PATHS)
    if(${CMAKE_VERSION} VERSION_LESS "3.22.0")
        message(FATAL_ERROR "The DL_PATHS option requires at least cmake 3.22")
    endif()
  endif()
-  if(NOT _DISCOVERY_MODE)
-    if(NOT CMAKE_CATCH_DISCOVER_TESTS_DISCOVERY_MODE)
-      set(CMAKE_CATCH_DISCOVER_TESTS_DISCOVERY_MODE "POST_BUILD")
-    endif()
-    set(_DISCOVERY_MODE ${CMAKE_CATCH_DISCOVER_TESTS_DISCOVERY_MODE})
-  endif()
-  if (NOT _DISCOVERY_MODE MATCHES "^(POST_BUILD|PRE_TEST)$")
-    message(FATAL_ERROR "Unknown DISCOVERY_MODE: ${_DISCOVERY_MODE}")
-  endif()

  ## Generate a unique name based on the extra arguments
  string(SHA1 args_hash "${_TEST_SPEC} ${_EXTRA_ARGS} ${_REPORTER} ${_OUTPUT_DIR} ${_OUTPUT_PREFIX} ${_OUTPUT_SUFFIX}")
  string(SUBSTRING ${args_hash} 0 7 args_hash)

  # Define rule to generate test list for aforementioned test executable
-  set(ctest_file_base "${CMAKE_CURRENT_BINARY_DIR}/${TARGET}-${args_hash}")
-  set(ctest_include_file "${ctest_file_base}_include.cmake")
-  set(ctest_tests_file "${ctest_file_base}_tests.cmake")
-
+  set(ctest_include_file "${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_include-${args_hash}.cmake")
+  set(ctest_tests_file "${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_tests-${args_hash}.cmake")
  get_property(crosscompiling_emulator
    TARGET ${TARGET}
    PROPERTY CROSSCOMPILING_EMULATOR
  )
+  add_custom_command(
+    TARGET ${TARGET} POST_BUILD
+    BYPRODUCTS "${ctest_tests_file}"
+    COMMAND "${CMAKE_COMMAND}"
+            -D "TEST_TARGET=${TARGET}"
+            -D "TEST_EXECUTABLE=$<TARGET_FILE:${TARGET}>"
+            -D "TEST_EXECUTOR=${crosscompiling_emulator}"
+            -D "TEST_WORKING_DIR=${_WORKING_DIRECTORY}"
+            -D "TEST_SPEC=${_TEST_SPEC}"
+            -D "TEST_EXTRA_ARGS=${_EXTRA_ARGS}"
+            -D "TEST_PROPERTIES=${_PROPERTIES}"
+            -D "TEST_PREFIX=${_TEST_PREFIX}"
+            -D "TEST_SUFFIX=${_TEST_SUFFIX}"
+            -D "TEST_LIST=${_TEST_LIST}"
+            -D "TEST_REPORTER=${_REPORTER}"
+            -D "TEST_OUTPUT_DIR=${_OUTPUT_DIR}"
+            -D "TEST_OUTPUT_PREFIX=${_OUTPUT_PREFIX}"
+            -D "TEST_OUTPUT_SUFFIX=${_OUTPUT_SUFFIX}"
+            -D "TEST_DL_PATHS=${_DL_PATHS}"
+            -D "CTEST_FILE=${ctest_tests_file}"
+            -P "${_CATCH_DISCOVER_TESTS_SCRIPT}"
+    VERBATIM
+  )

-  if(_DISCOVERY_MODE STREQUAL "POST_BUILD")
-    add_custom_command(
-      TARGET ${TARGET} POST_BUILD
-      BYPRODUCTS "${ctest_tests_file}"
-      COMMAND "${CMAKE_COMMAND}"
-              -D "TEST_TARGET=${TARGET}"
-              -D "TEST_EXECUTABLE=$<TARGET_FILE:${TARGET}>"
-              -D "TEST_EXECUTOR=${crosscompiling_emulator}"
-              -D "TEST_WORKING_DIR=${_WORKING_DIRECTORY}"
-              -D "TEST_SPEC=${_TEST_SPEC}"
-              -D "TEST_EXTRA_ARGS=${_EXTRA_ARGS}"
-              -D "TEST_PROPERTIES=${_PROPERTIES}"
-              -D "TEST_PREFIX=${_TEST_PREFIX}"
-              -D "TEST_SUFFIX=${_TEST_SUFFIX}"
-              -D "TEST_LIST=${_TEST_LIST}"
-              -D "TEST_REPORTER=${_REPORTER}"
-              -D "TEST_OUTPUT_DIR=${_OUTPUT_DIR}"
-              -D "TEST_OUTPUT_PREFIX=${_OUTPUT_PREFIX}"
-              -D "TEST_OUTPUT_SUFFIX=${_OUTPUT_SUFFIX}"
-              -D "TEST_DL_PATHS=${_DL_PATHS}"
-              -D "CTEST_FILE=${ctest_tests_file}"
-              -P "${_CATCH_DISCOVER_TESTS_SCRIPT}"
-      VERBATIM
-    )
+  file(WRITE "${ctest_include_file}"
+    "if(EXISTS \"${ctest_tests_file}\")\n"
+    "  include(\"${ctest_tests_file}\")\n"
+    "else()\n"
+    "  add_test(${TARGET}_NOT_BUILT-${args_hash} ${TARGET}_NOT_BUILT-${args_hash})\n"
+    "endif()\n"
+  )

-    file(WRITE "${ctest_include_file}"
-      "if(EXISTS \"${ctest_tests_file}\")\n"
-      "  include(\"${ctest_tests_file}\")\n"
-      "else()\n"
-      "  add_test(${TARGET}_NOT_BUILT-${args_hash} ${TARGET}_NOT_BUILT-${args_hash})\n"
-      "endif()\n"
-    )
-
-  elseif(_DISCOVERY_MODE STREQUAL "PRE_TEST")
-
-    get_property(GENERATOR_IS_MULTI_CONFIG GLOBAL
-        PROPERTY GENERATOR_IS_MULTI_CONFIG
-    )
-
-    if(GENERATOR_IS_MULTI_CONFIG)
-      set(ctest_tests_file "${ctest_file_base}_tests-$<CONFIG>.cmake")
-    endif()
-
-    string(CONCAT ctest_include_content
-      "if(EXISTS \"$<TARGET_FILE:${TARGET}>\")"                                    "\n"
-      "  if(NOT EXISTS \"${ctest_tests_file}\" OR"                                 "\n"
-      "     NOT \"${ctest_tests_file}\" IS_NEWER_THAN \"$<TARGET_FILE:${TARGET}>\" OR\n"
-      "     NOT \"${ctest_tests_file}\" IS_NEWER_THAN \"\${CMAKE_CURRENT_LIST_FILE}\")\n"
-      "    include(\"${_CATCH_DISCOVER_TESTS_SCRIPT}\")"                           "\n"
-      "    catch_discover_tests_impl("                                             "\n"
-      "      TEST_EXECUTABLE"        " [==[" "$<TARGET_FILE:${TARGET}>"   "]==]"   "\n"
-      "      TEST_EXECUTOR"          " [==[" "${crosscompiling_emulator}" "]==]"   "\n"
-      "      TEST_WORKING_DIR"       " [==[" "${_WORKING_DIRECTORY}"      "]==]"   "\n"
-      "      TEST_SPEC"              " [==[" "${_TEST_SPEC}"              "]==]"   "\n"
-      "      TEST_EXTRA_ARGS"        " [==[" "${_EXTRA_ARGS}"             "]==]"   "\n"
-      "      TEST_PROPERTIES"        " [==[" "${_PROPERTIES}"             "]==]"   "\n"
-      "      TEST_PREFIX"            " [==[" "${_TEST_PREFIX}"            "]==]"   "\n"
-      "      TEST_SUFFIX"            " [==[" "${_TEST_SUFFIX}"            "]==]"   "\n"
-      "      TEST_LIST"              " [==[" "${_TEST_LIST}"              "]==]"   "\n"
-      "      TEST_REPORTER"          " [==[" "${_REPORTER}"               "]==]"   "\n"
-      "      TEST_OUTPUT_DIR"        " [==[" "${_OUTPUT_DIR}"             "]==]"   "\n"
-      "      TEST_OUTPUT_PREFIX"     " [==[" "${_OUTPUT_PREFIX}"          "]==]"   "\n"
-      "      TEST_OUTPUT_SUFFIX"     " [==[" "${_OUTPUT_SUFFIX}"          "]==]"   "\n"
-      "      CTEST_FILE"             " [==[" "${ctest_tests_file}"        "]==]"   "\n"
-      "      TEST_DL_PATHS"          " [==[" "${_DL_PATHS}"               "]==]"   "\n"
-      "      CTEST_FILE"             " [==[" "${CTEST_FILE}"              "]==]"   "\n"
-      "    )"                                                                      "\n"
-      "  endif()"                                                                  "\n"
-      "  include(\"${ctest_tests_file}\")"                                         "\n"
-      "else()"                                                                     "\n"
-      "  add_test(${TARGET}_NOT_BUILT ${TARGET}_NOT_BUILT)"                        "\n"
-      "endif()"                                                                    "\n"
-    )
-
-    if(GENERATOR_IS_MULTI_CONFIG)
-      foreach(_config ${CMAKE_CONFIGURATION_TYPES})
-        file(GENERATE OUTPUT "${ctest_file_base}_include-${_config}.cmake" CONTENT "${ctest_include_content}" CONDITION $<CONFIG:${_config}>)
-      endforeach()
-      string(CONCAT ctest_include_multi_content
-        "if(NOT CTEST_CONFIGURATION_TYPE)"                                              "\n"
-        "  message(\"No configuration for testing specified, use '-C <cfg>'.\")"        "\n"
-        "else()"                                                                        "\n"
-        "  include(\"${ctest_file_base}_include-\${CTEST_CONFIGURATION_TYPE}.cmake\")"  "\n"
-        "endif()"                                                                       "\n"
-      )
-      file(GENERATE OUTPUT "${ctest_include_file}" CONTENT "${ctest_include_multi_content}")
-    else()
-      file(GENERATE OUTPUT "${ctest_file_base}_include.cmake" CONTENT "${ctest_include_content}")
-      file(WRITE "${ctest_include_file}" "include(\"${ctest_file_base}_include.cmake\")")
-    endif()
-  endif()
-
-  if(NOT ${CMAKE_VERSION} VERSION_LESS "3.10.0")
+  if(NOT ${CMAKE_VERSION} VERSION_LESS "3.10.0") 
    # Add discovered tests to directory TEST_INCLUDE_FILES
    set_property(DIRECTORY
      APPEND PROPERTY TEST_INCLUDE_FILES "${ctest_include_file}"
@@ -290,7 +204,9 @@ function(catch_discover_tests TARGET)
        PROPERTY TEST_INCLUDE_FILE "${ctest_include_file}"
      )
    else()
-      message(FATAL_ERROR "Cannot set more than one TEST_INCLUDE_FILE")
+      message(FATAL_ERROR
+        "Cannot set more than one TEST_INCLUDE_FILE"
+      )
    endif()
  endif()

--- a/extras/CatchAddTests.cmake
+++ b/extras/CatchAddTests.cmake
@@ -1,6 +1,28 @@
 # Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
 # file Copyright.txt or https://cmake.org/licensing for details.

+set(prefix "${TEST_PREFIX}")
+set(suffix "${TEST_SUFFIX}")
+set(spec ${TEST_SPEC})
+set(extra_args ${TEST_EXTRA_ARGS})
+set(properties ${TEST_PROPERTIES})
+set(reporter ${TEST_REPORTER})
+set(output_dir ${TEST_OUTPUT_DIR})
+set(output_prefix ${TEST_OUTPUT_PREFIX})
+set(output_suffix ${TEST_OUTPUT_SUFFIX})
+set(dl_paths ${TEST_DL_PATHS})
+set(script)
+set(suite)
+set(tests)
+
+if(WIN32)
+  set(dl_paths_variable_name PATH)
+elseif(APPLE)
+  set(dl_paths_variable_name DYLD_LIBRARY_PATH)
+else()
+  set(dl_paths_variable_name LD_LIBRARY_PATH)
+endif()
+
 function(add_command NAME)
  set(_args "")
  # use ARGV* instead of ARGN, because ARGN splits arrays into multiple arguments
@@ -16,177 +38,119 @@ function(add_command NAME)
  set(script "${script}${NAME}(${_args})\n" PARENT_SCOPE)
 endfunction()

-function(catch_discover_tests_impl)
-
-  cmake_parse_arguments(
-    ""
-    ""
-    "TEST_EXECUTABLE;TEST_WORKING_DIR;TEST_DL_PATHS;TEST_OUTPUT_DIR;TEST_OUTPUT_PREFIX;TEST_OUTPUT_SUFFIX;TEST_PREFIX;TEST_REPORTER;TEST_SPEC;TEST_SUFFIX;TEST_LIST;CTEST_FILE"
-    "TEST_EXTRA_ARGS;TEST_PROPERTIES;TEST_EXECUTOR"
-    ${ARGN}
-  )
-
-  set(prefix "${_TEST_PREFIX}")
-  set(suffix "${_TEST_SUFFIX}")
-  set(spec ${_TEST_SPEC})
-  set(extra_args ${_TEST_EXTRA_ARGS})
-  set(properties ${_TEST_PROPERTIES})
-  set(reporter ${_TEST_REPORTER})
-  set(output_dir ${_TEST_OUTPUT_DIR})
-  set(output_prefix ${_TEST_OUTPUT_PREFIX})
-  set(output_suffix ${_TEST_OUTPUT_SUFFIX})
-  set(dl_paths ${_TEST_DL_PATHS})
-  set(script)
-  set(suite)
-  set(tests)
-
-  if(WIN32)
-    set(dl_paths_variable_name PATH)
-  elseif(APPLE)
-    set(dl_paths_variable_name DYLD_LIBRARY_PATH)
-  else()
-    set(dl_paths_variable_name LD_LIBRARY_PATH)
-  endif()
-
-  # Run test executable to get list of available tests
-  if(NOT EXISTS "${_TEST_EXECUTABLE}")
-    message(FATAL_ERROR
-      "Specified test executable '${_TEST_EXECUTABLE}' does not exist"
-    )
-  endif()
-
-  if(dl_paths)
-    cmake_path(CONVERT "${dl_paths}" TO_NATIVE_PATH_LIST paths)
-    set(ENV{${dl_paths_variable_name}} "${paths}")
-  endif()
-
-  execute_process(
-    COMMAND ${_TEST_EXECUTOR} "${_TEST_EXECUTABLE}" ${spec} --list-tests --verbosity quiet
-    OUTPUT_VARIABLE output
-    RESULT_VARIABLE result
-    WORKING_DIRECTORY "${_TEST_WORKING_DIR}"
-  )
-  if(NOT ${result} EQUAL 0)
-    message(FATAL_ERROR
-      "Error running test executable '${_TEST_EXECUTABLE}':\n"
-      "  Result: ${result}\n"
-      "  Output: ${output}\n"
-    )
-  endif()
-
-  # Make sure to escape ; (semicolons) in test names first, because
-  # that'd break the foreach loop for "Parse output" later and create
-  # wrongly splitted and thus failing test cases (false positives)
-  string(REPLACE ";" "\;" output "${output}")
-  string(REPLACE "\n" ";" output "${output}")
-
-  # Prepare reporter
-  if(reporter)
-    set(reporter_arg "--reporter ${reporter}")
-
-    # Run test executable to check whether reporter is available
-    # note that the use of --list-reporters is not the important part,
-    # we only want to check whether the execution succeeds with ${reporter_arg}
-    execute_process(
-      COMMAND ${_TEST_EXECUTOR} "${_TEST_EXECUTABLE}" ${spec} ${reporter_arg} --list-reporters
-      OUTPUT_VARIABLE reporter_check_output
-      RESULT_VARIABLE reporter_check_result
-      WORKING_DIRECTORY "${_TEST_WORKING_DIR}"
-    )
-    if(${reporter_check_result} EQUAL 255)
-      message(FATAL_ERROR
-        "\"${reporter}\" is not a valid reporter!\n"
-      )
-    elseif(NOT ${reporter_check_result} EQUAL 0)
-      message(FATAL_ERROR
-        "Error running test executable '${_TEST_EXECUTABLE}':\n"
-        "  Result: ${reporter_check_result}\n"
-        "  Output: ${reporter_check_output}\n"
-      )
-    endif()
-  endif()
-
-  # Prepare output dir
-  if(output_dir AND NOT IS_ABSOLUTE ${output_dir})
-    set(output_dir "${_TEST_WORKING_DIR}/${output_dir}")
-    if(NOT EXISTS ${output_dir})
-      file(MAKE_DIRECTORY ${output_dir})
-    endif()
-  endif()
-
-  if(dl_paths)
-    foreach(path ${dl_paths})
-      cmake_path(NATIVE_PATH path native_path)
-      list(APPEND environment_modifications "${dl_paths_variable_name}=path_list_prepend:${native_path}")
-    endforeach()
-  endif()
-
-  # Parse output
-  foreach(line ${output})
-    set(test "${line}")
-    # Escape characters in test case names that would be parsed by Catch2
-    # Note that the \ escaping must happen FIRST! Do not change the order.
-    set(test_name "${test}")
-    foreach(char \\ , [ ])
-      string(REPLACE ${char} "\\${char}" test_name "${test_name}")
-    endforeach(char)
-    # ...add output dir
-    if(output_dir)
-      string(REGEX REPLACE "[^A-Za-z0-9_]" "_" test_name_clean "${test_name}")
-      set(output_dir_arg "--out ${output_dir}/${output_prefix}${test_name_clean}${output_suffix}")
-    endif()
-
-    # ...and add to script
-    add_command(add_test
-      "${prefix}${test}${suffix}"
-      ${_TEST_EXECUTOR}
-      "${_TEST_EXECUTABLE}"
-      "${test_name}"
-      ${extra_args}
-      "${reporter_arg}"
-      "${output_dir_arg}"
-    )
-    add_command(set_tests_properties
-      "${prefix}${test}${suffix}"
-      PROPERTIES
-      WORKING_DIRECTORY "${_TEST_WORKING_DIR}"
-      ${properties}
-    )
-
-    if(environment_modifications)
-      add_command(set_tests_properties
-        "${prefix}${test}${suffix}"
-        PROPERTIES
-        ENVIRONMENT_MODIFICATION "${environment_modifications}")
-    endif()
-
-    list(APPEND tests "${prefix}${test}${suffix}")
-  endforeach()
-
-  # Create a list of all discovered tests, which users may use to e.g. set
-  # properties on the tests
-  add_command(set ${_TEST_LIST} ${tests})
-
-  # Write CTest script
-  file(WRITE "${_CTEST_FILE}" "${script}")
-endfunction()
-
-if(CMAKE_SCRIPT_MODE_FILE)
-  catch_discover_tests_impl(
-    TEST_EXECUTABLE ${TEST_EXECUTABLE}
-    TEST_EXECUTOR ${TEST_EXECUTOR}
-    TEST_WORKING_DIR ${TEST_WORKING_DIR}
-    TEST_SPEC ${TEST_SPEC}
-    TEST_EXTRA_ARGS ${TEST_EXTRA_ARGS}
-    TEST_PROPERTIES ${TEST_PROPERTIES}
-    TEST_PREFIX ${TEST_PREFIX}
-    TEST_SUFFIX ${TEST_SUFFIX}
-    TEST_LIST ${TEST_LIST}
-    TEST_REPORTER ${TEST_REPORTER}
-    TEST_OUTPUT_DIR ${TEST_OUTPUT_DIR}
-    TEST_OUTPUT_PREFIX ${TEST_OUTPUT_PREFIX}
-    TEST_OUTPUT_SUFFIX ${TEST_OUTPUT_SUFFIX}
-    TEST_DL_PATHS ${TEST_DL_PATHS}
-    CTEST_FILE ${CTEST_FILE}
+# Run test executable to get list of available tests
+if(NOT EXISTS "${TEST_EXECUTABLE}")
+  message(FATAL_ERROR
+    "Specified test executable '${TEST_EXECUTABLE}' does not exist"
  )
 endif()
+
+if(dl_paths)
+  cmake_path(CONVERT "${dl_paths}" TO_NATIVE_PATH_LIST paths)
+  set(ENV{${dl_paths_variable_name}} "${paths}")
+endif()
+
+execute_process(
+  COMMAND ${TEST_EXECUTOR} "${TEST_EXECUTABLE}" ${spec} --list-tests --verbosity quiet
+  OUTPUT_VARIABLE output
+  RESULT_VARIABLE result
+  WORKING_DIRECTORY "${TEST_WORKING_DIR}"
+)
+if(NOT ${result} EQUAL 0)
+  message(FATAL_ERROR
+    "Error running test executable '${TEST_EXECUTABLE}':\n"
+    "  Result: ${result}\n"
+    "  Output: ${output}\n"
+  )
+endif()
+
+string(REPLACE "\n" ";" output "${output}")
+
+# Run test executable to get list of available reporters
+execute_process(
+  COMMAND ${TEST_EXECUTOR} "${TEST_EXECUTABLE}" ${spec} --list-reporters
+  OUTPUT_VARIABLE reporters_output
+  RESULT_VARIABLE reporters_result
+  WORKING_DIRECTORY "${TEST_WORKING_DIR}"
+)
+if(NOT ${reporters_result} EQUAL 0)
+  message(FATAL_ERROR
+    "Error running test executable '${TEST_EXECUTABLE}':\n"
+    "  Result: ${reporters_result}\n"
+    "  Output: ${reporters_output}\n"
+  )
+endif()
+string(FIND "${reporters_output}" "${reporter}" reporter_is_valid)
+if(reporter AND ${reporter_is_valid} EQUAL -1)
+  message(FATAL_ERROR
+    "\"${reporter}\" is not a valid reporter!\n"
+  )
+endif()
+
+# Prepare reporter
+if(reporter)
+  set(reporter_arg "--reporter ${reporter}")
+endif()
+
+# Prepare output dir
+if(output_dir AND NOT IS_ABSOLUTE ${output_dir})
+  set(output_dir "${TEST_WORKING_DIR}/${output_dir}")
+  if(NOT EXISTS ${output_dir})
+    file(MAKE_DIRECTORY ${output_dir})
+  endif()
+endif()
+
+if(dl_paths)
+  foreach(path ${dl_paths})
+    cmake_path(NATIVE_PATH path native_path)
+    list(APPEND environment_modifications "${dl_paths_variable_name}=path_list_prepend:${native_path}")
+  endforeach()
+endif()
+
+# Parse output
+foreach(line ${output})
+  set(test ${line})
+  # Escape characters in test case names that would be parsed by Catch2
+  set(test_name ${test})
+  foreach(char , [ ])
+    string(REPLACE ${char} "\\${char}" test_name ${test_name})
+  endforeach(char)
+  # ...add output dir
+  if(output_dir)
+    string(REGEX REPLACE "[^A-Za-z0-9_]" "_" test_name_clean ${test_name})
+    set(output_dir_arg "--out ${output_dir}/${output_prefix}${test_name_clean}${output_suffix}")
+  endif()
+  
+  # ...and add to script
+  add_command(add_test
+    "${prefix}${test}${suffix}"
+    ${TEST_EXECUTOR}
+    "${TEST_EXECUTABLE}"
+    "${test_name}"
+    ${extra_args}
+    "${reporter_arg}"
+    "${output_dir_arg}"
+  )
+  add_command(set_tests_properties
+    "${prefix}${test}${suffix}"
+    PROPERTIES
+    WORKING_DIRECTORY "${TEST_WORKING_DIR}"
+    ${properties}
+  )
+
+   if(environment_modifications)
+     add_command(set_tests_properties
+       "${prefix}${test}${suffix}"
+       PROPERTIES
+       ENVIRONMENT_MODIFICATION "${environment_modifications}")
+   endif()
+
+  list(APPEND tests "${prefix}${test}${suffix}")
+endforeach()
+
+# Create a list of all discovered tests, which users may use to e.g. set
+# properties on the tests
+add_command(set ${TEST_LIST} ${tests})
+
+# Write CTest script
+file(WRITE "${CTEST_FILE}" "${script}")
--- a/extras/catch_amalgamated.cpp
+++ b/extras/catch_amalgamated.cpp
--- a/extras/catch_amalgamated.hpp
+++ b/extras/catch_amalgamated.hpp
--- a/fuzzing/NullOStream.cpp
+++ b/fuzzing/NullOStream.cpp
@@ -1,11 +1,3 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-
 #include "NullOStream.h"

 void NullOStream::avoidOutOfLineVirtualCompilerWarning()
--- a/fuzzing/NullOStream.h
+++ b/fuzzing/NullOStream.h
@@ -1,11 +1,3 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-
 #pragma once

 #include <ostream>
--- a/fuzzing/fuzz_TestSpecParser.cpp
+++ b/fuzzing/fuzz_TestSpecParser.cpp
@@ -1,10 +1,4 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
+//License: Boost 1.0
 //By Paul Dreik 2020

 #include <catch2/internal/catch_test_spec_parser.hpp>
--- a/fuzzing/fuzz_XmlWriter.cpp
+++ b/fuzzing/fuzz_XmlWriter.cpp
@@ -1,10 +1,4 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
+//License: Boost 1.0
 //By Paul Dreik 2020

 #include <catch2/internal/catch_xmlwriter.hpp>
--- a/fuzzing/fuzz_textflow.cpp
+++ b/fuzzing/fuzz_textflow.cpp
@@ -1,10 +1,4 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
+//License: Boost 1.0
 //By Paul Dreik 2020

 #include <catch2/internal/catch_textflow.hpp>
--- a/meson.build
+++ b/meson.build
@@ -8,12 +8,10 @@
 project(
  'catch2',
  'cpp',
-  version: '3.5.0', # CML version placeholder, don't delete
+  version: '3.3.2', # CML version placeholder, don't delete
  license: 'BSL-1.0',
-  meson_version: '>=0.54.1',
+  meson_version: '>=0.50.0',
 )

 subdir('src/catch2')
-if get_option('tests')
-  subdir('tests')
-endif
+subdir('tests')
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1 +0,0 @@
-option('tests', type: 'boolean', value: true, description: 'Build the unit tests')
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -21,8 +21,6 @@ set(BENCHMARK_HEADERS
  ${SOURCES_DIR}/benchmark/catch_sample_analysis.hpp
  ${SOURCES_DIR}/benchmark/detail/catch_analyse.hpp
  ${SOURCES_DIR}/benchmark/detail/catch_benchmark_function.hpp
-  ${SOURCES_DIR}/benchmark/detail/catch_benchmark_stats.hpp
-  ${SOURCES_DIR}/benchmark/detail/catch_benchmark_stats_fwd.hpp
  ${SOURCES_DIR}/benchmark/detail/catch_complete_invoke.hpp
  ${SOURCES_DIR}/benchmark/detail/catch_estimate_clock.hpp
  ${SOURCES_DIR}/benchmark/detail/catch_measure.hpp
@@ -33,7 +31,6 @@ set(BENCHMARK_HEADERS
 )
 set(BENCHMARK_SOURCES
  ${SOURCES_DIR}/benchmark/catch_chronometer.cpp
-  ${SOURCES_DIR}/benchmark/detail/catch_analyse.cpp
  ${SOURCES_DIR}/benchmark/detail/catch_benchmark_function.cpp
  ${SOURCES_DIR}/benchmark/detail/catch_run_for_at_least.cpp
  ${SOURCES_DIR}/benchmark/detail/catch_stats.cpp
@@ -58,6 +55,7 @@ set(IMPL_HEADERS
  ${SOURCES_DIR}/catch_template_test_macros.hpp
  ${SOURCES_DIR}/catch_test_case_info.hpp
  ${SOURCES_DIR}/catch_test_macros.hpp
+  ${SOURCES_DIR}/catch_test_run_info.hpp
  ${SOURCES_DIR}/catch_test_spec.hpp
  ${SOURCES_DIR}/catch_timer.hpp
  ${SOURCES_DIR}/catch_tostring.hpp
@@ -66,6 +64,7 @@ set(IMPL_HEADERS
  ${SOURCES_DIR}/catch_version.hpp
  ${SOURCES_DIR}/catch_version_macros.hpp
  ${SOURCES_DIR}/internal/catch_assertion_handler.hpp
+  ${SOURCES_DIR}/internal/catch_benchmark_stats_fwd.hpp
  ${SOURCES_DIR}/internal/catch_case_insensitive_comparisons.hpp
  ${SOURCES_DIR}/internal/catch_case_sensitive.hpp
  ${SOURCES_DIR}/internal/catch_clara.hpp
@@ -74,7 +73,6 @@ set(IMPL_HEADERS
  ${SOURCES_DIR}/internal/catch_compiler_capabilities.hpp
  ${SOURCES_DIR}/internal/catch_config_android_logwrite.hpp
  ${SOURCES_DIR}/internal/catch_config_counter.hpp
-  ${SOURCES_DIR}/internal/catch_config_static_analysis_support.hpp
  ${SOURCES_DIR}/internal/catch_config_uncaught_exceptions.hpp
  ${SOURCES_DIR}/internal/catch_config_wchar.hpp
  ${SOURCES_DIR}/internal/catch_console_colour.hpp
@@ -93,7 +91,6 @@ set(IMPL_HEADERS
  ${SOURCES_DIR}/internal/catch_getenv.hpp
  ${SOURCES_DIR}/internal/catch_istream.hpp
  ${SOURCES_DIR}/internal/catch_is_permutation.hpp
-  ${SOURCES_DIR}/internal/catch_jsonwriter.hpp
  ${SOURCES_DIR}/internal/catch_lazy_expr.hpp
  ${SOURCES_DIR}/internal/catch_leak_detector.hpp
  ${SOURCES_DIR}/internal/catch_list.hpp
@@ -109,10 +106,9 @@ set(IMPL_HEADERS
  ${SOURCES_DIR}/internal/catch_polyfills.hpp
  ${SOURCES_DIR}/internal/catch_preprocessor.hpp
  ${SOURCES_DIR}/internal/catch_preprocessor_remove_parens.hpp
-  ${SOURCES_DIR}/internal/catch_random_floating_point_helpers.hpp
-  ${SOURCES_DIR}/internal/catch_random_integer_helpers.hpp
  ${SOURCES_DIR}/internal/catch_random_number_generator.hpp
  ${SOURCES_DIR}/internal/catch_random_seed_generation.hpp
+  ${SOURCES_DIR}/internal/catch_registry_hub.hpp
  ${SOURCES_DIR}/internal/catch_reporter_registry.hpp
  ${SOURCES_DIR}/internal/catch_reporter_spec_parser.hpp
  ${SOURCES_DIR}/internal/catch_result_type.hpp
@@ -135,13 +131,10 @@ set(IMPL_HEADERS
  ${SOURCES_DIR}/internal/catch_test_failure_exception.hpp
  ${SOURCES_DIR}/internal/catch_test_macro_impl.hpp
  ${SOURCES_DIR}/internal/catch_test_registry.hpp
-  ${SOURCES_DIR}/internal/catch_test_run_info.hpp
  ${SOURCES_DIR}/internal/catch_test_spec_parser.hpp
  ${SOURCES_DIR}/internal/catch_textflow.hpp
  ${SOURCES_DIR}/internal/catch_to_string.hpp
  ${SOURCES_DIR}/internal/catch_uncaught_exceptions.hpp
-  ${SOURCES_DIR}/internal/catch_uniform_floating_point_distribution.hpp
-  ${SOURCES_DIR}/internal/catch_uniform_integer_distribution.hpp
  ${SOURCES_DIR}/internal/catch_unique_name.hpp
  ${SOURCES_DIR}/internal/catch_unique_ptr.hpp
  ${SOURCES_DIR}/internal/catch_void_type.hpp
@@ -155,7 +148,6 @@ set(IMPL_SOURCES
  ${SOURCES_DIR}/catch_config.cpp
  ${SOURCES_DIR}/catch_get_random_seed.cpp
  ${SOURCES_DIR}/catch_message.cpp
-  ${SOURCES_DIR}/catch_registry_hub.cpp
  ${SOURCES_DIR}/catch_session.cpp
  ${SOURCES_DIR}/catch_tag_alias_autoregistrar.cpp
  ${SOURCES_DIR}/catch_test_case_info.cpp
@@ -182,7 +174,6 @@ set(IMPL_SOURCES
  ${SOURCES_DIR}/internal/catch_floating_point_helpers.cpp
  ${SOURCES_DIR}/internal/catch_getenv.cpp
  ${SOURCES_DIR}/internal/catch_istream.cpp
-  ${SOURCES_DIR}/internal/catch_jsonwriter.cpp
  ${SOURCES_DIR}/internal/catch_lazy_expr.cpp
  ${SOURCES_DIR}/internal/catch_leak_detector.cpp
  ${SOURCES_DIR}/internal/catch_list.cpp
@@ -192,6 +183,7 @@ set(IMPL_SOURCES
  ${SOURCES_DIR}/internal/catch_polyfills.cpp
  ${SOURCES_DIR}/internal/catch_random_number_generator.cpp
  ${SOURCES_DIR}/internal/catch_random_seed_generation.cpp
+  ${SOURCES_DIR}/internal/catch_registry_hub.cpp
  ${SOURCES_DIR}/internal/catch_reporter_registry.cpp
  ${SOURCES_DIR}/internal/catch_reporter_spec_parser.cpp
  ${SOURCES_DIR}/internal/catch_result_type.cpp
@@ -220,24 +212,17 @@ set(INTERNAL_FILES ${IMPL_SOURCES} ${IMPL_HEADERS})

 set(INTERFACE_HEADERS
  ${SOURCES_DIR}/interfaces/catch_interfaces_all.hpp
-  ${SOURCES_DIR}/interfaces/catch_interfaces_capture.hpp
  ${SOURCES_DIR}/interfaces/catch_interfaces_config.hpp
-  ${SOURCES_DIR}/interfaces/catch_interfaces_enum_values_registry.hpp
  ${SOURCES_DIR}/interfaces/catch_interfaces_exception.hpp
  ${SOURCES_DIR}/interfaces/catch_interfaces_generatortracker.hpp
-  ${SOURCES_DIR}/interfaces/catch_interfaces_registry_hub.hpp
  ${SOURCES_DIR}/interfaces/catch_interfaces_reporter.hpp
  ${SOURCES_DIR}/interfaces/catch_interfaces_reporter_factory.hpp
-  ${SOURCES_DIR}/interfaces/catch_interfaces_tag_alias_registry.hpp
-  ${SOURCES_DIR}/interfaces/catch_interfaces_test_invoker.hpp
  ${SOURCES_DIR}/interfaces/catch_interfaces_testcase.hpp
 )
 set(INTERFACE_SOURCES
-  ${SOURCES_DIR}/interfaces/catch_interfaces_capture.cpp
  ${SOURCES_DIR}/interfaces/catch_interfaces_config.cpp
  ${SOURCES_DIR}/interfaces/catch_interfaces_exception.cpp
  ${SOURCES_DIR}/interfaces/catch_interfaces_generatortracker.cpp
-  ${SOURCES_DIR}/interfaces/catch_interfaces_registry_hub.cpp
  ${SOURCES_DIR}/interfaces/catch_interfaces_reporter.cpp
  ${SOURCES_DIR}/interfaces/catch_interfaces_reporter_factory.cpp
  ${SOURCES_DIR}/interfaces/catch_interfaces_testcase.cpp
@@ -295,7 +280,6 @@ set(REPORTER_HEADERS
  ${SOURCES_DIR}/reporters/catch_reporter_cumulative_base.hpp
  ${SOURCES_DIR}/reporters/catch_reporter_event_listener.hpp
  ${SOURCES_DIR}/reporters/catch_reporter_helpers.hpp
-  ${SOURCES_DIR}/reporters/catch_reporter_json.hpp
  ${SOURCES_DIR}/reporters/catch_reporter_junit.hpp
  ${SOURCES_DIR}/reporters/catch_reporter_multi.hpp
  ${SOURCES_DIR}/reporters/catch_reporter_registrars.hpp
@@ -314,7 +298,6 @@ set(REPORTER_SOURCES
  ${SOURCES_DIR}/reporters/catch_reporter_cumulative_base.cpp
  ${SOURCES_DIR}/reporters/catch_reporter_event_listener.cpp
  ${SOURCES_DIR}/reporters/catch_reporter_helpers.cpp
-  ${SOURCES_DIR}/reporters/catch_reporter_json.cpp
  ${SOURCES_DIR}/reporters/catch_reporter_junit.cpp
  ${SOURCES_DIR}/reporters/catch_reporter_multi.cpp
  ${SOURCES_DIR}/reporters/catch_reporter_registrars.cpp
--- a/src/catch2/benchmark/catch_benchmark.hpp
+++ b/src/catch2/benchmark/catch_benchmark.hpp
@@ -10,28 +10,29 @@
 #ifndef CATCH_BENCHMARK_HPP_INCLUDED
 #define CATCH_BENCHMARK_HPP_INCLUDED

-#include <catch2/catch_user_config.hpp>
+#include <catch2/interfaces/catch_interfaces_config.hpp>
+#include <catch2/interfaces/catch_interfaces_reporter.hpp>
 #include <catch2/internal/catch_compiler_capabilities.hpp>
 #include <catch2/internal/catch_context.hpp>
-#include <catch2/internal/catch_move_and_forward.hpp>
-#include <catch2/internal/catch_test_failure_exception.hpp>
+#include <catch2/internal/catch_run_context.hpp>
+#include <catch2/internal/catch_registry_hub.hpp>
 #include <catch2/internal/catch_unique_name.hpp>
-#include <catch2/interfaces/catch_interfaces_capture.hpp>
-#include <catch2/interfaces/catch_interfaces_config.hpp>
-#include <catch2/interfaces/catch_interfaces_registry_hub.hpp>
-#include <catch2/benchmark/detail/catch_benchmark_stats.hpp>
+#include <catch2/internal/catch_move_and_forward.hpp>
+#include <catch2/benchmark/catch_chronometer.hpp>
 #include <catch2/benchmark/catch_clock.hpp>
 #include <catch2/benchmark/catch_environment.hpp>
 #include <catch2/benchmark/catch_execution_plan.hpp>
 #include <catch2/benchmark/detail/catch_estimate_clock.hpp>
+#include <catch2/benchmark/detail/catch_complete_invoke.hpp>
 #include <catch2/benchmark/detail/catch_analyse.hpp>
 #include <catch2/benchmark/detail/catch_benchmark_function.hpp>
 #include <catch2/benchmark/detail/catch_run_for_at_least.hpp>

+
 #include <algorithm>
-#include <chrono>
-#include <exception>
+#include <functional>
 #include <string>
+#include <vector>
 #include <cmath>

 namespace Catch {
@@ -45,18 +46,16 @@ namespace Catch {
                : fun(CATCH_MOVE(func)), name(CATCH_MOVE(benchmarkName)) {}

            template <typename Clock>
-            ExecutionPlan prepare(const IConfig &cfg, Environment env) const {
+            ExecutionPlan<FloatDuration<Clock>> prepare(const IConfig &cfg, Environment<FloatDuration<Clock>> env) const {
                auto min_time = env.clock_resolution.mean * Detail::minimum_ticks;
                auto run_time = std::max(min_time, std::chrono::duration_cast<decltype(min_time)>(cfg.benchmarkWarmupTime()));
-                auto&& test = Detail::run_for_at_least<Clock>(std::chrono::duration_cast<IDuration>(run_time), 1, fun);
+                auto&& test = Detail::run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(run_time), 1, fun);
                int new_iters = static_cast<int>(std::ceil(min_time * test.iterations / test.elapsed));
-                return { new_iters, test.elapsed / test.iterations * new_iters * cfg.benchmarkSamples(), fun, std::chrono::duration_cast<FDuration>(cfg.benchmarkWarmupTime()), Detail::warmup_iterations };
+                return { new_iters, test.elapsed / test.iterations * new_iters * cfg.benchmarkSamples(), fun, std::chrono::duration_cast<FloatDuration<Clock>>(cfg.benchmarkWarmupTime()), Detail::warmup_iterations };
            }

            template <typename Clock = default_clock>
            void run() {
-                static_assert( Clock::is_steady,
-                               "Benchmarking clock should be steady" );
                auto const* cfg = getCurrentContext().getConfig();

                auto env = Detail::measure_environment<Clock>();
@@ -83,10 +82,10 @@ namespace Catch {
                        return plan.template run<Clock>(*cfg, env);
                    });

-                    auto analysis = Detail::analyse(*cfg, samples.data(), samples.data() + samples.size());
-                    BenchmarkStats<> stats{ CATCH_MOVE(info), CATCH_MOVE(analysis.samples), analysis.mean, analysis.standard_deviation, analysis.outliers, analysis.outlier_variance };
+                    auto analysis = Detail::analyse(*cfg, env, samples.begin(), samples.end());
+                    BenchmarkStats<FloatDuration<Clock>> stats{ CATCH_MOVE(info), CATCH_MOVE(analysis.samples), analysis.mean, analysis.standard_deviation, analysis.outliers, analysis.outlier_variance };
                    getResultCapture().benchmarkEnded(stats);
-                } CATCH_CATCH_ANON (TestFailureException const&) {
+                } CATCH_CATCH_ANON (TestFailureException) {
                    getResultCapture().benchmarkFailed("Benchmark failed due to failed assertion"_sr);
                } CATCH_CATCH_ALL{
                    getResultCapture().benchmarkFailed(translateActiveException());
--- a/src/catch2/benchmark/catch_benchmark_all.hpp
+++ b/src/catch2/benchmark/catch_benchmark_all.hpp
@@ -33,8 +33,6 @@
 #include <catch2/benchmark/catch_sample_analysis.hpp>
 #include <catch2/benchmark/detail/catch_analyse.hpp>
 #include <catch2/benchmark/detail/catch_benchmark_function.hpp>
-#include <catch2/benchmark/detail/catch_benchmark_stats.hpp>
-#include <catch2/benchmark/detail/catch_benchmark_stats_fwd.hpp>
 #include <catch2/benchmark/detail/catch_complete_invoke.hpp>
 #include <catch2/benchmark/detail/catch_estimate_clock.hpp>
 #include <catch2/benchmark/detail/catch_measure.hpp>
--- a/src/catch2/benchmark/catch_chronometer.hpp
+++ b/src/catch2/benchmark/catch_chronometer.hpp
@@ -12,6 +12,7 @@

 #include <catch2/benchmark/catch_clock.hpp>
 #include <catch2/benchmark/catch_optimizer.hpp>
+#include <catch2/benchmark/detail/catch_complete_invoke.hpp>
 #include <catch2/internal/catch_meta.hpp>
 #include <catch2/internal/catch_move_and_forward.hpp>

@@ -32,10 +33,7 @@ namespace Catch {
                void start() override { started = Clock::now(); }
                void finish() override { finished = Clock::now(); }

-                IDuration elapsed() const {
-                    return std::chrono::duration_cast<std::chrono::nanoseconds>(
-                        finished - started );
-                }
+                ClockDuration<Clock> elapsed() const { return finished - started; }

                TimePoint<Clock> started;
                TimePoint<Clock> finished;
--- a/src/catch2/benchmark/catch_clock.hpp
+++ b/src/catch2/benchmark/catch_clock.hpp
@@ -11,16 +11,28 @@
 #define CATCH_CLOCK_HPP_INCLUDED

 #include <chrono>
+#include <ratio>

 namespace Catch {
    namespace Benchmark {
-        using IDuration = std::chrono::nanoseconds;
-        using FDuration = std::chrono::duration<double, std::nano>;
+        template <typename Clock>
+        using ClockDuration = typename Clock::duration;
+        template <typename Clock>
+        using FloatDuration = std::chrono::duration<double, typename Clock::period>;

        template <typename Clock>
        using TimePoint = typename Clock::time_point;

        using default_clock = std::chrono::steady_clock;
+
+        template <typename Clock>
+        struct now {
+            TimePoint<Clock> operator()() const {
+                return Clock::now();
+            }
+        };
+
+        using fp_seconds = std::chrono::duration<double, std::ratio<1>>;
    } // namespace Benchmark
 } // namespace Catch

--- a/src/catch2/benchmark/catch_environment.hpp
+++ b/src/catch2/benchmark/catch_environment.hpp
@@ -15,13 +15,21 @@

 namespace Catch {
    namespace Benchmark {
+        template <typename Duration>
        struct EnvironmentEstimate {
-            FDuration mean;
+            Duration mean;
            OutlierClassification outliers;
+
+            template <typename Duration2>
+            operator EnvironmentEstimate<Duration2>() const {
+                return { mean, outliers };
+            }
        };
+        template <typename Clock>
        struct Environment {
-            EnvironmentEstimate clock_resolution;
-            EnvironmentEstimate clock_cost;
+            using clock_type = Clock;
+            EnvironmentEstimate<FloatDuration<Clock>> clock_resolution;
+            EnvironmentEstimate<FloatDuration<Clock>> clock_cost;
        };
    } // namespace Benchmark
 } // namespace Catch
--- a/src/catch2/benchmark/catch_estimate.hpp
+++ b/src/catch2/benchmark/catch_estimate.hpp
@@ -12,12 +12,17 @@

 namespace Catch {
    namespace Benchmark {
-        template <typename Type>
+        template <typename Duration>
        struct Estimate {
-            Type point;
-            Type lower_bound;
-            Type upper_bound;
+            Duration point;
+            Duration lower_bound;
+            Duration upper_bound;
            double confidence_interval;
+
+            template <typename Duration2>
+            operator Estimate<Duration2>() const {
+                return { point, lower_bound, upper_bound, confidence_interval };
+            }
        };
    } // namespace Benchmark
 } // namespace Catch
--- a/src/catch2/benchmark/catch_execution_plan.hpp
+++ b/src/catch2/benchmark/catch_execution_plan.hpp
@@ -17,38 +17,38 @@
 #include <catch2/benchmark/detail/catch_repeat.hpp>
 #include <catch2/benchmark/detail/catch_run_for_at_least.hpp>

-#include <vector>
+#include <algorithm>
+#include <iterator>

 namespace Catch {
    namespace Benchmark {
+        template <typename Duration>
        struct ExecutionPlan {
            int iterations_per_sample;
-            FDuration estimated_duration;
+            Duration estimated_duration;
            Detail::BenchmarkFunction benchmark;
-            FDuration warmup_time;
+            Duration warmup_time;
            int warmup_iterations;

-            template <typename Clock>
-            std::vector<FDuration> run(const IConfig &cfg, Environment env) const {
-                // warmup a bit
-                Detail::run_for_at_least<Clock>(
-                    std::chrono::duration_cast<IDuration>( warmup_time ),
-                    warmup_iterations,
-                    Detail::repeat( []() { return Clock::now(); } )
-                );
+            template <typename Duration2>
+            operator ExecutionPlan<Duration2>() const {
+                return { iterations_per_sample, estimated_duration, benchmark, warmup_time, warmup_iterations };
+            }

-                std::vector<FDuration> times;
-                const auto num_samples = cfg.benchmarkSamples();
-                times.reserve( num_samples );
-                for ( size_t i = 0; i < num_samples; ++i ) {
+            template <typename Clock>
+            std::vector<FloatDuration<Clock>> run(const IConfig &cfg, Environment<FloatDuration<Clock>> env) const {
+                // warmup a bit
+                Detail::run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(warmup_time), warmup_iterations, Detail::repeat(now<Clock>{}));
+
+                std::vector<FloatDuration<Clock>> times;
+                times.reserve(cfg.benchmarkSamples());
+                std::generate_n(std::back_inserter(times), cfg.benchmarkSamples(), [this, env] {
                    Detail::ChronometerModel<Clock> model;
-                    this->benchmark( Chronometer( model, iterations_per_sample ) );
+                    this->benchmark(Chronometer(model, iterations_per_sample));
                    auto sample_time = model.elapsed() - env.clock_cost.mean;
-                    if ( sample_time < FDuration::zero() ) {
-                        sample_time = FDuration::zero();
-                    }
-                    times.push_back(sample_time / iterations_per_sample);
-                }
+                    if (sample_time < FloatDuration<Clock>::zero()) sample_time = FloatDuration<Clock>::zero();
+                    return sample_time / iterations_per_sample;
+                });
                return times;
            }
        };
--- a/src/catch2/benchmark/catch_optimizer.hpp
+++ b/src/catch2/benchmark/catch_optimizer.hpp
@@ -70,7 +70,7 @@ namespace Catch {

        template <typename Fn, typename... Args>
        inline auto invoke_deoptimized(Fn&& fn, Args&&... args) -> std::enable_if_t<std::is_same<void, decltype(fn(args...))>::value> {
-            CATCH_FORWARD((fn)) (CATCH_FORWARD(args)...);
+            CATCH_FORWARD(fn) (CATCH_FORWARD(args)...);
        }
    } // namespace Benchmark
 } // namespace Catch
--- a/src/catch2/benchmark/catch_sample_analysis.hpp
+++ b/src/catch2/benchmark/catch_sample_analysis.hpp
@@ -10,20 +10,38 @@
 #ifndef CATCH_SAMPLE_ANALYSIS_HPP_INCLUDED
 #define CATCH_SAMPLE_ANALYSIS_HPP_INCLUDED

+#include <catch2/benchmark/catch_clock.hpp>
 #include <catch2/benchmark/catch_estimate.hpp>
 #include <catch2/benchmark/catch_outlier_classification.hpp>
-#include <catch2/benchmark/catch_clock.hpp>
+#include <catch2/internal/catch_move_and_forward.hpp>

+#include <algorithm>
 #include <vector>
+#include <iterator>

 namespace Catch {
    namespace Benchmark {
+        template <typename Duration>
        struct SampleAnalysis {
-            std::vector<FDuration> samples;
-            Estimate<FDuration> mean;
-            Estimate<FDuration> standard_deviation;
+            std::vector<Duration> samples;
+            Estimate<Duration> mean;
+            Estimate<Duration> standard_deviation;
            OutlierClassification outliers;
            double outlier_variance;
+
+            template <typename Duration2>
+            operator SampleAnalysis<Duration2>() const {
+                std::vector<Duration2> samples2;
+                samples2.reserve(samples.size());
+                std::transform(samples.begin(), samples.end(), std::back_inserter(samples2), [](Duration d) { return Duration2(d); });
+                return {
+                    CATCH_MOVE(samples2),
+                    mean,
+                    standard_deviation,
+                    outliers,
+                    outlier_variance,
+                };
+            }
        };
    } // namespace Benchmark
 } // namespace Catch
--- a/src/catch2/benchmark/detail/catch_analyse.cpp
+++ b/src/catch2/benchmark/detail/catch_analyse.cpp
@@ -1,85 +0,0 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-// Adapted from donated nonius code.
-
-#include <catch2/benchmark/detail/catch_analyse.hpp>
-#include <catch2/benchmark/catch_clock.hpp>
-#include <catch2/benchmark/catch_sample_analysis.hpp>
-#include <catch2/benchmark/detail/catch_stats.hpp>
-#include <catch2/interfaces/catch_interfaces_config.hpp>
-#include <catch2/internal/catch_move_and_forward.hpp>
-
-#include <vector>
-
-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            SampleAnalysis analyse(const IConfig &cfg, FDuration* first, FDuration* last) {
-                if (!cfg.benchmarkNoAnalysis()) {
-                    std::vector<double> samples;
-                    samples.reserve(static_cast<size_t>(last - first));
-                    for (auto current = first; current != last; ++current) {
-                        samples.push_back( current->count() );
-                    }
-
-                    auto analysis = Catch::Benchmark::Detail::analyse_samples(
-                        cfg.benchmarkConfidenceInterval(),
-                        cfg.benchmarkResamples(),
-                        samples.data(),
-                        samples.data() + samples.size() );
-                    auto outliers = Catch::Benchmark::Detail::classify_outliers(
-                        samples.data(), samples.data() + samples.size() );
-
-                    auto wrap_estimate = [](Estimate<double> e) {
-                        return Estimate<FDuration> {
-                            FDuration(e.point),
-                                FDuration(e.lower_bound),
-                                FDuration(e.upper_bound),
-                                e.confidence_interval,
-                        };
-                    };
-                    std::vector<FDuration> samples2;
-                    samples2.reserve(samples.size());
-                    for (auto s : samples) {
-                        samples2.push_back( FDuration( s ) );
-                    }
-
-                    return {
-                        CATCH_MOVE(samples2),
-                        wrap_estimate(analysis.mean),
-                        wrap_estimate(analysis.standard_deviation),
-                        outliers,
-                        analysis.outlier_variance,
-                    };
-                } else {
-                    std::vector<FDuration> samples;
-                    samples.reserve(static_cast<size_t>(last - first));
-
-                    FDuration mean = FDuration(0);
-                    int i = 0;
-                    for (auto it = first; it < last; ++it, ++i) {
-                        samples.push_back(FDuration(*it));
-                        mean += FDuration(*it);
-                    }
-                    mean /= i;
-
-                    return SampleAnalysis{
-                        CATCH_MOVE(samples),
-                        Estimate<FDuration>{ mean, mean, mean, 0.0 },
-                        Estimate<FDuration>{ FDuration( 0 ),
-                                             FDuration( 0 ),
-                                             FDuration( 0 ),
-                                             0.0 },
-                        OutlierClassification{},
-                        0.0
-                    };
-                }
-            }
-        } // namespace Detail
-    } // namespace Benchmark
-} // namespace Catch
--- a/src/catch2/benchmark/detail/catch_analyse.hpp
+++ b/src/catch2/benchmark/detail/catch_analyse.hpp
@@ -11,15 +11,68 @@
 #define CATCH_ANALYSE_HPP_INCLUDED

 #include <catch2/benchmark/catch_clock.hpp>
+#include <catch2/benchmark/catch_environment.hpp>
 #include <catch2/benchmark/catch_sample_analysis.hpp>
+#include <catch2/benchmark/detail/catch_stats.hpp>
+#include <catch2/interfaces/catch_interfaces_config.hpp>
+#include <catch2/internal/catch_move_and_forward.hpp>

+#include <algorithm>
+#include <iterator>
+#include <vector>

 namespace Catch {
-    class IConfig;
-
    namespace Benchmark {
        namespace Detail {
-            SampleAnalysis analyse(const IConfig &cfg, FDuration* first, FDuration* last);
+            template <typename Duration, typename Iterator>
+            SampleAnalysis<Duration> analyse(const IConfig &cfg, Environment<Duration>, Iterator first, Iterator last) {
+                if (!cfg.benchmarkNoAnalysis()) {
+                    std::vector<double> samples;
+                    samples.reserve(static_cast<size_t>(last - first));
+                    std::transform(first, last, std::back_inserter(samples), [](Duration d) { return d.count(); });
+
+                    auto analysis = Catch::Benchmark::Detail::analyse_samples(cfg.benchmarkConfidenceInterval(), cfg.benchmarkResamples(), samples.begin(), samples.end());
+                    auto outliers = Catch::Benchmark::Detail::classify_outliers(samples.begin(), samples.end());
+
+                    auto wrap_estimate = [](Estimate<double> e) {
+                        return Estimate<Duration> {
+                            Duration(e.point),
+                                Duration(e.lower_bound),
+                                Duration(e.upper_bound),
+                                e.confidence_interval,
+                        };
+                    };
+                    std::vector<Duration> samples2;
+                    samples2.reserve(samples.size());
+                    std::transform(samples.begin(), samples.end(), std::back_inserter(samples2), [](double d) { return Duration(d); });
+                    return {
+                        CATCH_MOVE(samples2),
+                        wrap_estimate(analysis.mean),
+                        wrap_estimate(analysis.standard_deviation),
+                        outliers,
+                        analysis.outlier_variance,
+                    };
+                } else {
+                    std::vector<Duration> samples;
+                    samples.reserve(static_cast<size_t>(last - first));
+
+                    Duration mean = Duration(0);
+                    int i = 0;
+                    for (auto it = first; it < last; ++it, ++i) {
+                        samples.push_back(Duration(*it));
+                        mean += Duration(*it);
+                    }
+                    mean /= i;
+
+                    return {
+                        CATCH_MOVE(samples),
+                        Estimate<Duration>{mean, mean, mean, 0.0},
+                        Estimate<Duration>{Duration(0), Duration(0), Duration(0), 0.0},
+                        OutlierClassification{},
+                        0.0
+                    };
+                }
+            }
        } // namespace Detail
    } // namespace Benchmark
 } // namespace Catch
--- a/src/catch2/benchmark/detail/catch_benchmark_function.hpp
+++ b/src/catch2/benchmark/detail/catch_benchmark_function.hpp
@@ -11,6 +11,7 @@
 #define CATCH_BENCHMARK_FUNCTION_HPP_INCLUDED

 #include <catch2/benchmark/catch_chronometer.hpp>
+#include <catch2/benchmark/detail/catch_complete_invoke.hpp>
 #include <catch2/internal/catch_meta.hpp>
 #include <catch2/internal/catch_unique_ptr.hpp>
 #include <catch2/internal/catch_move_and_forward.hpp>
--- a/src/catch2/benchmark/detail/catch_benchmark_stats.hpp
+++ b/src/catch2/benchmark/detail/catch_benchmark_stats.hpp
@@ -1,48 +0,0 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-#ifndef CATCH_BENCHMARK_STATS_HPP_INCLUDED
-#define CATCH_BENCHMARK_STATS_HPP_INCLUDED
-
-#include <catch2/benchmark/catch_estimate.hpp>
-#include <catch2/benchmark/catch_outlier_classification.hpp>
-// The fwd decl & default specialization needs to be seen by VS2017 before
-// BenchmarkStats itself, or VS2017 will report compilation error.
-#include <catch2/benchmark/detail/catch_benchmark_stats_fwd.hpp>
-
-#include <string>
-#include <vector>
-
-namespace Catch {
-
-    struct BenchmarkInfo {
-        std::string name;
-        double estimatedDuration;
-        int iterations;
-        unsigned int samples;
-        unsigned int resamples;
-        double clockResolution;
-        double clockCost;
-    };
-
-    // We need to keep template parameter for backwards compatibility,
-    // but we also do not want to use the template paraneter.
-    template <class Dummy>
-    struct BenchmarkStats {
-        BenchmarkInfo info;
-
-        std::vector<Benchmark::FDuration> samples;
-        Benchmark::Estimate<Benchmark::FDuration> mean;
-        Benchmark::Estimate<Benchmark::FDuration> standardDeviation;
-        Benchmark::OutlierClassification outliers;
-        double outlierVariance;
-    };
-
-
-} // end namespace Catch
-
-#endif // CATCH_BENCHMARK_STATS_HPP_INCLUDED
--- a/src/catch2/benchmark/detail/catch_complete_invoke.hpp
+++ b/src/catch2/benchmark/detail/catch_complete_invoke.hpp
@@ -10,9 +10,12 @@
 #ifndef CATCH_COMPLETE_INVOKE_HPP_INCLUDED
 #define CATCH_COMPLETE_INVOKE_HPP_INCLUDED

+#include <catch2/internal/catch_test_failure_exception.hpp>
 #include <catch2/internal/catch_meta.hpp>
 #include <catch2/internal/catch_move_and_forward.hpp>

+#include <type_traits>
+
 namespace Catch {
    namespace Benchmark {
        namespace Detail {
--- a/src/catch2/benchmark/detail/catch_estimate_clock.hpp
+++ b/src/catch2/benchmark/detail/catch_estimate_clock.hpp
@@ -19,6 +19,7 @@
 #include <catch2/internal/catch_unique_ptr.hpp>

 #include <algorithm>
+#include <iterator>
 #include <vector>
 #include <cmath>

@@ -29,49 +30,46 @@ namespace Catch {
            std::vector<double> resolution(int k) {
                std::vector<TimePoint<Clock>> times;
                times.reserve(static_cast<size_t>(k + 1));
-                for ( int i = 0; i < k + 1; ++i ) {
-                    times.push_back( Clock::now() );
-                }
+                std::generate_n(std::back_inserter(times), k + 1, now<Clock>{});

                std::vector<double> deltas;
                deltas.reserve(static_cast<size_t>(k));
-                for ( size_t idx = 1; idx < times.size(); ++idx ) {
-                    deltas.push_back( static_cast<double>(
-                        ( times[idx] - times[idx - 1] ).count() ) );
-                }
+                std::transform(std::next(times.begin()), times.end(), times.begin(),
+                    std::back_inserter(deltas),
+                    [](TimePoint<Clock> a, TimePoint<Clock> b) { return static_cast<double>((a - b).count()); });

                return deltas;
            }

-            constexpr auto warmup_iterations = 10000;
-            constexpr auto warmup_time = std::chrono::milliseconds(100);
-            constexpr auto minimum_ticks = 1000;
-            constexpr auto warmup_seed = 10000;
-            constexpr auto clock_resolution_estimation_time = std::chrono::milliseconds(500);
-            constexpr auto clock_cost_estimation_time_limit = std::chrono::seconds(1);
-            constexpr auto clock_cost_estimation_tick_limit = 100000;
-            constexpr auto clock_cost_estimation_time = std::chrono::milliseconds(10);
-            constexpr auto clock_cost_estimation_iterations = 10000;
+            const auto warmup_iterations = 10000;
+            const auto warmup_time = std::chrono::milliseconds(100);
+            const auto minimum_ticks = 1000;
+            const auto warmup_seed = 10000;
+            const auto clock_resolution_estimation_time = std::chrono::milliseconds(500);
+            const auto clock_cost_estimation_time_limit = std::chrono::seconds(1);
+            const auto clock_cost_estimation_tick_limit = 100000;
+            const auto clock_cost_estimation_time = std::chrono::milliseconds(10);
+            const auto clock_cost_estimation_iterations = 10000;

            template <typename Clock>
            int warmup() {
-                return run_for_at_least<Clock>(std::chrono::duration_cast<IDuration>(warmup_time), warmup_seed, &resolution<Clock>)
+                return run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(warmup_time), warmup_seed, &resolution<Clock>)
                    .iterations;
            }
            template <typename Clock>
-            EnvironmentEstimate estimate_clock_resolution(int iterations) {
-                auto r = run_for_at_least<Clock>(std::chrono::duration_cast<IDuration>(clock_resolution_estimation_time), iterations, &resolution<Clock>)
+            EnvironmentEstimate<FloatDuration<Clock>> estimate_clock_resolution(int iterations) {
+                auto r = run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(clock_resolution_estimation_time), iterations, &resolution<Clock>)
                    .result;
                return {
-                    FDuration(mean(r.data(), r.data() + r.size())),
-                    classify_outliers(r.data(), r.data() + r.size()),
+                    FloatDuration<Clock>(mean(r.begin(), r.end())),
+                    classify_outliers(r.begin(), r.end()),
                };
            }
            template <typename Clock>
-            EnvironmentEstimate estimate_clock_cost(FDuration resolution) {
+            EnvironmentEstimate<FloatDuration<Clock>> estimate_clock_cost(FloatDuration<Clock> resolution) {
                auto time_limit = (std::min)(
                    resolution * clock_cost_estimation_tick_limit,
-                    FDuration(clock_cost_estimation_time_limit));
+                    FloatDuration<Clock>(clock_cost_estimation_time_limit));
                auto time_clock = [](int k) {
                    return Detail::measure<Clock>([k] {
                        for (int i = 0; i < k; ++i) {
@@ -82,28 +80,26 @@ namespace Catch {
                };
                time_clock(1);
                int iters = clock_cost_estimation_iterations;
-                auto&& r = run_for_at_least<Clock>(std::chrono::duration_cast<IDuration>(clock_cost_estimation_time), iters, time_clock);
+                auto&& r = run_for_at_least<Clock>(std::chrono::duration_cast<ClockDuration<Clock>>(clock_cost_estimation_time), iters, time_clock);
                std::vector<double> times;
                int nsamples = static_cast<int>(std::ceil(time_limit / r.elapsed));
                times.reserve(static_cast<size_t>(nsamples));
-                for ( int s = 0; s < nsamples; ++s ) {
-                    times.push_back( static_cast<double>(
-                        ( time_clock( r.iterations ) / r.iterations )
-                            .count() ) );
-                }
+                std::generate_n(std::back_inserter(times), nsamples, [time_clock, &r] {
+                    return static_cast<double>((time_clock(r.iterations) / r.iterations).count());
+                });
                return {
-                    FDuration(mean(times.data(), times.data() + times.size())),
-                    classify_outliers(times.data(), times.data() + times.size()),
+                    FloatDuration<Clock>(mean(times.begin(), times.end())),
+                    classify_outliers(times.begin(), times.end()),
                };
            }

            template <typename Clock>
-            Environment measure_environment() {
+            Environment<FloatDuration<Clock>> measure_environment() {
 #if defined(__clang__)
 #    pragma clang diagnostic push
 #    pragma clang diagnostic ignored "-Wexit-time-destructors"
 #endif
-                static Catch::Detail::unique_ptr<Environment> env;
+                static Catch::Detail::unique_ptr<Environment<FloatDuration<Clock>>> env;
 #if defined(__clang__)
 #    pragma clang diagnostic pop
 #endif
@@ -115,7 +111,7 @@ namespace Catch {
                auto resolution = Detail::estimate_clock_resolution<Clock>(iters);
                auto cost = Detail::estimate_clock_cost<Clock>(resolution.mean);

-                env = Catch::Detail::make_unique<Environment>( Environment{resolution, cost} );
+                env = Catch::Detail::make_unique<Environment<FloatDuration<Clock>>>( Environment<FloatDuration<Clock>>{resolution, cost} );
                return *env;
            }
        } // namespace Detail
--- a/src/catch2/benchmark/detail/catch_measure.hpp
+++ b/src/catch2/benchmark/detail/catch_measure.hpp
@@ -10,6 +10,7 @@
 #ifndef CATCH_MEASURE_HPP_INCLUDED
 #define CATCH_MEASURE_HPP_INCLUDED

+#include <catch2/benchmark/catch_clock.hpp>
 #include <catch2/benchmark/detail/catch_complete_invoke.hpp>
 #include <catch2/benchmark/detail/catch_timing.hpp>
 #include <catch2/internal/catch_move_and_forward.hpp>
@@ -18,7 +19,7 @@ namespace Catch {
    namespace Benchmark {
        namespace Detail {
            template <typename Clock, typename Fun, typename... Args>
-            TimingOf<Fun, Args...> measure(Fun&& fun, Args&&... args) {
+            TimingOf<Clock, Fun, Args...> measure(Fun&& fun, Args&&... args) {
                auto start = Clock::now();
                auto&& r = Detail::complete_invoke(fun, CATCH_FORWARD(args)...);
                auto end = Clock::now();
--- a/src/catch2/benchmark/detail/catch_run_for_at_least.cpp
+++ b/src/catch2/benchmark/detail/catch_run_for_at_least.cpp
@@ -7,9 +7,8 @@
 // SPDX-License-Identifier: BSL-1.0

 #include <catch2/benchmark/detail/catch_run_for_at_least.hpp>
-#include <catch2/internal/catch_enforce.hpp>
-
 #include <exception>
+#include <catch2/internal/catch_enforce.hpp>

 namespace Catch {
    namespace Benchmark {
--- a/src/catch2/benchmark/detail/catch_run_for_at_least.hpp
+++ b/src/catch2/benchmark/detail/catch_run_for_at_least.hpp
@@ -24,11 +24,11 @@ namespace Catch {
    namespace Benchmark {
        namespace Detail {
            template <typename Clock, typename Fun>
-            TimingOf<Fun, int> measure_one(Fun&& fun, int iters, std::false_type) {
+            TimingOf<Clock, Fun, int> measure_one(Fun&& fun, int iters, std::false_type) {
                return Detail::measure<Clock>(fun, iters);
            }
            template <typename Clock, typename Fun>
-            TimingOf<Fun, Chronometer> measure_one(Fun&& fun, int iters, std::true_type) {
+            TimingOf<Clock, Fun, Chronometer> measure_one(Fun&& fun, int iters, std::true_type) {
                Detail::ChronometerModel<Clock> meter;
                auto&& result = Detail::complete_invoke(fun, Chronometer(meter, iters));

@@ -43,8 +43,8 @@ namespace Catch {
            void throw_optimized_away_error();

            template <typename Clock, typename Fun>
-            TimingOf<Fun, run_for_at_least_argument_t<Clock, Fun>>
-                run_for_at_least(IDuration how_long,
+            TimingOf<Clock, Fun, run_for_at_least_argument_t<Clock, Fun>>
+                run_for_at_least(ClockDuration<Clock> how_long,
                                 const int initial_iterations,
                                 Fun&& fun) {
                auto iters = initial_iterations;
--- a/src/catch2/benchmark/detail/catch_stats.cpp
+++ b/src/catch2/benchmark/detail/catch_stats.cpp
@@ -10,14 +10,10 @@
 #include <catch2/benchmark/detail/catch_stats.hpp>

 #include <catch2/internal/catch_compiler_capabilities.hpp>
-#include <catch2/internal/catch_floating_point_helpers.hpp>
-#include <catch2/internal/catch_random_number_generator.hpp>

-#include <algorithm>
 #include <cassert>
-#include <cmath>
 #include <cstddef>
-#include <numeric>
+#include <iterator>
 #include <random>


@@ -25,204 +21,139 @@
 #include <future>
 #endif

-namespace Catch {
-    namespace Benchmark {
-        namespace Detail {
-            namespace {
+namespace {

-                template <typename URng, typename Estimator>
-                static sample
-                resample( URng& rng,
-                          unsigned int resamples,
-                          double const* first,
-                          double const* last,
-                          Estimator& estimator ) {
-                    auto n = static_cast<size_t>( last - first );
-                    std::uniform_int_distribution<decltype( n )> dist( 0,
-                                                                       n - 1 );
+using Catch::Benchmark::Detail::sample;

-                    sample out;
-                    out.reserve( resamples );
-                    // We allocate the vector outside the loop to avoid realloc
-                    // per resample
-                    std::vector<double> resampled;
-                    resampled.reserve( n );
-                    for ( size_t i = 0; i < resamples; ++i ) {
-                        resampled.clear();
-                        for ( size_t s = 0; s < n; ++s ) {
-                            resampled.push_back(
-                                first[static_cast<std::ptrdiff_t>(
-                                    dist( rng ) )] );
-                        }
-                        const auto estimate =
-                            estimator( resampled.data(), resampled.data() + resampled.size() );
-                        out.push_back( estimate );
-                    }
-                    std::sort( out.begin(), out.end() );
-                    return out;
-                }
+     template <typename URng, typename Estimator>
+     sample resample(URng& rng, unsigned int resamples, std::vector<double>::iterator first, std::vector<double>::iterator last, Estimator& estimator) {
+         auto n = static_cast<size_t>(last - first);
+         std::uniform_int_distribution<decltype(n)> dist(0, n - 1);

-                static double outlier_variance( Estimate<double> mean,
-                                                Estimate<double> stddev,
-                                                int n ) {
-                    double sb = stddev.point;
-                    double mn = mean.point / n;
-                    double mg_min = mn / 2.;
-                    double sg = (std::min)( mg_min / 4., sb / std::sqrt( n ) );
-                    double sg2 = sg * sg;
-                    double sb2 = sb * sb;
-
-                    auto c_max = [n, mn, sb2, sg2]( double x ) -> double {
-                        double k = mn - x;
-                        double d = k * k;
-                        double nd = n * d;
-                        double k0 = -n * nd;
-                        double k1 = sb2 - n * sg2 + nd;
-                        double det = k1 * k1 - 4 * sg2 * k0;
-                        return static_cast<int>( -2. * k0 /
-                                                 ( k1 + std::sqrt( det ) ) );
-                    };
-
-                    auto var_out = [n, sb2, sg2]( double c ) {
-                        double nc = n - c;
-                        return ( nc / n ) * ( sb2 - nc * sg2 );
-                    };
-
-                    return (std::min)( var_out( 1 ),
-                                       var_out(
-                                           (std::min)( c_max( 0. ),
-                                                       c_max( mg_min ) ) ) ) /
-                           sb2;
-                }
-
-                static double erf_inv( double x ) {
-                    // Code accompanying the article "Approximating the erfinv
-                    // function" in GPU Computing Gems, Volume 2
-                    double w, p;
-
-                    w = -log( ( 1.0 - x ) * ( 1.0 + x ) );
-
-                    if ( w < 6.250000 ) {
-                        w = w - 3.125000;
-                        p = -3.6444120640178196996e-21;
-                        p = -1.685059138182016589e-19 + p * w;
-                        p = 1.2858480715256400167e-18 + p * w;
-                        p = 1.115787767802518096e-17 + p * w;
-                        p = -1.333171662854620906e-16 + p * w;
-                        p = 2.0972767875968561637e-17 + p * w;
-                        p = 6.6376381343583238325e-15 + p * w;
-                        p = -4.0545662729752068639e-14 + p * w;
-                        p = -8.1519341976054721522e-14 + p * w;
-                        p = 2.6335093153082322977e-12 + p * w;
-                        p = -1.2975133253453532498e-11 + p * w;
-                        p = -5.4154120542946279317e-11 + p * w;
-                        p = 1.051212273321532285e-09 + p * w;
-                        p = -4.1126339803469836976e-09 + p * w;
-                        p = -2.9070369957882005086e-08 + p * w;
-                        p = 4.2347877827932403518e-07 + p * w;
-                        p = -1.3654692000834678645e-06 + p * w;
-                        p = -1.3882523362786468719e-05 + p * w;
-                        p = 0.0001867342080340571352 + p * w;
-                        p = -0.00074070253416626697512 + p * w;
-                        p = -0.0060336708714301490533 + p * w;
-                        p = 0.24015818242558961693 + p * w;
-                        p = 1.6536545626831027356 + p * w;
-                    } else if ( w < 16.000000 ) {
-                        w = sqrt( w ) - 3.250000;
-                        p = 2.2137376921775787049e-09;
-                        p = 9.0756561938885390979e-08 + p * w;
-                        p = -2.7517406297064545428e-07 + p * w;
-                        p = 1.8239629214389227755e-08 + p * w;
-                        p = 1.5027403968909827627e-06 + p * w;
-                        p = -4.013867526981545969e-06 + p * w;
-                        p = 2.9234449089955446044e-06 + p * w;
-                        p = 1.2475304481671778723e-05 + p * w;
-                        p = -4.7318229009055733981e-05 + p * w;
-                        p = 6.8284851459573175448e-05 + p * w;
-                        p = 2.4031110387097893999e-05 + p * w;
-                        p = -0.0003550375203628474796 + p * w;
-                        p = 0.00095328937973738049703 + p * w;
-                        p = -0.0016882755560235047313 + p * w;
-                        p = 0.0024914420961078508066 + p * w;
-                        p = -0.0037512085075692412107 + p * w;
-                        p = 0.005370914553590063617 + p * w;
-                        p = 1.0052589676941592334 + p * w;
-                        p = 3.0838856104922207635 + p * w;
-                    } else {
-                        w = sqrt( w ) - 5.000000;
-                        p = -2.7109920616438573243e-11;
-                        p = -2.5556418169965252055e-10 + p * w;
-                        p = 1.5076572693500548083e-09 + p * w;
-                        p = -3.7894654401267369937e-09 + p * w;
-                        p = 7.6157012080783393804e-09 + p * w;
-                        p = -1.4960026627149240478e-08 + p * w;
-                        p = 2.9147953450901080826e-08 + p * w;
-                        p = -6.7711997758452339498e-08 + p * w;
-                        p = 2.2900482228026654717e-07 + p * w;
-                        p = -9.9298272942317002539e-07 + p * w;
-                        p = 4.5260625972231537039e-06 + p * w;
-                        p = -1.9681778105531670567e-05 + p * w;
-                        p = 7.5995277030017761139e-05 + p * w;
-                        p = -0.00021503011930044477347 + p * w;
-                        p = -0.00013871931833623122026 + p * w;
-                        p = 1.0103004648645343977 + p * w;
-                        p = 4.8499064014085844221 + p * w;
-                    }
-                    return p * x;
-                }
-
-                static double
-                standard_deviation( double const* first, double const* last ) {
-                    auto m = Catch::Benchmark::Detail::mean( first, last );
-                    double variance =
-                        std::accumulate( first,
-                                         last,
-                                         0.,
-                                         [m]( double a, double b ) {
-                                             double diff = b - m;
-                                             return a + diff * diff;
-                                         } ) /
-                        ( last - first );
-                    return std::sqrt( variance );
-                }
-
-                static sample jackknife( double ( *estimator )( double const*,
-                                                                double const* ),
-                                         double* first,
-                                         double* last ) {
-                    const auto second = first + 1;
-                    sample results;
-                    results.reserve( static_cast<size_t>( last - first ) );
-
-                    for ( auto it = first; it != last; ++it ) {
-                        std::iter_swap( it, first );
-                        results.push_back( estimator( second, last ) );
-                    }
-
-                    return results;
-                }
+         sample out;
+         out.reserve(resamples);
+         std::generate_n(std::back_inserter(out), resamples, [n, first, &estimator, &dist, &rng] {
+             std::vector<double> resampled;
+             resampled.reserve(n);
+             std::generate_n(std::back_inserter(resampled), n, [first, &dist, &rng] { return first[static_cast<std::ptrdiff_t>(dist(rng))]; });
+             return estimator(resampled.begin(), resampled.end());
+         });
+         std::sort(out.begin(), out.end());
+         return out;
+     }


-            } // namespace
-        }     // namespace Detail
-    }         // namespace Benchmark
-} // namespace Catch
+    double erf_inv(double x) {
+        // Code accompanying the article "Approximating the erfinv function" in GPU Computing Gems, Volume 2
+        double w, p;
+
+        w = -log((1.0 - x) * (1.0 + x));
+
+        if (w < 6.250000) {
+            w = w - 3.125000;
+            p = -3.6444120640178196996e-21;
+            p = -1.685059138182016589e-19 + p * w;
+            p = 1.2858480715256400167e-18 + p * w;
+            p = 1.115787767802518096e-17 + p * w;
+            p = -1.333171662854620906e-16 + p * w;
+            p = 2.0972767875968561637e-17 + p * w;
+            p = 6.6376381343583238325e-15 + p * w;
+            p = -4.0545662729752068639e-14 + p * w;
+            p = -8.1519341976054721522e-14 + p * w;
+            p = 2.6335093153082322977e-12 + p * w;
+            p = -1.2975133253453532498e-11 + p * w;
+            p = -5.4154120542946279317e-11 + p * w;
+            p = 1.051212273321532285e-09 + p * w;
+            p = -4.1126339803469836976e-09 + p * w;
+            p = -2.9070369957882005086e-08 + p * w;
+            p = 4.2347877827932403518e-07 + p * w;
+            p = -1.3654692000834678645e-06 + p * w;
+            p = -1.3882523362786468719e-05 + p * w;
+            p = 0.0001867342080340571352 + p * w;
+            p = -0.00074070253416626697512 + p * w;
+            p = -0.0060336708714301490533 + p * w;
+            p = 0.24015818242558961693 + p * w;
+            p = 1.6536545626831027356 + p * w;
+        } else if (w < 16.000000) {
+            w = sqrt(w) - 3.250000;
+            p = 2.2137376921775787049e-09;
+            p = 9.0756561938885390979e-08 + p * w;
+            p = -2.7517406297064545428e-07 + p * w;
+            p = 1.8239629214389227755e-08 + p * w;
+            p = 1.5027403968909827627e-06 + p * w;
+            p = -4.013867526981545969e-06 + p * w;
+            p = 2.9234449089955446044e-06 + p * w;
+            p = 1.2475304481671778723e-05 + p * w;
+            p = -4.7318229009055733981e-05 + p * w;
+            p = 6.8284851459573175448e-05 + p * w;
+            p = 2.4031110387097893999e-05 + p * w;
+            p = -0.0003550375203628474796 + p * w;
+            p = 0.00095328937973738049703 + p * w;
+            p = -0.0016882755560235047313 + p * w;
+            p = 0.0024914420961078508066 + p * w;
+            p = -0.0037512085075692412107 + p * w;
+            p = 0.005370914553590063617 + p * w;
+            p = 1.0052589676941592334 + p * w;
+            p = 3.0838856104922207635 + p * w;
+        } else {
+            w = sqrt(w) - 5.000000;
+            p = -2.7109920616438573243e-11;
+            p = -2.5556418169965252055e-10 + p * w;
+            p = 1.5076572693500548083e-09 + p * w;
+            p = -3.7894654401267369937e-09 + p * w;
+            p = 7.6157012080783393804e-09 + p * w;
+            p = -1.4960026627149240478e-08 + p * w;
+            p = 2.9147953450901080826e-08 + p * w;
+            p = -6.7711997758452339498e-08 + p * w;
+            p = 2.2900482228026654717e-07 + p * w;
+            p = -9.9298272942317002539e-07 + p * w;
+            p = 4.5260625972231537039e-06 + p * w;
+            p = -1.9681778105531670567e-05 + p * w;
+            p = 7.5995277030017761139e-05 + p * w;
+            p = -0.00021503011930044477347 + p * w;
+            p = -0.00013871931833623122026 + p * w;
+            p = 1.0103004648645343977 + p * w;
+            p = 4.8499064014085844221 + p * w;
+        }
+        return p * x;
+    }
+
+    double standard_deviation(std::vector<double>::iterator first, std::vector<double>::iterator last) {
+        auto m = Catch::Benchmark::Detail::mean(first, last);
+        double variance = std::accumulate( first,
+                                           last,
+                                           0.,
+                                           [m]( double a, double b ) {
+                                               double diff = b - m;
+                                               return a + diff * diff;
+                                           } ) /
+                          ( last - first );
+        return std::sqrt( variance );
+    }
+
+}

 namespace Catch {
    namespace Benchmark {
        namespace Detail {

-            double weighted_average_quantile( int k,
-                                              int q,
-                                              double* first,
-                                              double* last ) {
+#if defined( __GNUC__ ) || defined( __clang__ )
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+            bool directCompare( double lhs, double rhs ) { return lhs == rhs; }
+#if defined( __GNUC__ ) || defined( __clang__ )
+#    pragma GCC diagnostic pop
+#endif
+
+            double weighted_average_quantile(int k, int q, std::vector<double>::iterator first, std::vector<double>::iterator last) {
                auto count = last - first;
                double idx = (count - 1) * k / static_cast<double>(q);
                int j = static_cast<int>(idx);
                double g = idx - j;
                std::nth_element(first, first + j, last);
                auto xj = first[j];
-                if ( Catch::Detail::directCompare( g, 0 ) ) {
+                if ( directCompare( g, 0 ) ) {
                    return xj;
                }

@@ -230,48 +161,6 @@ namespace Catch {
                return xj + g * (xj1 - xj);
            }

-            OutlierClassification
-            classify_outliers( double const* first, double const* last ) {
-                std::vector<double> copy( first, last );
-
-                auto q1 = weighted_average_quantile( 1, 4, copy.data(), copy.data() + copy.size() );
-                auto q3 = weighted_average_quantile( 3, 4, copy.data(), copy.data() + copy.size() );
-                auto iqr = q3 - q1;
-                auto los = q1 - ( iqr * 3. );
-                auto lom = q1 - ( iqr * 1.5 );
-                auto him = q3 + ( iqr * 1.5 );
-                auto his = q3 + ( iqr * 3. );
-
-                OutlierClassification o;
-                for ( ; first != last; ++first ) {
-                    const double t = *first;
-                    if ( t < los ) {
-                        ++o.low_severe;
-                    } else if ( t < lom ) {
-                        ++o.low_mild;
-                    } else if ( t > his ) {
-                        ++o.high_severe;
-                    } else if ( t > him ) {
-                        ++o.high_mild;
-                    }
-                    ++o.samples_seen;
-                }
-                return o;
-            }
-
-            double mean( double const* first, double const* last ) {
-                auto count = last - first;
-                double sum = 0.;
-                while (first != last) {
-                    sum += *first;
-                    ++first;
-                }
-                return sum / static_cast<double>(count);
-            }
-
-            double normal_cdf( double x ) {
-                return std::erfc( -x / std::sqrt( 2.0 ) ) / 2.0;
-            }

            double erfc_inv(double x) {
                return erf_inv(1.0 - x);
@@ -293,77 +182,50 @@ namespace Catch {
                return result;
            }

-            Estimate<double>
-            bootstrap( double confidence_level,
-                       double* first,
-                       double* last,
-                       sample const& resample,
-                       double ( *estimator )( double const*, double const* ) ) {
-                auto n_samples = last - first;

-                double point = estimator( first, last );
-                // Degenerate case with a single sample
-                if ( n_samples == 1 )
-                    return { point, point, point, confidence_level };
+            double outlier_variance(Estimate<double> mean, Estimate<double> stddev, int n) {
+                double sb = stddev.point;
+                double mn = mean.point / n;
+                double mg_min = mn / 2.;
+                double sg = (std::min)(mg_min / 4., sb / std::sqrt(n));
+                double sg2 = sg * sg;
+                double sb2 = sb * sb;

-                sample jack = jackknife( estimator, first, last );
-                double jack_mean =
-                    mean( jack.data(), jack.data() + jack.size() );
-                double sum_squares = 0, sum_cubes = 0;
-                for ( double x : jack ) {
-                    auto difference = jack_mean - x;
-                    auto square = difference * difference;
-                    auto cube = square * difference;
-                    sum_squares += square;
-                    sum_cubes += cube;
-                }
-
-                double accel = sum_cubes / ( 6 * std::pow( sum_squares, 1.5 ) );
-                long n = static_cast<long>( resample.size() );
-                double prob_n =
-                    std::count_if( resample.begin(),
-                                   resample.end(),
-                                   [point]( double x ) { return x < point; } ) /
-                    static_cast<double>( n );
-                // degenerate case with uniform samples
-                if ( Catch::Detail::directCompare( prob_n, 0. ) ) {
-                    return { point, point, point, confidence_level };
-                }
-
-                double bias = normal_quantile( prob_n );
-                double z1 = normal_quantile( ( 1. - confidence_level ) / 2. );
-
-                auto cumn = [n]( double x ) -> long {
-                    return std::lround( normal_cdf( x ) *
-                                        static_cast<double>( n ) );
+                auto c_max = [n, mn, sb2, sg2](double x) -> double {
+                    double k = mn - x;
+                    double d = k * k;
+                    double nd = n * d;
+                    double k0 = -n * nd;
+                    double k1 = sb2 - n * sg2 + nd;
+                    double det = k1 * k1 - 4 * sg2 * k0;
+                    return static_cast<int>(-2. * k0 / (k1 + std::sqrt(det)));
                };
-                auto a = [bias, accel]( double b ) {
-                    return bias + b / ( 1. - accel * b );
-                };
-                double b1 = bias + z1;
-                double b2 = bias - z1;
-                double a1 = a( b1 );
-                double a2 = a( b2 );
-                auto lo = static_cast<size_t>( (std::max)( cumn( a1 ), 0l ) );
-                auto hi =
-                    static_cast<size_t>( (std::min)( cumn( a2 ), n - 1 ) );

-                return { point, resample[lo], resample[hi], confidence_level };
+                auto var_out = [n, sb2, sg2](double c) {
+                    double nc = n - c;
+                    return (nc / n) * (sb2 - nc * sg2);
+                };
+
+                return (std::min)(var_out(1), var_out((std::min)(c_max(0.), c_max(mg_min)))) / sb2;
            }

-            bootstrap_analysis analyse_samples(double confidence_level,
-                                               unsigned int n_resamples,
-                                               double* first,
-                                               double* last) {
-                auto mean = &Detail::mean;
+
+            bootstrap_analysis analyse_samples(double confidence_level, unsigned int n_resamples, std::vector<double>::iterator first, std::vector<double>::iterator last) {
+                CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
+                CATCH_INTERNAL_SUPPRESS_GLOBALS_WARNINGS
+                static std::random_device entropy;
+                CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+
+                auto n = static_cast<int>(last - first); // seriously, one can't use integral types without hell in C++
+
+                auto mean = &Detail::mean<std::vector<double>::iterator>;
                auto stddev = &standard_deviation;

 #if defined(CATCH_CONFIG_USE_ASYNC)
-                auto Estimate = [=](double(*f)(double const*, double const*)) {
-                    std::random_device rd;
-                    auto seed = rd();
+                auto Estimate = [=](double(*f)(std::vector<double>::iterator, std::vector<double>::iterator)) {
+                    auto seed = entropy();
                    return std::async(std::launch::async, [=] {
-                        SimplePcg32 rng( seed );
+                        std::mt19937 rng(seed);
                        auto resampled = resample(rng, n_resamples, first, last, f);
                        return bootstrap(confidence_level, first, last, resampled, f);
                    });
@@ -375,10 +237,9 @@ namespace Catch {
                auto mean_estimate = mean_future.get();
                auto stddev_estimate = stddev_future.get();
 #else
-                auto Estimate = [=](double(*f)(double const* , double const*)) {
-                    std::random_device rd;
-                    auto seed = rd();
-                    SimplePcg32 rng( seed );
+                auto Estimate = [=](double(*f)(std::vector<double>::iterator, std::vector<double>::iterator)) {
+                    auto seed = entropy();
+                    std::mt19937 rng(seed);
                    auto resampled = resample(rng, n_resamples, first, last, f);
                    return bootstrap(confidence_level, first, last, resampled, f);
                };
@@ -387,7 +248,6 @@ namespace Catch {
                auto stddev_estimate = Estimate(stddev);
 #endif // CATCH_USE_ASYNC

-                auto n = static_cast<int>(last - first); // seriously, one can't use integral types without hell in C++
                double outlier_variance = Detail::outlier_variance(mean_estimate, stddev_estimate, n);

                return { mean_estimate, stddev_estimate, outlier_variance };
--- a/src/catch2/benchmark/detail/catch_stats.hpp
+++ b/src/catch2/benchmark/detail/catch_stats.hpp
@@ -13,35 +13,122 @@
 #include <catch2/benchmark/catch_estimate.hpp>
 #include <catch2/benchmark/catch_outlier_classification.hpp>

+#include <algorithm>
 #include <vector>
+#include <numeric>
+#include <tuple>
+#include <cmath>

 namespace Catch {
    namespace Benchmark {
        namespace Detail {
            using sample = std::vector<double>;

-            double weighted_average_quantile( int k,
-                                              int q,
-                                              double* first,
-                                              double* last );
+            // Used when we know we want == comparison of two doubles
+            // to centralize warning suppression
+            bool directCompare( double lhs, double rhs );

-            OutlierClassification
-            classify_outliers( double const* first, double const* last );
+            double weighted_average_quantile(int k, int q, std::vector<double>::iterator first, std::vector<double>::iterator last);

-            double mean( double const* first, double const* last );
+            template <typename Iterator>
+            OutlierClassification classify_outliers(Iterator first, Iterator last) {
+                std::vector<double> copy(first, last);

-            double normal_cdf( double x );
+                auto q1 = weighted_average_quantile(1, 4, copy.begin(), copy.end());
+                auto q3 = weighted_average_quantile(3, 4, copy.begin(), copy.end());
+                auto iqr = q3 - q1;
+                auto los = q1 - (iqr * 3.);
+                auto lom = q1 - (iqr * 1.5);
+                auto him = q3 + (iqr * 1.5);
+                auto his = q3 + (iqr * 3.);
+
+                OutlierClassification o;
+                for (; first != last; ++first) {
+                    auto&& t = *first;
+                    if (t < los) ++o.low_severe;
+                    else if (t < lom) ++o.low_mild;
+                    else if (t > his) ++o.high_severe;
+                    else if (t > him) ++o.high_mild;
+                    ++o.samples_seen;
+                }
+                return o;
+            }
+
+            template <typename Iterator>
+            double mean(Iterator first, Iterator last) {
+                auto count = last - first;
+                double sum = std::accumulate(first, last, 0.);
+                return sum / static_cast<double>(count);
+            }
+
+            template <typename Estimator, typename Iterator>
+            sample jackknife(Estimator&& estimator, Iterator first, Iterator last) {
+                auto n = static_cast<size_t>(last - first);
+                auto second = first;
+                ++second;
+                sample results;
+                results.reserve(n);
+
+                for (auto it = first; it != last; ++it) {
+                    std::iter_swap(it, first);
+                    results.push_back(estimator(second, last));
+                }
+
+                return results;
+            }
+
+            inline double normal_cdf(double x) {
+                return std::erfc(-x / std::sqrt(2.0)) / 2.0;
+            }

            double erfc_inv(double x);

            double normal_quantile(double p);

-            Estimate<double>
-            bootstrap( double confidence_level,
-                       double* first,
-                       double* last,
-                       sample const& resample,
-                       double ( *estimator )( double const*, double const* ) );
+            template <typename Iterator, typename Estimator>
+            Estimate<double> bootstrap(double confidence_level, Iterator first, Iterator last, sample const& resample, Estimator&& estimator) {
+                auto n_samples = last - first;
+
+                double point = estimator(first, last);
+                // Degenerate case with a single sample
+                if (n_samples == 1) return { point, point, point, confidence_level };
+
+                sample jack = jackknife(estimator, first, last);
+                double jack_mean = mean(jack.begin(), jack.end());
+                double sum_squares, sum_cubes;
+                std::tie(sum_squares, sum_cubes) = std::accumulate(jack.begin(), jack.end(), std::make_pair(0., 0.), [jack_mean](std::pair<double, double> sqcb, double x) -> std::pair<double, double> {
+                    auto d = jack_mean - x;
+                    auto d2 = d * d;
+                    auto d3 = d2 * d;
+                    return { sqcb.first + d2, sqcb.second + d3 };
+                });
+
+                double accel = sum_cubes / (6 * std::pow(sum_squares, 1.5));
+                long n = static_cast<long>(resample.size());
+                double prob_n = std::count_if(resample.begin(), resample.end(), [point](double x) { return x < point; }) / static_cast<double>(n);
+                // degenerate case with uniform samples
+                if ( directCompare( prob_n, 0. ) ) {
+                    return { point, point, point, confidence_level };
+                }
+
+                double bias = normal_quantile(prob_n);
+                double z1 = normal_quantile((1. - confidence_level) / 2.);
+
+                auto cumn = [n]( double x ) -> long {
+                    return std::lround( normal_cdf( x ) * static_cast<double>(n) );
+                };
+                auto a = [bias, accel](double b) { return bias + b / (1. - accel * b); };
+                double b1 = bias + z1;
+                double b2 = bias - z1;
+                double a1 = a(b1);
+                double a2 = a(b2);
+                auto lo = static_cast<size_t>((std::max)(cumn(a1), 0l));
+                auto hi = static_cast<size_t>((std::min)(cumn(a2), n - 1));
+
+                return { point, resample[lo], resample[hi], confidence_level };
+            }
+
+            double outlier_variance(Estimate<double> mean, Estimate<double> stddev, int n);

            struct bootstrap_analysis {
                Estimate<double> mean;
@@ -49,10 +136,7 @@ namespace Catch {
                double outlier_variance;
            };

-            bootstrap_analysis analyse_samples(double confidence_level,
-                                               unsigned int n_resamples,
-                                               double* first,
-                                               double* last);
+            bootstrap_analysis analyse_samples(double confidence_level, unsigned int n_resamples, std::vector<double>::iterator first, std::vector<double>::iterator last);
        } // namespace Detail
    } // namespace Benchmark
 } // namespace Catch
--- a/src/catch2/benchmark/detail/catch_timing.hpp
+++ b/src/catch2/benchmark/detail/catch_timing.hpp
@@ -17,14 +17,14 @@

 namespace Catch {
    namespace Benchmark {
-        template <typename Result>
+        template <typename Duration, typename Result>
        struct Timing {
-            IDuration elapsed;
+            Duration elapsed;
            Result result;
            int iterations;
        };
-        template <typename Func, typename... Args>
-        using TimingOf = Timing<Detail::CompleteType_t<FunctionReturnType<Func, Args...>>>;
+        template <typename Clock, typename Func, typename... Args>
+        using TimingOf = Timing<ClockDuration<Clock>, Detail::CompleteType_t<FunctionReturnType<Func, Args...>>>;
    } // namespace Benchmark
 } // namespace Catch

--- a/src/catch2/catch_all.hpp
+++ b/src/catch2/catch_all.hpp
@@ -36,6 +36,7 @@
 #include <catch2/catch_template_test_macros.hpp>
 #include <catch2/catch_test_case_info.hpp>
 #include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_test_run_info.hpp>
 #include <catch2/catch_test_spec.hpp>
 #include <catch2/catch_timer.hpp>
 #include <catch2/catch_tostring.hpp>
@@ -46,6 +47,7 @@
 #include <catch2/generators/catch_generators_all.hpp>
 #include <catch2/interfaces/catch_interfaces_all.hpp>
 #include <catch2/internal/catch_assertion_handler.hpp>
+#include <catch2/internal/catch_benchmark_stats_fwd.hpp>
 #include <catch2/internal/catch_case_insensitive_comparisons.hpp>
 #include <catch2/internal/catch_case_sensitive.hpp>
 #include <catch2/internal/catch_clara.hpp>
@@ -54,8 +56,6 @@
 #include <catch2/internal/catch_compiler_capabilities.hpp>
 #include <catch2/internal/catch_config_android_logwrite.hpp>
 #include <catch2/internal/catch_config_counter.hpp>
-#include <catch2/internal/catch_config_prefix_messages.hpp>
-#include <catch2/internal/catch_config_static_analysis_support.hpp>
 #include <catch2/internal/catch_config_uncaught_exceptions.hpp>
 #include <catch2/internal/catch_config_wchar.hpp>
 #include <catch2/internal/catch_console_colour.hpp>
@@ -74,7 +74,6 @@
 #include <catch2/internal/catch_getenv.hpp>
 #include <catch2/internal/catch_is_permutation.hpp>
 #include <catch2/internal/catch_istream.hpp>
-#include <catch2/internal/catch_jsonwriter.hpp>
 #include <catch2/internal/catch_lazy_expr.hpp>
 #include <catch2/internal/catch_leak_detector.hpp>
 #include <catch2/internal/catch_list.hpp>
@@ -89,12 +88,10 @@
 #include <catch2/internal/catch_platform.hpp>
 #include <catch2/internal/catch_polyfills.hpp>
 #include <catch2/internal/catch_preprocessor.hpp>
-#include <catch2/internal/catch_preprocessor_internal_stringify.hpp>
 #include <catch2/internal/catch_preprocessor_remove_parens.hpp>
-#include <catch2/internal/catch_random_floating_point_helpers.hpp>
-#include <catch2/internal/catch_random_integer_helpers.hpp>
 #include <catch2/internal/catch_random_number_generator.hpp>
 #include <catch2/internal/catch_random_seed_generation.hpp>
+#include <catch2/internal/catch_registry_hub.hpp>
 #include <catch2/internal/catch_reporter_registry.hpp>
 #include <catch2/internal/catch_reporter_spec_parser.hpp>
 #include <catch2/internal/catch_result_type.hpp>
@@ -117,13 +114,10 @@
 #include <catch2/internal/catch_test_failure_exception.hpp>
 #include <catch2/internal/catch_test_macro_impl.hpp>
 #include <catch2/internal/catch_test_registry.hpp>
-#include <catch2/internal/catch_test_run_info.hpp>
 #include <catch2/internal/catch_test_spec_parser.hpp>
 #include <catch2/internal/catch_textflow.hpp>
 #include <catch2/internal/catch_to_string.hpp>
 #include <catch2/internal/catch_uncaught_exceptions.hpp>
-#include <catch2/internal/catch_uniform_floating_point_distribution.hpp>
-#include <catch2/internal/catch_uniform_integer_distribution.hpp>
 #include <catch2/internal/catch_unique_name.hpp>
 #include <catch2/internal/catch_unique_ptr.hpp>
 #include <catch2/internal/catch_void_type.hpp>
--- a/src/catch2/catch_approx.cpp
+++ b/src/catch2/catch_approx.cpp
@@ -70,10 +70,10 @@ namespace Catch {
    }

 namespace literals {
-    Approx operator ""_a(long double val) {
+    Approx operator "" _a(long double val) {
        return Approx(val);
    }
-    Approx operator ""_a(unsigned long long val) {
+    Approx operator "" _a(unsigned long long val) {
        return Approx(val);
    }
 } // end namespace literals
--- a/src/catch2/catch_config.cpp
+++ b/src/catch2/catch_config.cpp
@@ -13,7 +13,7 @@
 #include <catch2/internal/catch_stringref.hpp>
 #include <catch2/internal/catch_string_manip.hpp>
 #include <catch2/internal/catch_test_spec_parser.hpp>
-#include <catch2/interfaces/catch_interfaces_tag_alias_registry.hpp>
+#include <catch2/internal/catch_tag_alias_registry.hpp>
 #include <catch2/internal/catch_getenv.hpp>

 #include <fstream>
@@ -105,7 +105,7 @@ namespace Catch {
            elem = trim(elem);
        }

-        // Insert the default reporter if user hasn't asked for a specific one
+        // Insert the default reporter if user hasn't asked for a specfic one
        if ( m_data.reporterSpecifications.empty() ) {
            m_data.reporterSpecifications.push_back( {
 #if defined( CATCH_CONFIG_DEFAULT_REPORTER )
@@ -123,7 +123,7 @@ namespace Catch {

        // Bazel support can modify the test specs, so parsing has to happen
        // after reading Bazel env vars.
-        TestSpecParser parser( ITagAliasRegistry::get() );
+        TestSpecParser parser( TagAliasRegistry::get() );
        if ( !m_data.testsOrTags.empty() ) {
            m_hasTestFilters = true;
            for ( auto const& testOrTags : m_data.testsOrTags ) {
--- a/src/catch2/catch_message.cpp
+++ b/src/catch2/catch_message.cpp
@@ -6,10 +6,10 @@

 // SPDX-License-Identifier: BSL-1.0
 #include <catch2/catch_message.hpp>
-#include <catch2/interfaces/catch_interfaces_capture.hpp>
 #include <catch2/internal/catch_uncaught_exceptions.hpp>
 #include <catch2/internal/catch_enforce.hpp>
 #include <catch2/internal/catch_move_and_forward.hpp>
+#include <catch2/internal/catch_run_context.hpp>

 #include <cassert>
 #include <stack>
@@ -37,11 +37,7 @@ namespace Catch {
    }


-    Capturer::Capturer( StringRef macroName,
-                        SourceLineInfo const& lineInfo,
-                        ResultWas::OfType resultType,
-                        StringRef names ):
-        m_resultCapture( getResultCapture() ) {
+    Capturer::Capturer( StringRef macroName, SourceLineInfo const& lineInfo, ResultWas::OfType resultType, StringRef names ) {
        auto trimmed = [&] (size_t start, size_t end) {
            while (names[start] == ',' || isspace(static_cast<unsigned char>(names[start]))) {
                ++start;
--- a/src/catch2/catch_message.hpp
+++ b/src/catch2/catch_message.hpp
@@ -8,13 +8,12 @@
 #ifndef CATCH_MESSAGE_HPP_INCLUDED
 #define CATCH_MESSAGE_HPP_INCLUDED

-#include <catch2/internal/catch_config_prefix_messages.hpp>
 #include <catch2/internal/catch_result_type.hpp>
 #include <catch2/internal/catch_reusable_string_stream.hpp>
 #include <catch2/internal/catch_stream_end_stop.hpp>
 #include <catch2/internal/catch_message_info.hpp>
+#include <catch2/internal/catch_run_context.hpp>
 #include <catch2/catch_tostring.hpp>
-#include <catch2/interfaces/catch_interfaces_capture.hpp>

 #include <string>
 #include <vector>
@@ -22,7 +21,6 @@
 namespace Catch {

    struct SourceLineInfo;
-    class IResultCapture;

    struct MessageStream {

@@ -63,7 +61,7 @@ namespace Catch {

    class Capturer {
        std::vector<MessageInfo> m_messages;
-        IResultCapture& m_resultCapture;
+        RunContext& m_resultCapture = getResultCapture();
        size_t m_captured = 0;
    public:
        Capturer( StringRef macroName, SourceLineInfo const& lineInfo, ResultWas::OfType resultType, StringRef names );
@@ -114,28 +112,28 @@ namespace Catch {
    Catch::getResultCapture().emplaceUnscopedMessage( Catch::MessageBuilder( macroName##_catch_sr, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log )


-#if defined(CATCH_CONFIG_PREFIX_MESSAGES) && !defined(CATCH_CONFIG_DISABLE)
+#if defined(CATCH_CONFIG_PREFIX_ALL) && !defined(CATCH_CONFIG_DISABLE)

  #define CATCH_INFO( msg ) INTERNAL_CATCH_INFO( "CATCH_INFO", msg )
  #define CATCH_UNSCOPED_INFO( msg ) INTERNAL_CATCH_UNSCOPED_INFO( "CATCH_UNSCOPED_INFO", msg )
  #define CATCH_WARN( msg ) INTERNAL_CATCH_MSG( "CATCH_WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg )
  #define CATCH_CAPTURE( ... ) INTERNAL_CATCH_CAPTURE( INTERNAL_CATCH_UNIQUE_NAME(capturer), "CATCH_CAPTURE", __VA_ARGS__ )

-#elif defined(CATCH_CONFIG_PREFIX_MESSAGES) && defined(CATCH_CONFIG_DISABLE)
+#elif defined(CATCH_CONFIG_PREFIX_ALL) && defined(CATCH_CONFIG_DISABLE)

  #define CATCH_INFO( msg )          (void)(0)
  #define CATCH_UNSCOPED_INFO( msg ) (void)(0)
  #define CATCH_WARN( msg )          (void)(0)
  #define CATCH_CAPTURE( ... )       (void)(0)

-#elif !defined(CATCH_CONFIG_PREFIX_MESSAGES) && !defined(CATCH_CONFIG_DISABLE)
+#elif !defined(CATCH_CONFIG_PREFIX_ALL) && !defined(CATCH_CONFIG_DISABLE)

  #define INFO( msg ) INTERNAL_CATCH_INFO( "INFO", msg )
  #define UNSCOPED_INFO( msg ) INTERNAL_CATCH_UNSCOPED_INFO( "UNSCOPED_INFO", msg )
  #define WARN( msg ) INTERNAL_CATCH_MSG( "WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg )
  #define CAPTURE( ... ) INTERNAL_CATCH_CAPTURE( INTERNAL_CATCH_UNIQUE_NAME(capturer), "CAPTURE", __VA_ARGS__ )

-#elif !defined(CATCH_CONFIG_PREFIX_MESSAGES) && defined(CATCH_CONFIG_DISABLE)
+#elif !defined(CATCH_CONFIG_PREFIX_ALL) && defined(CATCH_CONFIG_DISABLE)

  #define INFO( msg )          (void)(0)
  #define UNSCOPED_INFO( msg ) (void)(0)
--- a/src/catch2/catch_registry_hub.cpp
+++ b/src/catch2/catch_registry_hub.cpp
@@ -1,107 +0,0 @@
-
-//              Copyright Catch2 Authors
-// Distributed under the Boost Software License, Version 1.0.
-//   (See accompanying file LICENSE.txt or copy at
-//        https://www.boost.org/LICENSE_1_0.txt)
-
-// SPDX-License-Identifier: BSL-1.0
-#include <catch2/interfaces/catch_interfaces_registry_hub.hpp>
-
-#include <catch2/internal/catch_context.hpp>
-#include <catch2/internal/catch_enforce.hpp>
-#include <catch2/internal/catch_test_case_registry_impl.hpp>
-#include <catch2/internal/catch_reporter_registry.hpp>
-#include <catch2/internal/catch_exception_translator_registry.hpp>
-#include <catch2/internal/catch_tag_alias_registry.hpp>
-#include <catch2/internal/catch_startup_exception_registry.hpp>
-#include <catch2/internal/catch_singletons.hpp>
-#include <catch2/internal/catch_enum_values_registry.hpp>
-#include <catch2/catch_test_case_info.hpp>
-#include <catch2/internal/catch_noncopyable.hpp>
-#include <catch2/interfaces/catch_interfaces_reporter_factory.hpp>
-#include <catch2/internal/catch_move_and_forward.hpp>
-#include <catch2/internal/catch_reporter_registry.hpp>
-
-#include <exception>
-
-namespace Catch {
-
-    namespace {
-
-        class RegistryHub : public IRegistryHub,
-                            public IMutableRegistryHub,
-                            private Detail::NonCopyable {
-
-        public: // IRegistryHub
-            RegistryHub() = default;
-            ReporterRegistry const& getReporterRegistry() const override {
-                return m_reporterRegistry;
-            }
-            ITestCaseRegistry const& getTestCaseRegistry() const override {
-                return m_testCaseRegistry;
-            }
-            IExceptionTranslatorRegistry const& getExceptionTranslatorRegistry() const override {
-                return m_exceptionTranslatorRegistry;
-            }
-            ITagAliasRegistry const& getTagAliasRegistry() const override {
-                return m_tagAliasRegistry;
-            }
-            StartupExceptionRegistry const& getStartupExceptionRegistry() const override {
-                return m_exceptionRegistry;
-            }
-
-        public: // IMutableRegistryHub
-            void registerReporter( std::string const& name, IReporterFactoryPtr factory ) override {
-                m_reporterRegistry.registerReporter( name, CATCH_MOVE(factory) );
-            }
-            void registerListener( Detail::unique_ptr<EventListenerFactory> factory ) override {
-                m_reporterRegistry.registerListener( CATCH_MOVE(factory) );
-            }
-            void registerTest( Detail::unique_ptr<TestCaseInfo>&& testInfo, Detail::unique_ptr<ITestInvoker>&& invoker ) override {
-                m_testCaseRegistry.registerTest( CATCH_MOVE(testInfo), CATCH_MOVE(invoker) );
-            }
-            void registerTranslator( Detail::unique_ptr<IExceptionTranslator>&& translator ) override {
-                m_exceptionTranslatorRegistry.registerTranslator( CATCH_MOVE(translator) );
-            }
-            void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) override {
-                m_tagAliasRegistry.add( alias, tag, lineInfo );
-            }
-            void registerStartupException() noexcept override {
-#if !defined(CATCH_CONFIG_DISABLE_EXCEPTIONS)
-                m_exceptionRegistry.add(std::current_exception());
-#else
-                CATCH_INTERNAL_ERROR("Attempted to register active exception under CATCH_CONFIG_DISABLE_EXCEPTIONS!");
-#endif
-            }
-            IMutableEnumValuesRegistry& getMutableEnumValuesRegistry() override {
-                return m_enumValuesRegistry;
-            }
-
-        private:
-            TestRegistry m_testCaseRegistry;
-            ReporterRegistry m_reporterRegistry;
-            ExceptionTranslatorRegistry m_exceptionTranslatorRegistry;
-            TagAliasRegistry m_tagAliasRegistry;
-            StartupExceptionRegistry m_exceptionRegistry;
-            Detail::EnumValuesRegistry m_enumValuesRegistry;
-        };
-    }
-
-    using RegistryHubSingleton = Singleton<RegistryHub, IRegistryHub, IMutableRegistryHub>;
-
-    IRegistryHub const& getRegistryHub() {
-        return RegistryHubSingleton::get();
-    }
-    IMutableRegistryHub& getMutableRegistryHub() {
-        return RegistryHubSingleton::getMutable();
-    }
-    void cleanUp() {
-        cleanupSingletons();
-        cleanUpContext();
-    }
-    std::string translateActiveException() {
-        return getRegistryHub().getExceptionTranslatorRegistry().translateActiveException();
-    }
-
-
-} // end namespace Catch
--- a/src/catch2/catch_session.cpp
+++ b/src/catch2/catch_session.cpp
@@ -13,9 +13,9 @@
 #include <catch2/internal/catch_run_context.hpp>
 #include <catch2/catch_test_spec.hpp>
 #include <catch2/catch_version.hpp>
+#include <catch2/interfaces/catch_interfaces_reporter.hpp>
 #include <catch2/internal/catch_startup_exception_registry.hpp>
 #include <catch2/internal/catch_sharding.hpp>
-#include <catch2/internal/catch_test_case_registry_impl.hpp>
 #include <catch2/internal/catch_textflow.hpp>
 #include <catch2/internal/catch_windows_h_proxy.hpp>
 #include <catch2/reporters/catch_reporter_multi.hpp>
@@ -24,10 +24,12 @@
 #include <catch2/internal/catch_move_and_forward.hpp>
 #include <catch2/internal/catch_stdstreams.hpp>
 #include <catch2/internal/catch_istream.hpp>
+#include <catch2/internal/catch_test_case_registry_impl.hpp>
+#include <catch2/internal/catch_registry_hub.hpp>
+#include <catch2/catch_test_case_info.hpp>

 #include <algorithm>
 #include <cassert>
-#include <exception>
 #include <iomanip>
 #include <set>

--- a/src/catch2/catch_tag_alias_autoregistrar.cpp
+++ b/src/catch2/catch_tag_alias_autoregistrar.cpp
@@ -8,7 +8,7 @@

 #include <catch2/catch_tag_alias_autoregistrar.hpp>
 #include <catch2/internal/catch_compiler_capabilities.hpp>
-#include <catch2/interfaces/catch_interfaces_registry_hub.hpp>
+#include <catch2/internal/catch_registry_hub.hpp>

 namespace Catch {

--- a/src/catch2/catch_test_case_info.cpp
+++ b/src/catch2/catch_test_case_info.cpp
@@ -139,20 +139,12 @@ namespace Catch {
        for (size_t idx = 0; idx < originalTags.size(); ++idx) {
            auto c = originalTags[idx];
            if (c == '[') {
-                CATCH_ENFORCE(
-                    !inTag,
-                    "Found '[' inside a tag while registering test case '"
-                        << _nameAndTags.name << "' at " << _lineInfo );
-
+                assert(!inTag);
                inTag = true;
                tagStart = idx;
            }
            if (c == ']') {
-                CATCH_ENFORCE(
-                    inTag,
-                    "Found unmatched ']' while registering test case '"
-                        << _nameAndTags.name << "' at " << _lineInfo );
-
+                assert(inTag);
                inTag = false;
                tagEnd = idx;
                assert(tagStart < tagEnd);
@@ -161,11 +153,7 @@ namespace Catch {
                // it over to backing storage and actually reference the
                // backing storage in the saved tags
                StringRef tagStr = originalTags.substr(tagStart+1, tagEnd - tagStart - 1);
-                CATCH_ENFORCE( !tagStr.empty(),
-                               "Found an empty tag while registering test case '"
-                                   << _nameAndTags.name << "' at "
-                                   << _lineInfo );
-
+                CATCH_ENFORCE(!tagStr.empty(), "Empty tags are not allowed");
                enforceNotReservedTag(tagStr, lineInfo);
                properties |= parseSpecialTag(tagStr);
                // When copying a tag to the backing storage, we need to
@@ -179,12 +167,8 @@ namespace Catch {
                // the tags.
                internalAppendTag(tagStr);
            }
+            (void)inTag; // Silence "set-but-unused" warning in release mode.
        }
-        CATCH_ENFORCE( !inTag,
-                       "Found an unclosed tag while registering test case '"
-                           << _nameAndTags.name << "' at " << _lineInfo );
-
-
        // Add [.] if relevant
        if (isHidden()) {
            internalAppendTag("."_sr);
--- a/src/catch2/internal/catch_test_run_info.hpp
+++ b/src/catch2/internal/catch_test_run_info.hpp
@@ -17,6 +17,7 @@ namespace Catch {
        StringRef name;
    };

+
 } // end namespace Catch

 #endif // CATCH_TEST_RUN_INFO_HPP_INCLUDED
--- a/src/catch2/catch_test_spec.cpp
+++ b/src/catch2/catch_test_spec.cpp
@@ -6,10 +6,9 @@

 // SPDX-License-Identifier: BSL-1.0
 #include <catch2/catch_test_spec.hpp>
-#include <catch2/interfaces/catch_interfaces_testcase.hpp>
-#include <catch2/internal/catch_test_case_registry_impl.hpp>
 #include <catch2/internal/catch_reusable_string_stream.hpp>
 #include <catch2/internal/catch_string_manip.hpp>
+#include <catch2/internal/catch_test_case_registry_impl.hpp>
 #include <catch2/catch_test_case_info.hpp>

 #include <algorithm>
@@ -108,18 +107,16 @@ namespace Catch {
        return std::any_of( m_filters.begin(), m_filters.end(), [&]( Filter const& f ){ return f.matches( testCase ); } );
    }

-    TestSpec::Matches TestSpec::matchesByFilter( std::vector<TestCaseHandle> const& testCases, IConfig const& config ) const {
-        Matches matches;
-        matches.reserve( m_filters.size() );
-        for ( auto const& filter : m_filters ) {
+    TestSpec::Matches TestSpec::matchesByFilter( std::vector<TestCaseHandle> const& testCases, IConfig const& config ) const
+    {
+        Matches matches( m_filters.size() );
+        std::transform( m_filters.begin(), m_filters.end(), matches.begin(), [&]( Filter const& filter ){
            std::vector<TestCaseHandle const*> currentMatches;
-            for ( auto const& test : testCases )
-                if ( isThrowSafe( test, config ) &&
-                     filter.matches( test.getTestCaseInfo() ) )
+            for( auto const& test : testCases )
+                if( isThrowSafe( test, config ) && filter.matches( test.getTestCaseInfo() ) )
                    currentMatches.emplace_back( &test );
-            matches.push_back(
-                FilterMatch{ extractFilterName( filter ), currentMatches } );
-        }
+            return FilterMatch{ extractFilterName(filter), currentMatches };
+        } );
        return matches;
    }

--- a/src/catch2/catch_tostring.hpp
+++ b/src/catch2/catch_tostring.hpp
@@ -16,9 +16,9 @@

 #include <catch2/internal/catch_compiler_capabilities.hpp>
 #include <catch2/internal/catch_config_wchar.hpp>
+#include <catch2/internal/catch_stringref.hpp>
 #include <catch2/internal/catch_reusable_string_stream.hpp>
 #include <catch2/internal/catch_void_type.hpp>
-#include <catch2/interfaces/catch_interfaces_enum_values_registry.hpp>

 #ifdef CATCH_CONFIG_CPP17_STRING_VIEW
 #include <string_view>
@@ -116,6 +116,7 @@ namespace Catch {
    } // namespace Detail


+    // If we decide for C++14, change these to enable_if_ts
    template <typename T, typename = void>
    struct StringMaker {
        template <typename Fake = T>
@@ -398,12 +399,6 @@ namespace Catch {
            }
        }
    };
-    template <>
-    struct StringMaker<std::nullopt_t> {
-        static std::string convert(const std::nullopt_t&) {
-            return "{ }";
-        }
-    };
 }
 #endif // CATCH_CONFIG_ENABLE_OPTIONAL_STRINGMAKER

@@ -653,7 +648,7 @@ struct ratio_string<std::milli> {
    };
 }

-#include <catch2/interfaces/catch_interfaces_registry_hub.hpp>
+#include <catch2/internal/catch_registry_hub.hpp>

 #define INTERNAL_CATCH_REGISTER_ENUM( enumName, ... ) \
 namespace Catch { \
--- a/src/catch2/catch_translate_exception.cpp
+++ b/src/catch2/catch_translate_exception.cpp
@@ -7,7 +7,7 @@
 // SPDX-License-Identifier: BSL-1.0

 #include <catch2/catch_translate_exception.hpp>
-#include <catch2/interfaces/catch_interfaces_registry_hub.hpp>
+#include <catch2/internal/catch_registry_hub.hpp>

 namespace Catch {
    namespace Detail {
--- a/src/catch2/catch_translate_exception.hpp
+++ b/src/catch2/catch_translate_exception.hpp
@@ -52,9 +52,8 @@ namespace Catch {
    public:
        template<typename T>
        ExceptionTranslatorRegistrar( std::string(*translateFunction)( T const& ) ) {
-            Detail::registerTranslatorImpl(
-                Detail::make_unique<ExceptionTranslator<T>>(
-                    translateFunction ) );
+            Detail::registerTranslatorImpl( Detail::make_unique<ExceptionTranslator<T>>(
+                translateFunction ) );
        }
    };

--- a/src/catch2/catch_user_config.hpp.in
+++ b/src/catch2/catch_user_config.hpp.in
@@ -169,18 +169,9 @@
 #endif


-#cmakedefine CATCH_CONFIG_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT
-#cmakedefine CATCH_CONFIG_NO_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT
-
-#if defined( CATCH_CONFIG_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT ) && \
-    defined( CATCH_CONFIG_NO_EXPERIMENTAL_STATIC_ANALYSIS_SUPPORT )
-#    error Cannot force STATIC_ANALYSIS_SUPPORT to both ON and OFF
-#endif
-
-
 // ------
 // Simple toggle defines
-// their value is never used and they cannot be overridden
+// their value is never used and they cannot be overriden
 // ------


@@ -198,7 +189,6 @@
 #cmakedefine CATCH_CONFIG_FAST_COMPILE
 #cmakedefine CATCH_CONFIG_NOSTDOUT
 #cmakedefine CATCH_CONFIG_PREFIX_ALL
-#cmakedefine CATCH_CONFIG_PREFIX_MESSAGES
 #cmakedefine CATCH_CONFIG_WINDOWS_CRTDBG

 #cmakedefine CATCH_CONFIG_SHARED_LIBRARY
--- a/src/catch2/catch_version.cpp
+++ b/src/catch2/catch_version.cpp
@@ -36,7 +36,7 @@ namespace Catch {
    }

    Version const& libraryVersion() {
-        static Version version( 3, 5, 0, "", 0 );
+        static Version version( 3, 3, 2, "", 0 );
        return version;
    }

--- a/src/catch2/catch_version_macros.hpp
+++ b/src/catch2/catch_version_macros.hpp
@@ -9,7 +9,7 @@
 #define CATCH_VERSION_MACROS_HPP_INCLUDED

 #define CATCH_VERSION_MAJOR 3
-#define CATCH_VERSION_MINOR 5
-#define CATCH_VERSION_PATCH 0
+#define CATCH_VERSION_MINOR 3
+#define CATCH_VERSION_PATCH 2

 #endif // CATCH_VERSION_MACROS_HPP_INCLUDED
--- a/src/catch2/generators/catch_generators.cpp
+++ b/src/catch2/generators/catch_generators.cpp
@@ -9,7 +9,7 @@
 #include <catch2/generators/catch_generators.hpp>
 #include <catch2/internal/catch_enforce.hpp>
 #include <catch2/generators/catch_generator_exception.hpp>
-#include <catch2/interfaces/catch_interfaces_capture.hpp>
+#include <catch2/internal/catch_run_context.hpp>

 namespace Catch {

--- a/src/catch2/generators/catch_generators_random.cpp
+++ b/src/catch2/generators/catch_generators_random.cpp
@@ -7,35 +7,7 @@
 // SPDX-License-Identifier: BSL-1.0

 #include <catch2/generators/catch_generators_random.hpp>
+
 #include <catch2/internal/catch_context.hpp>

-#include <random>
-
-namespace Catch {
-    namespace Generators {
-        namespace Detail {
-            std::uint32_t getSeed() { return sharedRng()(); }
-        } // namespace Detail
-
-        struct RandomFloatingGenerator<long double>::PImpl {
-            PImpl( long double a, long double b, uint32_t seed ):
-                rng( seed ), dist( a, b ) {}
-
-            Catch::SimplePcg32 rng;
-            std::uniform_real_distribution<long double> dist;
-        };
-
-        RandomFloatingGenerator<long double>::RandomFloatingGenerator(
-            long double a, long double b, std::uint32_t seed) :
-            m_pimpl(Catch::Detail::make_unique<PImpl>(a, b, seed)) {
-            static_cast<void>( next() );
-        }
-
-        RandomFloatingGenerator<long double>::~RandomFloatingGenerator() =
-            default;
-        bool RandomFloatingGenerator<long double>::next() {
-            m_current_number = m_pimpl->dist( m_pimpl->rng );
-            return true;
-        }
-    } // namespace Generators
-} // namespace Catch
+std::uint32_t Catch::Generators::Detail::getSeed() { return sharedRng()(); }
--- a/src/catch2/generators/catch_generators_random.hpp
+++ b/src/catch2/generators/catch_generators_random.hpp
@@ -11,9 +11,8 @@
 #include <catch2/internal/catch_context.hpp>
 #include <catch2/generators/catch_generators.hpp>
 #include <catch2/internal/catch_random_number_generator.hpp>
-#include <catch2/internal/catch_uniform_integer_distribution.hpp>
-#include <catch2/internal/catch_uniform_floating_point_distribution.hpp>
-#include <catch2/internal/catch_unique_ptr.hpp>
+
+#include <random>

 namespace Catch {
 namespace Generators {
@@ -27,7 +26,7 @@ namespace Detail {
 template <typename Float>
 class RandomFloatingGenerator final : public IGenerator<Float> {
    Catch::SimplePcg32 m_rng;
-    Catch::uniform_floating_point_distribution<Float> m_dist;
+    std::uniform_real_distribution<Float> m_dist;
    Float m_current_number;
 public:
    RandomFloatingGenerator( Float a, Float b, std::uint32_t seed ):
@@ -45,27 +44,10 @@ public:
    }
 };

-template <>
-class RandomFloatingGenerator<long double> final : public IGenerator<long double> {
-    // We still rely on <random> for this specialization, but we don't
-    // want to drag it into the header.
-    struct PImpl;
-    Catch::Detail::unique_ptr<PImpl> m_pimpl;
-    long double m_current_number;
-
-public:
-    RandomFloatingGenerator( long double a, long double b, std::uint32_t seed );
-
-    long double const& get() const override { return m_current_number; }
-    bool next() override;
-
-    ~RandomFloatingGenerator() override; // = default
-};
-
 template <typename Integer>
 class RandomIntegerGenerator final : public IGenerator<Integer> {
    Catch::SimplePcg32 m_rng;
-    Catch::uniform_integer_distribution<Integer> m_dist;
+    std::uniform_int_distribution<Integer> m_dist;
    Integer m_current_number;
 public:
    RandomIntegerGenerator( Integer a, Integer b, std::uint32_t seed ):
@@ -86,6 +68,14 @@ public:
 template <typename T>
 std::enable_if_t<std::is_integral<T>::value, GeneratorWrapper<T>>
 random(T a, T b) {
+    static_assert(
+        !std::is_same<T, char>::value &&
+        !std::is_same<T, int8_t>::value &&
+        !std::is_same<T, uint8_t>::value &&
+        !std::is_same<T, signed char>::value &&
+        !std::is_same<T, unsigned char>::value &&
+        !std::is_same<T, bool>::value,
+        "The requested type is not supported by the underlying random distributions from std" );
    return GeneratorWrapper<T>(
        Catch::Detail::make_unique<RandomIntegerGenerator<T>>(a, b, Detail::getSeed())
    );
--- a/src/catch2/generators/catch_generators_range.hpp
+++ b/src/catch2/generators/catch_generators_range.hpp
@@ -96,11 +96,10 @@ GeneratorWrapper<ResultType> from_range(InputIterator from, InputSentinel to) {
    return GeneratorWrapper<ResultType>(Catch::Detail::make_unique<IteratorGenerator<ResultType>>(from, to));
 }

-template <typename Container>
-auto from_range(Container const& cnt) {
-    using std::begin;
-    using std::end;
-    return from_range( begin( cnt ), end( cnt ) );
+template <typename Container,
+          typename ResultType = typename Container::value_type>
+GeneratorWrapper<ResultType> from_range(Container const& cnt) {
+    return GeneratorWrapper<ResultType>(Catch::Detail::make_unique<IteratorGenerator<ResultType>>(cnt.begin(), cnt.end()));
 }


--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Martin Hořeňovský	5db31e587e	WIP: devirtualize RunContext	2023-03-21 11:32:44 +01:00
Martin Hořeňovský	f3960c02ce	Devirtualize RegistryHub	2023-03-21 11:30:22 +01:00
Martin Hořeňovský	02ce0a2eec	Unify ITestCaseRegistry and TestRegistry I also made a bunch of refactorings around the headers and includes to simplify the main include path.	2023-03-21 11:30:19 +01:00
Martin Hořeňovský	cf4d84a349	Unify ITagAliasRegistry and TagAliasRegistry	2023-03-21 11:30:17 +01:00
Martin Hořeňovský	cfe859e0f3	Unify IExceptionTranslatorRegistry and ExceptionTranslatorRegistry	2023-03-21 11:30:12 +01:00
Martin Hořeňovský	31b291ba26	Unify IMutableEnumRegistry and EnumValuesRegistry This time there was no need for compilation firewall, so we keep everything inlined.	2023-03-21 11:30:08 +01:00
Martin Hořeňovský	ceb7ab6b20	Unify IReporterRegistry and ReporterRegistry To keep the compilation firewall effect, the implementations are hidden behind a PIMPL. In this case it is probably not worth it, but we can inline it later if needed.	2023-03-21 11:30:06 +01:00
				`@@ -1 +0,0 @@`
				`option('tests', type: 'boolean', value: true, description: 'Build the unit tests')`