commit 3f991e4a325a75f963fe4e92af0f2a3c38ff6ea5
author Vlad Serebrennikov <serebrennikov.vladislav@gmail.com> Tue Oct 31 20:45:02 2023 +0300
committer Copybara-Service <copybara-worker@google.com> Tue Oct 31 10:51:26 2023 -0700
tree 2a8472a760c0968f2577c767a0f2a7299ce0c68c
parent 008f03e5481092e7f118c7e1f17e92bf92b7fd41

[clang][NFC] Refactor ElaboratedTypeKeyword

This patch moves ElaboratedTypeKeyword before `Type` definition so that the enum is complete where bit-field for it is declared. It also converts it to scoped enum and removes `ETK_` prefix.

GitOrigin-RevId: 4ad2ada5216ee2bb3c334a3233a9ab51f2521b82

clang-tidy/modernize/UseConstraintsCheck.cpp

diff --git a/clang-tidy/modernize/UseConstraintsCheck.cpp b/clang-tidy/modernize/UseConstraintsCheck.cpp
index 310b5bf..6d7d1d6 100644
--- a/clang-tidy/modernize/UseConstraintsCheck.cpp
+++ b/clang-tidy/modernize/UseConstraintsCheck.cpp
@@ -53,7 +53,7 @@
   if (const auto Dep = TheType.getAs<DependentNameTypeLoc>()) {
     const IdentifierInfo *Identifier = Dep.getTypePtr()->getIdentifier();
     if (!Identifier || Identifier->getName() != "type" ||
-        Dep.getTypePtr()->getKeyword() != ETK_Typename) {
+        Dep.getTypePtr()->getKeyword() != ElaboratedTypeKeyword::Typename) {
       return std::nullopt;
     }
     TheType = Dep.getQualifierLoc().getTypeLoc();
@@ -105,7 +105,7 @@
     if (const auto *AliasedType =
             dyn_cast<DependentNameType>(Specialization->getAliasedType())) {
       if (AliasedType->getIdentifier()->getName() != "type" ||
-          AliasedType->getKeyword() != ETK_Typename) {
+          AliasedType->getKeyword() != ElaboratedTypeKeyword::Typename) {
         return std::nullopt;
       }
     } else {

clang-tidy/modernize/UseTrailingReturnTypeCheck.cpp

diff --git a/clang-tidy/modernize/UseTrailingReturnTypeCheck.cpp b/clang-tidy/modernize/UseTrailingReturnTypeCheck.cpp
index 5a456c5..9774e98 100644
--- a/clang-tidy/modernize/UseTrailingReturnTypeCheck.cpp
+++ b/clang-tidy/modernize/UseTrailingReturnTypeCheck.cpp
@@ -98,7 +98,8 @@
       return false;
     const auto *T = TL.getTypePtr();
     return TraverseTypeLoc(TL.getNamedTypeLoc(),
-                           T->getKeyword() != ETK_None || T->getQualifier());
+                           T->getKeyword() != ElaboratedTypeKeyword::None ||
+                               T->getQualifier());
   }
 
   bool VisitDeclRefExpr(DeclRefExpr *S) {