Revert "[libTooling] Generalize string explanation as templated metadata"

This reverts commit 1844054. Causing failures
in some build modes.

e.g. https://lab.llvm.org/buildbot/#/builders/217/builds/1886

Author: ymand

clang-tools-extra/clang-tidy/abseil/CleanupCtadCheck.cpp

@@ -23,7 +23,7 @@ namespace clang {
 namespace tidy {
 namespace abseil {
 
-RewriteRuleWith<std::string> CleanupCtadCheckImpl() {
+RewriteRule CleanupCtadCheckImpl() {
   auto warning_message = cat("prefer absl::Cleanup's class template argument "
                              "deduction pattern in C++17 and higher");
 

clang-tools-extra/clang-tidy/abseil/StringFindStrContainsCheck.cpp

@@ -30,7 +30,7 @@ using ::clang::transformer::cat;
 using ::clang::transformer::changeTo;
 using ::clang::transformer::makeRule;
 using ::clang::transformer::node;
-using ::clang::transformer::RewriteRuleWith;
+using ::clang::transformer::RewriteRule;
 
 AST_MATCHER(Type, isCharType) { return Node.isCharType(); }
 
@@ -39,7 +39,7 @@ static const char DefaultStringLikeClasses[] = "::std::basic_string;"
                                                "::absl::string_view";
 static const char DefaultAbseilStringsMatchHeader[] = "absl/strings/match.h";
 
-static transformer::RewriteRuleWith<std::string>
+static transformer::RewriteRule
 makeRewriteRule(const std::vector<std::string> &StringLikeClassNames,
                 StringRef AbseilStringsMatchHeader) {
   auto StringLikeClass = cxxRecordDecl(hasAnyName(SmallVector<StringRef, 4>(
@@ -62,7 +62,7 @@ makeRewriteRule(const std::vector<std::string> &StringLikeClassNames,
             hasArgument(1, cxxDefaultArgExpr())),
       onImplicitObjectArgument(expr().bind("string_being_searched")));
 
-  RewriteRuleWith<std::string> Rule = applyFirst(
+  RewriteRule Rule = applyFirst(
       {makeRule(
            binaryOperator(hasOperatorName("=="),
                           hasOperands(ignoringParenImpCasts(StringNpos),

clang-tools-extra/clang-tidy/bugprone/StringviewNullptrCheck.cpp

@@ -37,7 +37,7 @@ AST_MATCHER(clang::VarDecl, isDirectInitialization) {
 
 } // namespace
 
-RewriteRuleWith<std::string> StringviewNullptrCheckImpl() {
+RewriteRule StringviewNullptrCheckImpl() {
   auto construction_warning =
       cat("constructing basic_string_view from null is undefined; replace with "
           "the default constructor");

clang-tools-extra/clang-tidy/utils/TransformerClangTidyCheck.cpp

@@ -13,16 +13,16 @@
 namespace clang {
 namespace tidy {
 namespace utils {
-using transformer::RewriteRuleWith;
+using transformer::RewriteRule;
 
 #ifndef NDEBUG
-static bool hasGenerator(const transformer::Generator<std::string> &G) {
-  return G != nullptr;
+static bool hasExplanation(const RewriteRule::Case &C) {
+  return C.Explanation != nullptr;
 }
 #endif
 
-static void verifyRule(const RewriteRuleWith<std::string> &Rule) {
-  assert(llvm::all_of(Rule.Metadata, hasGenerator) &&
+static void verifyRule(const RewriteRule &Rule) {
+  assert(llvm::all_of(Rule.Cases, hasExplanation) &&
          "clang-tidy checks must have an explanation by default;"
          " explicitly provide an empty explanation if none is desired");
 }
@@ -39,24 +39,23 @@ TransformerClangTidyCheck::TransformerClangTidyCheck(StringRef Name,
 // we would be accessing `getLangOpts` and `Options` before the underlying
 // `ClangTidyCheck` instance was properly initialized.
 TransformerClangTidyCheck::TransformerClangTidyCheck(
-    std::function<Optional<RewriteRuleWith<std::string>>(const LangOptions &,
-                                                         const OptionsView &)>
+    std::function<Optional<RewriteRule>(const LangOptions &,
+                                        const OptionsView &)>
         MakeRule,
     StringRef Name, ClangTidyContext *Context)
     : TransformerClangTidyCheck(Name, Context) {
-  if (Optional<RewriteRuleWith<std::string>> R =
-          MakeRule(getLangOpts(), Options))
+  if (Optional<RewriteRule> R = MakeRule(getLangOpts(), Options))
     setRule(std::move(*R));
 }
 
-TransformerClangTidyCheck::TransformerClangTidyCheck(
-    RewriteRuleWith<std::string> R, StringRef Name, ClangTidyContext *Context)
+TransformerClangTidyCheck::TransformerClangTidyCheck(RewriteRule R,
+                                                     StringRef Name,
+                                                     ClangTidyContext *Context)
     : TransformerClangTidyCheck(Name, Context) {
   setRule(std::move(R));
 }
 
-void TransformerClangTidyCheck::setRule(
-    transformer::RewriteRuleWith<std::string> R) {
+void TransformerClangTidyCheck::setRule(transformer::RewriteRule R) {
   verifyRule(R);
   Rule = std::move(R);
 }
@@ -78,9 +77,8 @@ void TransformerClangTidyCheck::check(
   if (Result.Context->getDiagnostics().hasErrorOccurred())
     return;
 
-  size_t I = transformer::detail::findSelectedCase(Result, Rule);
-  Expected<SmallVector<transformer::Edit, 1>> Edits =
-      Rule.Cases[I].Edits(Result);
+  RewriteRule::Case Case = transformer::detail::findSelectedCase(Result, Rule);
+  Expected<SmallVector<transformer::Edit, 1>> Edits = Case.Edits(Result);
   if (!Edits) {
     llvm::errs() << "Rewrite failed: " << llvm::toString(Edits.takeError())
                  << "\n";
@@ -91,7 +89,7 @@ void TransformerClangTidyCheck::check(
   if (Edits->empty())
     return;
 
-  Expected<std::string> Explanation = Rule.Metadata[I]->eval(Result);
+  Expected<std::string> Explanation = Case.Explanation->eval(Result);
   if (!Explanation) {
     llvm::errs() << "Error in explanation: "
                  << llvm::toString(Explanation.takeError()) << "\n";

clang-tools-extra/clang-tidy/utils/TransformerClangTidyCheck.h

@@ -48,16 +48,15 @@ class TransformerClangTidyCheck : public ClangTidyCheck {
   /// cases where the options disable the check.
   ///
   /// See \c setRule for constraints on the rule.
-  TransformerClangTidyCheck(
-      std::function<Optional<transformer::RewriteRuleWith<std::string>>(
-          const LangOptions &, const OptionsView &)>
-          MakeRule,
-      StringRef Name, ClangTidyContext *Context);
+  TransformerClangTidyCheck(std::function<Optional<transformer::RewriteRule>(
+                                const LangOptions &, const OptionsView &)>
+                                MakeRule,
+                            StringRef Name, ClangTidyContext *Context);
 
   /// Convenience overload of the constructor when the rule doesn't have any
   /// dependencies.
-  TransformerClangTidyCheck(transformer::RewriteRuleWith<std::string> R,
-                            StringRef Name, ClangTidyContext *Context);
+  TransformerClangTidyCheck(transformer::RewriteRule R, StringRef Name,
+                            ClangTidyContext *Context);
 
   void registerPPCallbacks(const SourceManager &SM, Preprocessor *PP,
                            Preprocessor *ModuleExpanderPP) override;
@@ -75,10 +74,10 @@ class TransformerClangTidyCheck : public ClangTidyCheck {
   /// is a bug.  If no explanation is desired, indicate that explicitly (for
   /// example, by passing `text("no explanation")` to `makeRule` as the
   /// `Explanation` argument).
-  void setRule(transformer::RewriteRuleWith<std::string> R);
+  void setRule(transformer::RewriteRule R);
 
 private:
-  transformer::RewriteRuleWith<std::string> Rule;
+  transformer::RewriteRule Rule;
   IncludeInserter Inserter;
 };
 

clang-tools-extra/unittests/clang-tidy/TransformerClangTidyCheckTest.cpp

@@ -28,14 +28,14 @@ using transformer::IncludeFormat;
 using transformer::makeRule;
 using transformer::node;
 using transformer::noopEdit;
-using transformer::RewriteRuleWith;
+using transformer::RewriteRule;
 using transformer::RootID;
 using transformer::statement;
 
 // Invert the code of an if-statement, while maintaining its semantics.
-RewriteRuleWith<std::string> invertIf() {
+RewriteRule invertIf() {
   StringRef C = "C", T = "T", E = "E";
-  RewriteRuleWith<std::string> Rule = makeRule(
+  RewriteRule Rule = makeRule(
       ifStmt(hasCondition(expr().bind(C)), hasThen(stmt().bind(T)),
              hasElse(stmt().bind(E))),
       change(statement(RootID), cat("if(!(", node(std::string(C)), ")) ",
@@ -140,9 +140,8 @@ TEST(TransformerClangTidyCheckTest, TwoMatchesInMacroExpansion) {
 }
 
 // A trivial rewrite-rule generator that requires Objective-C code.
-Optional<RewriteRuleWith<std::string>>
-needsObjC(const LangOptions &LangOpts,
-          const ClangTidyCheck::OptionsView &Options) {
+Optional<RewriteRule> needsObjC(const LangOptions &LangOpts,
+                                const ClangTidyCheck::OptionsView &Options) {
   if (!LangOpts.ObjC)
     return None;
   return makeRule(clang::ast_matchers::functionDecl(),
@@ -166,9 +165,8 @@ TEST(TransformerClangTidyCheckTest, DisableByLang) {
 }
 
 // A trivial rewrite rule generator that checks config options.
-Optional<RewriteRuleWith<std::string>>
-noSkip(const LangOptions &LangOpts,
-       const ClangTidyCheck::OptionsView &Options) {
+Optional<RewriteRule> noSkip(const LangOptions &LangOpts,
+                             const ClangTidyCheck::OptionsView &Options) {
   if (Options.get("Skip", "false") == "true")
     return None;
   return makeRule(clang::ast_matchers::functionDecl(),
@@ -196,11 +194,10 @@ TEST(TransformerClangTidyCheckTest, DisableByConfig) {
                           Input, nullptr, "input.cc", None, Options));
 }
 
-RewriteRuleWith<std::string> replaceCall(IncludeFormat Format) {
+RewriteRule replaceCall(IncludeFormat Format) {
   using namespace ::clang::ast_matchers;
-  RewriteRuleWith<std::string> Rule =
-      makeRule(callExpr(callee(functionDecl(hasName("f")))),
-               change(cat("other()")), cat("no message"));
+  RewriteRule Rule = makeRule(callExpr(callee(functionDecl(hasName("f")))),
+                              change(cat("other()")), cat("no message"));
   addInclude(Rule, "clang/OtherLib.h", Format);
   return Rule;
 }
@@ -246,10 +243,10 @@ TEST(TransformerClangTidyCheckTest, AddIncludeAngled) {
 }
 
 class IncludeOrderCheck : public TransformerClangTidyCheck {
-  static RewriteRuleWith<std::string> rule() {
+  static RewriteRule rule() {
     using namespace ::clang::ast_matchers;
-    RewriteRuleWith<std::string> Rule = transformer::makeRule(
-        integerLiteral(), change(cat("5")), cat("no message"));
+    RewriteRule Rule = transformer::makeRule(integerLiteral(), change(cat("5")),
+                                             cat("no message"));
     addInclude(Rule, "bar.h", IncludeFormat::Quoted);
     return Rule;
   }