Fix typos

BUILD.bazel

@@ -66,7 +66,7 @@ expand_template(
 cc_library(
  name = "catch2_generated",
  hdrs = ["catch2/catch_user_config.hpp"],
- include_prefix = ".", # to manipulate -I of dependenices
+ include_prefix = ".", # to manipulate -I of dependencies
  visibility = ["//visibility:public"],
 )
 

CMake/Findcodecov.cmake

@@ -68,7 +68,7 @@ endif ()
 
 
 
-# Find the reuired flags foreach language.
+# Find the required flags foreach language.
 set(CMAKE_REQUIRED_QUIET_SAVE ${CMAKE_REQUIRED_QUIET})
 set(CMAKE_REQUIRED_QUIET ${codecov_FIND_QUIETLY})
 

docs/command-line.md

@@ -123,7 +123,7 @@ specs. You can:
  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
+ Note that commas take precedence 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]".
 

docs/generators.md

@@ -216,8 +216,8 @@ For floating point generators, the situation is much more complex.
 Generally Catch2 only promises reproducibility (or even just correctness!)
 on platforms that obey the IEEE-754 standard. Furthermore, reproducibility
 only applies between binaries that perform floating point math in the
-same way, e.g. if you compile a binary targetting the x87 FPU and another
-one targetting SSE2 for floating point math, their results will vary.
+same way, e.g. if you compile a binary targeting the x87 FPU and another
+one targeting SSE2 for floating point math, their results will vary.
 Similarly, binaries compiled with compiler flags that relax the IEEE-754
 adherence, e.g. `-ffast-math`, might provide different results than those
 compiled for strict IEEE-754 adherence.

docs/release-notes.md

