Skip to content

Commit 075810f

Browse files
committed
Merge pull request #3581 from cclauss:codespell
PiperOrigin-RevId: 400792845
2 parents 3b49be0 + ee1be03 commit 075810f

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

docs/reference/matchers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ You can make a matcher from one or more other matchers:
238238
| `AnyOf(m1, m2, ..., mn)` | `argument` matches at least one of the matchers `m1` to `mn`. |
239239
| `AnyOfArray({m0, m1, ..., mn})`, `AnyOfArray(a_container)`, `AnyOfArray(begin, end)`, `AnyOfArray(array)`, or `AnyOfArray(array, count)` | The same as `AnyOf()` except that the matchers come from an initializer list, STL-style container, iterator range, or C-style array. |
240240
| `Not(m)` | `argument` doesn't match matcher `m`. |
241-
| `Conditional(cond, m1, m2)` | Matches matcher `m1` if `cond` evalutes to true, else matches `m2`.|
241+
| `Conditional(cond, m1, m2)` | Matches matcher `m1` if `cond` evaluates to true, else matches `m2`.|
242242

243243
## Adapters for Matchers
244244

googlemock/include/gmock/gmock-matchers.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5422,7 +5422,7 @@ PolymorphicMatcher<internal::ExceptionMatcherImpl<Err>> ThrowsMessage(
54225422
#define EXPECT_THAT(value, matcher) EXPECT_PRED_FORMAT1(\
54235423
::testing::internal::MakePredicateFormatterFromMatcher(matcher), value)
54245424

5425-
// MATCHER* macroses itself are listed below.
5425+
// MATCHER* macros itself are listed below.
54265426
#define MATCHER(name, description) \
54275427
class name##Matcher \
54285428
: public ::testing::internal::MatcherBaseImpl<name##Matcher> { \

googlemock/include/gmock/gmock-spec-builders.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1508,7 +1508,7 @@ class FunctionMocker<R(Args...)> final : public UntypedFunctionMockerBase {
15081508

15091509
// Performs the default action of this mock function on the given
15101510
// arguments and returns the result. Asserts (or throws if
1511-
// exceptions are enabled) with a helpful call descrption if there
1511+
// exceptions are enabled) with a helpful call description if there
15121512
// is no valid return value. This method doesn't depend on the
15131513
// mutable state of this object, and thus can be called concurrently
15141514
// without locking.

googlemock/test/gmock-matchers_test.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8405,7 +8405,7 @@ TEST(AnyOfArrayTest, ExplainsMatchResultCorrectly) {
84058405
// Explain with matchers
84068406
const Matcher<int> g1 = AnyOfArray({GreaterThan(1)});
84078407
const Matcher<int> g2 = AnyOfArray({GreaterThan(1), GreaterThan(2)});
8408-
// Explains the first positiv match and all prior negative matches...
8408+
// Explains the first positive match and all prior negative matches...
84098409
EXPECT_EQ("which is 1 less than 1", Explain(g1, 0));
84108410
EXPECT_EQ("which is the same as 1", Explain(g1, 1));
84118411
EXPECT_EQ("which is 1 more than 1", Explain(g1, 2));

googletest/include/gtest/internal/gtest-internal.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -508,11 +508,11 @@ inline SetUpTearDownSuiteFuncType GetNotDefaultOrNull(
508508

509509
template <typename T>
510510
// Note that SuiteApiResolver inherits from T because
511-
// SetUpTestSuite()/TearDownTestSuite() could be protected. Ths way
511+
// SetUpTestSuite()/TearDownTestSuite() could be protected. This way
512512
// SuiteApiResolver can access them.
513513
struct SuiteApiResolver : T {
514514
// testing::Test is only forward declared at this point. So we make it a
515-
// dependend class for the compiler to be OK with it.
515+
// dependent class for the compiler to be OK with it.
516516
using Test =
517517
typename std::conditional<sizeof(T) != 0, ::testing::Test, void>::type;
518518

googletest/include/gtest/internal/gtest-port.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -994,7 +994,7 @@ inline void FlushInfoLog() { fflush(nullptr); }
994994
//
995995
// GTEST_CHECK_ is an all-mode assert. It aborts the program if the condition
996996
// is not satisfied.
997-
// Synopsys:
997+
// Synopsis:
998998
// GTEST_CHECK_(boolean_condition);
999999
// or
10001000
// GTEST_CHECK_(boolean_condition) << "Additional message";
@@ -1049,7 +1049,7 @@ struct ConstRef<T&> { typedef T& type; };
10491049
// const Foo*). When you use ImplicitCast_, the compiler checks that
10501050
// the cast is safe. Such explicit ImplicitCast_s are necessary in
10511051
// surprisingly many situations where C++ demands an exact type match
1052-
// instead of an argument type convertable to a target type.
1052+
// instead of an argument type convertible to a target type.
10531053
//
10541054
// The syntax for using ImplicitCast_ is the same as for static_cast:
10551055
//

googletest/test/gtest_test_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ def __init__(self, command, working_dir=None, capture_stderr=True, env=None):
224224
combined in a string.
225225
"""
226226

227-
# The subprocess module is the preferrable way of running programs
227+
# The subprocess module is the preferable way of running programs
228228
# since it is available and behaves consistently on all platforms,
229229
# including Windows. But it is only available starting in python 2.4.
230230
# In earlier python versions, we revert to the popen2 module, which is

0 commit comments

Comments
 (0)