1 files changed, 6 insertions, 14 deletions
diff --git a/clang-tidy/ClangTidyModule.cpp b/clang-tidy/ClangTidyModule.cpp
index a81213ce..dc3a11d0 100644
--- a/clang-tidy/ClangTidyModule.cpp
+++ b/clang-tidy/ClangTidyModule.cpp
@@ -12,18 +12,13 @@
 //===----------------------------------------------------------------------===//
 
 #include "ClangTidyModule.h"
-#include "llvm/Support/Regex.h"
 
 namespace clang {
 namespace tidy {
 
-CheckFactoryBase::~CheckFactoryBase() {}
-
 ClangTidyCheckFactories::~ClangTidyCheckFactories() {
-  for (std::map<std::string, CheckFactoryBase *>::iterator
-           I = Factories.begin(),
-           E = Factories.end();
-       I != E; ++I) {
+  for (FactoryMap::iterator I = Factories.begin(), E = Factories.end(); I != E;
+       ++I) {
     delete I->second;
   }
 }
@@ -34,13 +29,10 @@ void ClangTidyCheckFactories::addCheckFactory(StringRef Name,
 }
 
 void ClangTidyCheckFactories::createChecks(
-    StringRef CheckRegexString, SmallVectorImpl<ClangTidyCheck *> &Checks) {
-  llvm::Regex CheckRegex(CheckRegexString);
-  for (std::map<std::string, CheckFactoryBase *>::iterator
-           I = Factories.begin(),
-           E = Factories.end();
-       I != E; ++I) {
-    if (CheckRegex.match(I->first))
+    ChecksFilter &Filter, SmallVectorImpl<ClangTidyCheck *> &Checks) {
+  for (FactoryMap::iterator I = Factories.begin(), E = Factories.end(); I != E;
+       ++I) {
+    if (Filter.IsCheckEnabled(I->first))
       Checks.push_back(I->second->createCheck());
   }
 }