@@ -120,7 +120,7 @@
 ### Improvements
 * Reintroduced support for GCC 5 and 6 (#2836)
  * As with VS2017, if they start causing trouble again, they will be dropped again.
-* Added workaround for targetting newest MacOS (Sonoma) using GCC (#2837, #2839)
+* Added workaround for targeting newest MacOS (Sonoma) using GCC (#2837, #2839)
 * `CATCH_CONFIG_DEFAULT_REPORTER` can now be an arbitrary reporter spec
  * Previously it could only be a plain reporter name, so it was impossible to compile in custom arguments to the reporter.
 * Improved performance of generating 64bit random integers by 20+%

docs/test-fixtures.md

@@ -130,7 +130,7 @@ TEST_CASE_PERSISTENT_FIXTURE( MyFixture, "Tests with MyFixture" ) {
 }
 ```
 
-This example demonstates two possible use-cases of this fixture type:
+This example demonstrates two possible use-cases of this fixture type:
 1. Improve test run times by reducing the amount of expensive and 
 redundant setup and tear-down required.
 2. Reusing results from the previous partial run, in the current

extras/CatchAddTests.cmake

@@ -87,7 +87,7 @@ function(catch_discover_tests_impl)
 
  # 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)
+ # wrongly split and thus failing test cases (false positives)
  string(REPLACE ";" "\;" output "${output}")
  string(REPLACE "\n" ";" output "${output}")
 

extras/catch_amalgamated.cpp

@@ -5961,7 +5961,7 @@ namespace Catch {
  auto& currentTracker = m_trackerContext.currentTracker();
  assert(
  currentTracker.nameAndLocation() != nameAndLoc &&
- "Trying to create tracker for a genreator that already has one" );
+ "Trying to create tracker for a generator that already has one" );
 
  auto newTracker = Catch::Detail::make_unique<Generators::GeneratorTracker>(
  CATCH_MOVE(nameAndLoc), m_trackerContext, &currentTracker );
@@ -6539,7 +6539,7 @@ namespace Catch {
  std::string origStr = CATCH_MOVE(str);
  str.clear();
  // There is at least one replacement, so reserve with the best guess
- // we can make without actually counting the number of occurences.
+ // we can make without actually counting the number of occurrences.
  str.reserve(origStr.size() - replaceThis.size() + withThis.size());
  do {
  str.append(origStr, copyBegin, i-copyBegin );

extras/catch_amalgamated.hpp

@@ -5160,7 +5160,7 @@ namespace Detail {
  * when the compiler handles `ExprLhs<T> == b`, it also tries to resolve
  * the overload set for `b == ExprLhs<T>`.
  *
- * To accomodate these use cases, decomposer ended up rather complex.
+ * To accommodate these use cases, decomposer ended up rather complex.
  *
  * 1) These types are handled by adding SFINAE overloads to our comparison
  * operators, checking whether `T == U` are comparable with the given
@@ -5275,7 +5275,7 @@ namespace Catch {
  public:
  constexpr auto isBinaryExpression() const -> bool { return m_isBinaryExpression; }
  constexpr auto getResult() const -> bool { return m_result; }
- //! This function **has** to be overriden by the derived class.
+ //! This function **has** to be overridden by the derived class.
  virtual void streamReconstructedExpression( std::ostream& os ) const;
 
  constexpr ITransientExpression( bool isBinaryExpression, bool result )

src/catch2/internal/catch_decomposer.hpp

@@ -45,7 +45,7 @@
  * when the compiler handles `ExprLhs<T> == b`, it also tries to resolve
  * the overload set for `b == ExprLhs<T>`.
  *
- * To accomodate these use cases, decomposer ended up rather complex.
+ * To accommodate these use cases, decomposer ended up rather complex.
  *
  * 1) These types are handled by adding SFINAE overloads to our comparison
  * operators, checking whether `T == U` are comparable with the given
@@ -160,7 +160,7 @@ namespace Catch {
  public:
  constexpr auto isBinaryExpression() const -> bool { return m_isBinaryExpression; }
  constexpr auto getResult() const -> bool { return m_result; }
- //! This function **has** to be overriden by the derived class.
+ //! This function **has** to be overridden by the derived class.
  virtual void streamReconstructedExpression( std::ostream& os ) const;
 
  constexpr ITransientExpression( bool isBinaryExpression, bool result )

src/catch2/internal/catch_run_context.cpp

@@ -361,7 +361,7 @@ namespace Catch {
  auto& currentTracker = m_trackerContext.currentTracker();
  assert(
  currentTracker.nameAndLocation() != nameAndLoc &&
- "Trying to create tracker for a genreator that already has one" );
+ "Trying to create tracker for a generator that already has one" );
 
  auto newTracker = Catch::Detail::make_unique<Generators::GeneratorTracker>(
  CATCH_MOVE(nameAndLoc), m_trackerContext, &currentTracker );

src/catch2/internal/catch_string_manip.cpp

@@ -74,7 +74,7 @@ namespace Catch {
  std::string origStr = CATCH_MOVE(str);
  str.clear();
  // There is at least one replacement, so reserve with the best guess
- // we can make without actually counting the number of occurences.
+ // we can make without actually counting the number of occurrences.
  str.reserve(origStr.size() - replaceThis.size() + withThis.size());
  do {
  str.append(origStr, copyBegin, i-copyBegin );

tests/SelfTest/Baselines/automake.sw.approved.txt

@@ -174,7 +174,7 @@ Nor would this
 :test-result: XFAIL Inequality checks that should fail
 :test-result: PASS Inequality checks that should succeed
 :test-result: PASS JsonWriter
-:test-result: PASS JsonWriter escapes charaters in strings properly
+:test-result: PASS JsonWriter escapes characters in strings properly
 :test-result: PASS Lambdas in assertions
 :test-result: PASS Less-than inequalities with different epsilons
 :test-result: PASS ManuallyRegistered

tests/SelfTest/Baselines/automake.sw.multi.approved.txt

@@ -172,7 +172,7 @@
 :test-result: XFAIL Inequality checks that should fail
 :test-result: PASS Inequality checks that should succeed
 :test-result: PASS JsonWriter
-:test-result: PASS JsonWriter escapes charaters in strings properly
+:test-result: PASS JsonWriter escapes characters in strings properly
 :test-result: PASS Lambdas in assertions
 :test-result: PASS Less-than inequalities with different epsilons
 :test-result: PASS ManuallyRegistered

tests/SelfTest/Baselines/console.sw.approved.txt

@@ -7616,7 +7616,7 @@ with expansion:
  ""custom"" == ""custom""
 
 -------------------------------------------------------------------------------
-JsonWriter escapes charaters in strings properly
+JsonWriter escapes characters in strings properly
  Quote in a string is escaped
 -------------------------------------------------------------------------------
 Json.tests.cpp:<line number>
@@ -7628,7 +7628,7 @@ with expansion:
  ""\""" == ""\"""
 
 -------------------------------------------------------------------------------
-JsonWriter escapes charaters in strings properly
+JsonWriter escapes characters in strings properly
  Backslash in a string is escaped
 -------------------------------------------------------------------------------
 Json.tests.cpp:<line number>
@@ -7640,7 +7640,7 @@ with expansion:
  ""\\"" == ""\\""
 
 -------------------------------------------------------------------------------
-JsonWriter escapes charaters in strings properly
+JsonWriter escapes characters in strings properly
  Forward slash in a string is **not** escaped
 -------------------------------------------------------------------------------
 Json.tests.cpp:<line number>
@@ -7652,7 +7652,7 @@ with expansion:
  ""/"" == ""/""
 
 -------------------------------------------------------------------------------
-JsonWriter escapes charaters in strings properly
+JsonWriter escapes characters in strings properly
  Backspace in a string is escaped
 -------------------------------------------------------------------------------
 Json.tests.cpp:<line number>
@@ -7664,7 +7664,7 @@ with expansion:
  ""\b"" == ""\b""
 
 -------------------------------------------------------------------------------
-JsonWriter escapes charaters in strings properly
+JsonWriter escapes characters in strings properly
  Formfeed in a string is escaped
 -------------------------------------------------------------------------------
 Json.tests.cpp:<line number>
@@ -7676,7 +7676,7 @@ with expansion:
  ""\f"" == ""\f""
 
 -------------------------------------------------------------------------------
-JsonWriter escapes charaters in strings properly
+JsonWriter escapes characters in strings properly
  linefeed in a string is escaped
 -------------------------------------------------------------------------------
 Json.tests.cpp:<line number>
@@ -7688,7 +7688,7 @@ with expansion:
  ""\n"" == ""\n""
 
 -------------------------------------------------------------------------------
-JsonWriter escapes charaters in strings properly
+JsonWriter escapes characters in strings properly
  carriage return in a string is escaped
 -------------------------------------------------------------------------------
 Json.tests.cpp:<line number>
@@ -7700,7 +7700,7 @@ with expansion:
  ""\r"" == ""\r""
 
 -------------------------------------------------------------------------------
-JsonWriter escapes charaters in strings properly
+JsonWriter escapes characters in strings properly
  tab in a string is escaped
 -------------------------------------------------------------------------------
 Json.tests.cpp:<line number>
@@ -7712,7 +7712,7 @@ with expansion:
  ""\t"" == ""\t""
 
 -------------------------------------------------------------------------------
-JsonWriter escapes charaters in strings properly
+JsonWriter escapes characters in strings properly
  combination of characters is escaped
 -------------------------------------------------------------------------------
 Json.tests.cpp:<line number>
@@ -18944,4 +18944,3 @@ Misc.tests.cpp:<line number>: PASSED:
 ===============================================================================
 test cases: 418 | 312 passed | 86 failed | 6 skipped | 14 failed as expected
 assertions: 2259 | 2077 passed | 147 failed | 35 failed as expected
-

tests/SelfTest/Baselines/console.sw.multi.approved.txt

@@ -7614,7 +7614,7 @@ with expansion:
  ""custom"" == ""custom""
 
 -------------------------------------------------------------------------------
-JsonWriter escapes charaters in strings properly
+JsonWriter escapes characters in strings properly
  Quote in a string is escaped
 -------------------------------------------------------------------------------
 Json.tests.cpp:<line number>
@@ -7626,7 +7626,7 @@ with expansion:
  ""\""" == ""\"""
 
 -------------------------------------------------------------------------------
-JsonWriter escapes charaters in strings properly
+JsonWriter escapes characters in strings properly
  Backslash in a string is escaped
 -------------------------------------------------------------------------------
 Json.tests.cpp:<line number>
@@ -7638,7 +7638,7 @@ with expansion:
  ""\\"" == ""\\""
 
 -------------------------------------------------------------------------------
-JsonWriter escapes charaters in strings properly
+JsonWriter escapes characters in strings properly
  Forward slash in a string is **not** escaped
 -------------------------------------------------------------------------------
 Json.tests.cpp:<line number>
@@ -7650,7 +7650,7 @@ with expansion:
  ""/"" == ""/""
 
 -------------------------------------------------------------------------------
-JsonWriter escapes charaters in strings properly
+JsonWriter escapes characters in strings properly
  Backspace in a string is escaped
 -------------------------------------------------------------------------------
 Json.tests.cpp:<line number>
@@ -7662,7 +7662,7 @@ with expansion:
  ""\b"" == ""\b""
 
 -------------------------------------------------------------------------------
-JsonWriter escapes charaters in strings properly
+JsonWriter escapes characters in strings properly
  Formfeed in a string is escaped
 -------------------------------------------------------------------------------
 Json.tests.cpp:<line number>
@@ -7674,7 +7674,7 @@ with expansion:
  ""\f"" == ""\f""
 
 -------------------------------------------------------------------------------
-JsonWriter escapes charaters in strings properly
+JsonWriter escapes characters in strings properly
  linefeed in a string is escaped
 -------------------------------------------------------------------------------
 Json.tests.cpp:<line number>
@@ -7686,7 +7686,7 @@ with expansion:
  ""\n"" == ""\n""
 
 -------------------------------------------------------------------------------
-JsonWriter escapes charaters in strings properly
+JsonWriter escapes characters in strings properly
  carriage return in a string is escaped
 -------------------------------------------------------------------------------
 Json.tests.cpp:<line number>
@@ -7698,7 +7698,7 @@ with expansion:
  ""\r"" == ""\r""
 
 -------------------------------------------------------------------------------
-JsonWriter escapes charaters in strings properly
+JsonWriter escapes characters in strings properly
  tab in a string is escaped
 -------------------------------------------------------------------------------
 Json.tests.cpp:<line number>
@@ -7710,7 +7710,7 @@ with expansion:
  ""\t"" == ""\t""
 
 -------------------------------------------------------------------------------
-JsonWriter escapes charaters in strings properly
+JsonWriter escapes characters in strings properly
  combination of characters is escaped
 -------------------------------------------------------------------------------
 Json.tests.cpp:<line number>
@@ -18933,4 +18933,3 @@ Misc.tests.cpp:<line number>: PASSED:
 ===============================================================================
 test cases: 418 | 312 passed | 86 failed | 6 skipped | 14 failed as expected
 assertions: 2259 | 2077 passed | 147 failed | 35 failed as expected
-

tests/SelfTest/Baselines/junit.sw.approved.txt

@@ -928,16 +928,16 @@ at Condition.tests.cpp:<line number>
  <testcase classname="<exe-name>.global" name="JsonWriter/Moved from JsonObjectWriter shall not insert superfluous brace" time="{duration}" status="run"/>
  <testcase classname="<exe-name>.global" name="JsonWriter/Moved from JsonArrayWriter shall not insert superfluous bracket" time="{duration}" status="run"/>
  <testcase classname="<exe-name>.global" name="JsonWriter/Custom class shall be quoted" time="{duration}" status="run"/>
- <testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly" time="{duration}" status="run"/>
- <testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/Quote in a string is escaped" time="{duration}" status="run"/>
- <testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/Backslash in a string is escaped" time="{duration}" status="run"/>
- <testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/Forward slash in a string is **not** escaped" time="{duration}" status="run"/>
- <testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/Backspace in a string is escaped" time="{duration}" status="run"/>
- <testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/Formfeed in a string is escaped" time="{duration}" status="run"/>
- <testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/linefeed in a string is escaped" time="{duration}" status="run"/>
- <testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/carriage return in a string is escaped" time="{duration}" status="run"/>
- <testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/tab in a string is escaped" time="{duration}" status="run"/>
- <testcase classname="<exe-name>.global" name="JsonWriter escapes charaters in strings properly/combination of characters is escaped" time="{duration}" status="run"/>
+ <testcase classname="<exe-name>.global" name="JsonWriter escapes characters in strings properly" time="{duration}" status="run"/>
+ <testcase classname="<exe-name>.global" name="JsonWriter escapes characters in strings properly/Quote in a string is escaped" time="{duration}" status="run"/>
+ <testcase classname="<exe-name>.global" name="JsonWriter escapes characters in strings properly/Backslash in a string is escaped" time="{duration}" status="run"/>
+ <testcase classname="<exe-name>.global" name="JsonWriter escapes characters in strings properly/Forward slash in a string is **not** escaped" time="{duration}" status="run"/>
+ <testcase classname="<exe-name>.global" name="JsonWriter escapes characters in strings properly/Backspace in a string is escaped" time="{duration}" status="run"/>
+ <testcase classname="<exe-name>.global" name="JsonWriter escapes characters in strings properly/Formfeed in a string is escaped" time="{duration}" status="run"/>
+ <testcase classname="<exe-name>.global" name="JsonWriter escapes characters in strings properly/linefeed in a string is escaped" time="{duration}" status="run"/>
+ <testcase classname="<exe-name>.global" name="JsonWriter escapes characters in strings properly/carriage return in a string is escaped" time="{duration}" status="run"/>
+ <testcase classname="<exe-name>.global" name="JsonWriter escapes characters in strings properly/tab in a string is escaped" time="{duration}" status="run"/>
+ <testcase classname="<exe-name>.global" name="JsonWriter escapes characters in strings properly/combination of characters is escaped" time="{duration}" status="run"/>
  <testcase classname="<exe-name>.global" name="Lambdas in assertions" time="{duration}" status="run"/>
  <testcase classname="<exe-name>.global" name="Less-than inequalities with different epsilons" time="{duration}" status="run"/>
  <testcase classname="<exe-name>.global" name="ManuallyRegistered" time="{duration}" status="run"/>