summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Soffer <asoffer@google.com>2019-10-16 18:32:31 (GMT)
committerAndy Soffer <asoffer@google.com>2019-10-16 18:32:31 (GMT)
commitbdc29d5dc19dd802907ea37a80ce5dc9afe0898d (patch)
treec01044e04caf77c9f5f2412df61d527b2b25c7c8
parent4c25e2b87fcb78abcfdee2739db9ed7a19754cd3 (diff)
parent90a8ab70a1f604f35801569683450834f5e6ce3b (diff)
downloadgoogletest-bdc29d5dc19dd802907ea37a80ce5dc9afe0898d.zip
googletest-bdc29d5dc19dd802907ea37a80ce5dc9afe0898d.tar.gz
googletest-bdc29d5dc19dd802907ea37a80ce5dc9afe0898d.tar.bz2
Merge pull request #2421 from kuzkry:cleanup-for-regex
PiperOrigin-RevId: 275058934
-rw-r--r--googlemock/docs/cheat_sheet.md6
-rw-r--r--googlemock/test/gmock-spec-builders_test.cc2
-rw-r--r--googletest/test/googletest-printers-test.cc1
3 files changed, 4 insertions, 5 deletions
diff --git a/googlemock/docs/cheat_sheet.md b/googlemock/docs/cheat_sheet.md
index 850963a..8ec5ea0 100644
--- a/googlemock/docs/cheat_sheet.md
+++ b/googlemock/docs/cheat_sheet.md
@@ -325,9 +325,9 @@ The `argument` can be either a C string or a C++ string object:
`ContainsRegex()` and `MatchesRegex()` take ownership of the `RE` object. They
use the regular expression syntax defined
-[here](../../googletest/docs/advanced.md#regular-expression-syntax).
-`StrCaseEq()`, `StrCaseNe()`, `StrEq()`, and `StrNe()` work for wide strings as
-well.
+[here](../../googletest/docs/advanced.md#regular-expression-syntax). All of
+these matchers, except `ContainsRegex()` and `MatchesRegex()` work for wide
+strings as well.
#### Container Matchers
diff --git a/googlemock/test/gmock-spec-builders_test.cc b/googlemock/test/gmock-spec-builders_test.cc
index 7bf5a8a..791a247 100644
--- a/googlemock/test/gmock-spec-builders_test.cc
+++ b/googlemock/test/gmock-spec-builders_test.cc
@@ -69,8 +69,8 @@ using testing::AtMost;
using testing::Between;
using testing::Cardinality;
using testing::CardinalityInterface;
-using testing::ContainsRegex;
using testing::Const;
+using testing::ContainsRegex;
using testing::DoAll;
using testing::DoDefault;
using testing::Eq;
diff --git a/googletest/test/googletest-printers-test.cc b/googletest/test/googletest-printers-test.cc
index 4bdc9ad..58be7d1 100644
--- a/googletest/test/googletest-printers-test.cc
+++ b/googletest/test/googletest-printers-test.cc
@@ -219,7 +219,6 @@ using ::testing::PrintToString;
using ::testing::internal::FormatForComparisonFailureMessage;
using ::testing::internal::ImplicitCast_;
using ::testing::internal::NativeArray;
-using ::testing::internal::RE;
using ::testing::internal::RelationToSourceReference;
using ::testing::internal::Strings;
using ::testing::internal::UniversalPrint;