Fixed incorrect StringRef::find usage.

llvm-svn: 208898

2 files changed, 4 insertions, 4 deletions

diff --git a/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp b/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp
index 65f801cf65b..6ef1c34b483 100644
--- a/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp
+++ b/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp
@@ -130,7 +130,7 @@ static llvm::Regex ConsumeGlob(StringRef &GlobList) {
   for (char C : Glob) {
     if (C == '*')
       RegexText.push_back('.');
-    else if (MetaChars.find(C))
+    else if (MetaChars.find(C) != StringRef::npos)
       RegexText.push_back('\\');
     RegexText.push_back(C);
   }
diff --git a/clang-tools-extra/unittests/clang-tidy/ClangTidyDiagnosticConsumerTest.cpp b/clang-tools-extra/unittests/clang-tidy/ClangTidyDiagnosticConsumerTest.cpp
index 8936c82b2b4..bc2338552b2 100644
--- a/clang-tools-extra/unittests/clang-tidy/ClangTidyDiagnosticConsumerTest.cpp
+++ b/clang-tools-extra/unittests/clang-tidy/ClangTidyDiagnosticConsumerTest.cpp
@@ -66,7 +66,7 @@ TEST(ChecksFilter, Simple) {
 }
 
 TEST(ChecksFilter, Complex) {
-  ChecksFilter Filter("*,-a.*,-b.*,a.a.*,-a.a.a.*,-..,-...,-..+,-*$,-*qwe*");
+  ChecksFilter Filter("*,-a.*,-b.*,a.1.*,-a.1.A.*,-..,-...,-..+,-*$,-*qwe*");
 
   EXPECT_TRUE(Filter.isCheckEnabled("aaa"));
   EXPECT_TRUE(Filter.isCheckEnabled("qqq"));
@@ -74,8 +74,8 @@ TEST(ChecksFilter, Complex) {
   EXPECT_FALSE(Filter.isCheckEnabled("a.b"));
   EXPECT_FALSE(Filter.isCheckEnabled("b."));
   EXPECT_FALSE(Filter.isCheckEnabled("b.b"));
-  EXPECT_TRUE(Filter.isCheckEnabled("a.a.b"));
-  EXPECT_FALSE(Filter.isCheckEnabled("a.a.a.a"));
+  EXPECT_TRUE(Filter.isCheckEnabled("a.1.b"));
+  EXPECT_FALSE(Filter.isCheckEnabled("a.1.A.a"));
   EXPECT_FALSE(Filter.isCheckEnabled("qwe"));
   EXPECT_FALSE(Filter.isCheckEnabled("asdfqweasdf"));
   EXPECT_TRUE(Filter.isCheckEnabled("asdfqwEasdf"));