[clang-tidy][NFC] Fix modernize-return-braced-init-list findings

Fix issues found by clang-tidy in clang-tidy source directory.
llvm · Aug 27, 2023 · ec5f4be · ec5f4be
1 parent 9c857f2
commit ec5f4be
Show file tree

Hide file tree

Showing 28 changed files with 68 additions and 80 deletions.
diff --git a/clang-tools-extra/clang-tidy/ClangTidy.cpp b/clang-tools-extra/clang-tidy/ClangTidy.cpp
@@ -242,11 +242,11 @@ class ErrorReporter {
 private:
   SourceLocation getLocation(StringRef FilePath, unsigned Offset) {
     if (FilePath.empty())
-      return SourceLocation();
+      return {};
 
     auto File = SourceMgr.getFileManager().getFile(FilePath);
     if (!File)
-      return SourceLocation();
+      return {};
 
     FileID ID = SourceMgr.getOrCreateFileID(*File, SrcMgr::C_User);
     return SourceMgr.getLocForStartOfFile(ID).getLocWithOffset(Offset);

diff --git a/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.h b/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.h
@@ -212,11 +212,11 @@ class ClangTidyContext {
   using DiagLevelAndFormatString = std::pair<DiagnosticIDs::Level, std::string>;
   DiagLevelAndFormatString getDiagLevelAndFormatString(unsigned DiagnosticID,
                                                        SourceLocation Loc) {
-    return DiagLevelAndFormatString(
+    return {
         static_cast<DiagnosticIDs::Level>(
             DiagEngine->getDiagnosticLevel(DiagnosticID, Loc)),
         std::string(
-            DiagEngine->getDiagnosticIDs()->getDescription(DiagnosticID)));
+            DiagEngine->getDiagnosticIDs()->getDescription(DiagnosticID))};
   }
 
   void setOptionsCollector(llvm::StringSet<> *Collector) {

diff --git a/clang-tools-extra/clang-tidy/ClangTidyModule.cpp b/clang-tools-extra/clang-tidy/ClangTidyModule.cpp
@@ -46,8 +46,6 @@ ClangTidyCheckFactories::createChecksForLanguage(
   return Checks;
 }
 
-ClangTidyOptions ClangTidyModule::getModuleOptions() {
-  return ClangTidyOptions();
-}
+ClangTidyOptions ClangTidyModule::getModuleOptions() { return {}; }
 
 } // namespace clang::tidy
diff --git a/clang-tools-extra/clang-tidy/GlobList.cpp b/clang-tools-extra/clang-tidy/GlobList.cpp
@@ -39,7 +39,7 @@ static llvm::Regex consumeGlob(StringRef &GlobList) {
     RegexText.push_back(C);
   }
   RegexText.push_back('$');
-  return llvm::Regex(RegexText);
+  return {RegexText};
 }
 
 GlobList::GlobList(StringRef Globs, bool KeepNegativeGlobs /* =true */) {

diff --git a/clang-tools-extra/clang-tidy/abseil/DurationRewriter.cpp b/clang-tools-extra/clang-tidy/abseil/DurationRewriter.cpp
@@ -278,7 +278,7 @@ std::string rewriteExprFromNumberToDuration(
     return *MaybeRewrite;
 
   if (isLiteralZero(Result, RootNode))
-    return std::string("absl::ZeroDuration()");
+    return {"absl::ZeroDuration()"};
 
   return (llvm::Twine(getDurationFactoryForScale(Scale)) + "(" +
           simplifyDurationFactoryArg(Result, RootNode) + ")")
@@ -296,7 +296,7 @@ std::string rewriteExprFromNumberToTime(
     return *MaybeRewrite;
 
   if (isLiteralZero(Result, RootNode))
-    return std::string("absl::UnixEpoch()");
+    return {"absl::UnixEpoch()"};
 
   return (llvm::Twine(getTimeFactoryForScale(Scale)) + "(" +
           tooling::fixit::getText(RootNode, *Result.Context) + ")")

diff --git a/clang-tools-extra/clang-tidy/bugprone/SignalHandlerCheck.cpp b/clang-tools-extra/clang-tidy/bugprone/SignalHandlerCheck.cpp
@@ -235,7 +235,7 @@ struct OptionEnumMapping<
             {bugprone::SignalHandlerCheck::AsyncSafeFunctionSetKind::POSIX,
              "POSIX"},
         };
-    return ArrayRef(Mapping);
+    return {Mapping};
   }
 };
 

diff --git a/clang-tools-extra/clang-tidy/concurrency/MtUnsafeCheck.cpp b/clang-tools-extra/clang-tidy/concurrency/MtUnsafeCheck.cpp
@@ -269,7 +269,7 @@ template <> struct OptionEnumMapping<concurrency::MtUnsafeCheck::FunctionSet> {
         Mapping[] = {{concurrency::MtUnsafeCheck::FunctionSet::Posix, "posix"},
                      {concurrency::MtUnsafeCheck::FunctionSet::Glibc, "glibc"},
                      {concurrency::MtUnsafeCheck::FunctionSet::Any, "any"}};
-    return ArrayRef(Mapping);
+    return {Mapping};
   }
 };
 

diff --git a/clang-tools-extra/clang-tidy/cppcoreguidelines/SpecialMemberFunctionsCheck.h b/clang-tools-extra/clang-tidy/cppcoreguidelines/SpecialMemberFunctionsCheck.h
@@ -83,13 +83,13 @@ struct DenseMapInfo<
       clang::tidy::cppcoreguidelines::SpecialMemberFunctionsCheck::ClassDefId;
 
   static inline ClassDefId getEmptyKey() {
-    return ClassDefId(DenseMapInfo<clang::SourceLocation>::getEmptyKey(),
-                      "EMPTY");
+    return {DenseMapInfo<clang::SourceLocation>::getEmptyKey(),
+                      "EMPTY"};
   }
 
   static inline ClassDefId getTombstoneKey() {
-    return ClassDefId(DenseMapInfo<clang::SourceLocation>::getTombstoneKey(),
-                      "TOMBSTONE");
+    return {DenseMapInfo<clang::SourceLocation>::getTombstoneKey(),
+                      "TOMBSTONE"};
   }
 
   static unsigned getHashValue(ClassDefId Val) {

diff --git a/clang-tools-extra/clang-tidy/google/ExplicitConstructorCheck.cpp b/clang-tools-extra/clang-tidy/google/ExplicitConstructorCheck.cpp
@@ -38,7 +38,7 @@ static SourceRange findToken(const SourceManager &Sources,
                              SourceLocation StartLoc, SourceLocation EndLoc,
                              bool (*Pred)(const Token &)) {
   if (StartLoc.isMacroID() || EndLoc.isMacroID())
-    return SourceRange();
+    return {};
   FileID File = Sources.getFileID(Sources.getSpellingLoc(StartLoc));
   StringRef Buf = Sources.getBufferData(File);
   const char *StartChar = Sources.getCharacterData(StartLoc);
@@ -50,11 +50,11 @@ static SourceRange findToken(const SourceManager &Sources,
     if (Pred(Tok)) {
       Token NextTok;
       Lex.LexFromRawLexer(NextTok);
-      return SourceRange(Tok.getLocation(), NextTok.getLocation());
+      return {Tok.getLocation(), NextTok.getLocation()};
     }
   } while (Tok.isNot(tok::eof) && Tok.getLocation() < EndLoc);
 
-  return SourceRange();
+  return {};
 }
 
 static bool declIsStdInitializerList(const NamedDecl *D) {

diff --git a/clang-tools-extra/clang-tidy/google/FunctionNamingCheck.cpp b/clang-tools-extra/clang-tidy/google/FunctionNamingCheck.cpp
@@ -49,7 +49,7 @@ FixItHint generateFixItHint(const FunctionDecl *Decl) {
   // otherwise the check cannot determine the appropriate function name prefix
   // to use.
   if (Decl->getStorageClass() != SC_Static)
-    return FixItHint();
+    return {};
 
   StringRef Name = Decl->getName();
   std::string NewName = Decl->getName().str();
@@ -80,7 +80,7 @@ FixItHint generateFixItHint(const FunctionDecl *Decl) {
         CharSourceRange::getTokenRange(SourceRange(Decl->getLocation())),
         llvm::StringRef(NewName));
 
-  return FixItHint();
+  return {};
 }
 
 } // namespace

diff --git a/clang-tools-extra/clang-tidy/google/GlobalVariableDeclarationCheck.cpp b/clang-tools-extra/clang-tidy/google/GlobalVariableDeclarationCheck.cpp
@@ -26,7 +26,7 @@ FixItHint generateFixItHint(const VarDecl *Decl, bool IsConst) {
   if (IsConst && (Decl->getStorageClass() != SC_Static)) {
     // No fix available if it is not a static constant, since it is difficult
     // to determine the proper fix in this case.
-    return FixItHint();
+    return {};
   }
 
   char FC = Decl->getName()[0];
@@ -35,14 +35,14 @@ FixItHint generateFixItHint(const VarDecl *Decl, bool IsConst) {
     // is a single-character variable, since it is difficult to determine the
     // proper fix in this case. Users should create a proper variable name by
     // their own.
-    return FixItHint();
+    return {};
   }
   char SC = Decl->getName()[1];
   if ((FC == 'k' || FC == 'g') && !llvm::isAlpha(SC)) {
     // No fix available if the prefix is correct but the second character is
     // not alphabetical, since it is difficult to determine the proper fix in
     // this case.
-    return FixItHint();
+    return {};
   }
 
   auto NewName = (IsConst ? "k" : "g") +

diff --git a/clang-tools-extra/clang-tidy/misc/StaticAssertCheck.cpp b/clang-tools-extra/clang-tidy/misc/StaticAssertCheck.cpp
@@ -141,7 +141,7 @@ SourceLocation StaticAssertCheck::getLastParenLoc(const ASTContext *ASTCtx,
   std::optional<llvm::MemoryBufferRef> Buffer =
       SM.getBufferOrNone(SM.getFileID(AssertLoc));
   if (!Buffer)
-    return SourceLocation();
+    return {};
 
   const char *BufferPos = SM.getCharacterData(AssertLoc);
 
@@ -152,7 +152,7 @@ SourceLocation StaticAssertCheck::getLastParenLoc(const ASTContext *ASTCtx,
   //        assert                          first left parenthesis
   if (Lexer.LexFromRawLexer(Token) || Lexer.LexFromRawLexer(Token) ||
       !Token.is(tok::l_paren))
-    return SourceLocation();
+    return {};
 
   unsigned int ParenCount = 1;
   while (ParenCount && !Lexer.LexFromRawLexer(Token)) {

diff --git a/clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp b/clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp
@@ -38,7 +38,7 @@ template <> struct OptionEnumMapping<modernize::Confidence::Level> {
         Mapping[] = {{modernize::Confidence::CL_Reasonable, "reasonable"},
                      {modernize::Confidence::CL_Safe, "safe"},
                      {modernize::Confidence::CL_Risky, "risky"}};
-    return ArrayRef(Mapping);
+    return {Mapping};
   }
 };
 
@@ -51,7 +51,7 @@ template <> struct OptionEnumMapping<modernize::VariableNamer::NamingStyle> {
                      {modernize::VariableNamer::NS_CamelBack, "camelBack"},
                      {modernize::VariableNamer::NS_LowerCase, "lower_case"},
                      {modernize::VariableNamer::NS_UpperCase, "UPPER_CASE"}};
-    return ArrayRef(Mapping);
+    return {Mapping};
   }
 };
 
@@ -465,7 +465,7 @@ static StringRef getStringFromRange(SourceManager &SourceMgr,
                                     SourceRange Range) {
   if (SourceMgr.getFileID(Range.getBegin()) !=
       SourceMgr.getFileID(Range.getEnd())) {
-    return StringRef(); // Empty string.
+    return {}; // Empty string.
   }
 
   return Lexer::getSourceText(CharSourceRange(Range, true), SourceMgr,

diff --git a/clang-tools-extra/clang-tidy/modernize/UseConstraintsCheck.cpp b/clang-tools-extra/clang-tidy/modernize/UseConstraintsCheck.cpp
@@ -199,26 +199,24 @@ getConditionRange(ASTContext &Context,
   const SourceManager &SM = Context.getSourceManager();
   if (EnableIf.getNumArgs() > 1) {
     TemplateArgumentLoc NextArg = EnableIf.getArgLoc(1);
-    return SourceRange(
-        EnableIf.getLAngleLoc().getLocWithOffset(1),
-        utils::lexer::findPreviousTokenKind(NextArg.getSourceRange().getBegin(),
-                                            SM, LangOpts, tok::comma));
+    return {EnableIf.getLAngleLoc().getLocWithOffset(1),
+            utils::lexer::findPreviousTokenKind(
+                NextArg.getSourceRange().getBegin(), SM, LangOpts, tok::comma)};
   }
 
-  return SourceRange(EnableIf.getLAngleLoc().getLocWithOffset(1),
-                     getRAngleFileLoc(SM, EnableIf));
+  return {EnableIf.getLAngleLoc().getLocWithOffset(1),
+          getRAngleFileLoc(SM, EnableIf)};
 }
 
 static SourceRange getTypeRange(ASTContext &Context,
                                 const TemplateSpecializationTypeLoc &EnableIf) {
   TemplateArgumentLoc Arg = EnableIf.getArgLoc(1);
   const LangOptions &LangOpts = Context.getLangOpts();
   const SourceManager &SM = Context.getSourceManager();
-  return SourceRange(
-      utils::lexer::findPreviousTokenKind(Arg.getSourceRange().getBegin(), SM,
-                                          LangOpts, tok::comma)
-          .getLocWithOffset(1),
-      getRAngleFileLoc(SM, EnableIf));
+  return {utils::lexer::findPreviousTokenKind(Arg.getSourceRange().getBegin(),
+                                              SM, LangOpts, tok::comma)
+              .getLocWithOffset(1),
+          getRAngleFileLoc(SM, EnableIf)};
 }
 
 // Returns the original source text of the second argument of a call to

diff --git a/clang-tools-extra/clang-tidy/modernize/UseOverrideCheck.cpp b/clang-tools-extra/clang-tidy/modernize/UseOverrideCheck.cpp
@@ -85,8 +85,7 @@ parseTokens(CharSourceRange Range, const MatchFinder::MatchResult &Result) {
 }
 
 static StringRef getText(const Token &Tok, const SourceManager &Sources) {
-  return StringRef(Sources.getCharacterData(Tok.getLocation()),
-                   Tok.getLength());
+  return {Sources.getCharacterData(Tok.getLocation()), Tok.getLength()};
 }
 
 void UseOverrideCheck::check(const MatchFinder::MatchResult &Result) {

diff --git a/clang-tools-extra/clang-tidy/objc/PropertyDeclarationCheck.cpp b/clang-tools-extra/clang-tidy/objc/PropertyDeclarationCheck.cpp
@@ -52,7 +52,7 @@ FixItHint generateFixItHint(const ObjCPropertyDecl *Decl, NamingStyle Style) {
           llvm::StringRef(NewName));
     }
   }
-  return FixItHint();
+  return {};
 }
 
 std::string validPropertyNameRegex(bool UsedInMatcher) {

diff --git a/clang-tools-extra/clang-tidy/readability/AvoidConstParamsInDecls.cpp b/clang-tools-extra/clang-tidy/readability/AvoidConstParamsInDecls.cpp
@@ -18,8 +18,7 @@ namespace clang::tidy::readability {
 namespace {
 
 SourceRange getTypeRange(const ParmVarDecl &Param) {
-  return SourceRange(Param.getBeginLoc(),
-                     Param.getLocation().getLocWithOffset(-1));
+  return {Param.getBeginLoc(), Param.getLocation().getLocWithOffset(-1)};
 }
 
 } // namespace

diff --git a/clang-tools-extra/clang-tidy/readability/BracesAroundStatementsCheck.cpp b/clang-tools-extra/clang-tidy/readability/BracesAroundStatementsCheck.cpp
@@ -159,27 +159,27 @@ BracesAroundStatementsCheck::findRParenLoc(const IfOrWhileStmt *S,
                                            const ASTContext *Context) {
   // Skip macros.
   if (S->getBeginLoc().isMacroID())
-    return SourceLocation();
+    return {};
 
   SourceLocation CondEndLoc = S->getCond()->getEndLoc();
   if (const DeclStmt *CondVar = S->getConditionVariableDeclStmt())
     CondEndLoc = CondVar->getEndLoc();
 
   if (!CondEndLoc.isValid()) {
-    return SourceLocation();
+    return {};
   }
 
   SourceLocation PastCondEndLoc =
       Lexer::getLocForEndOfToken(CondEndLoc, 0, SM, Context->getLangOpts());
   if (PastCondEndLoc.isInvalid())
-    return SourceLocation();
+    return {};
   SourceLocation RParenLoc =
       forwardSkipWhitespaceAndComments(PastCondEndLoc, SM, Context);
   if (RParenLoc.isInvalid())
-    return SourceLocation();
+    return {};
   tok::TokenKind TokKind = getTokenKind(RParenLoc, SM, Context);
   if (TokKind != tok::r_paren)
-    return SourceLocation();
+    return {};
   return RParenLoc;
 }
 

diff --git a/clang-tools-extra/clang-tidy/readability/IdentifierNamingCheck.cpp b/clang-tools-extra/clang-tidy/readability/IdentifierNamingCheck.cpp
@@ -47,7 +47,7 @@ OptionEnumMapping<
            "Camel_Snake_Case"},
           {readability::IdentifierNamingCheck::CT_CamelSnakeBack,
            "camel_Snake_Back"}};
-  return llvm::ArrayRef(Mapping);
+  return {Mapping};
 }
 
 template <>
@@ -62,7 +62,7 @@ struct OptionEnumMapping<
         {HungarianPrefixType::HPT_On, "On"},
         {HungarianPrefixType::HPT_LowerCase, "LowerCase"},
         {HungarianPrefixType::HPT_CamelCase, "CamelCase"}};
-    return llvm::ArrayRef(Mapping);
+    return {Mapping};
   }
 };
 

diff --git a/clang-tools-extra/clang-tidy/readability/ImplicitBoolConversionCheck.cpp b/clang-tools-extra/clang-tidy/readability/ImplicitBoolConversionCheck.cpp
@@ -170,7 +170,7 @@ StringRef getEquivalentBoolLiteralForExpr(const Expr *Expression,
     return "true";
   }
 
-  return StringRef();
+  return {};
 }
 
 void fixGenericExprCastFromBool(DiagnosticBuilder &Diag,

diff --git a/clang-tools-extra/clang-tidy/readability/IsolateDeclarationCheck.cpp b/clang-tools-extra/clang-tidy/readability/IsolateDeclarationCheck.cpp
@@ -43,7 +43,7 @@ static SourceLocation findStartOfIndirection(SourceLocation Start,
   while (Indirections-- != 0) {
     Start = findPreviousAnyTokenKind(Start, SM, LangOpts, tok::star, tok::amp);
     if (Start.isInvalid() || Start.isMacroID())
-      return SourceLocation();
+      return {};
   }
   return Start;
 }

diff --git a/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp b/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp
@@ -31,9 +31,7 @@
 using namespace clang::tooling;
 using namespace llvm;
 
-static cl::desc desc(StringRef description) {
-  return cl::desc(description.ltrim());
-}
+static cl::desc desc(StringRef description) { return {description.ltrim()}; }
 
 static cl::OptionCategory ClangTidyCategory("clang-tidy options");
 

diff --git a/clang-tools-extra/clang-tidy/utils/ExceptionAnalyzer.h b/clang-tools-extra/clang-tidy/utils/ExceptionAnalyzer.h
@@ -38,12 +38,8 @@ class ExceptionAnalyzer {
   class ExceptionInfo {
   public:
     using Throwables = llvm::SmallSet<const Type *, 2>;
-    static ExceptionInfo createUnknown() {
-      return ExceptionInfo(State::Unknown);
-    }
-    static ExceptionInfo createNonThrowing() {
-      return ExceptionInfo(State::Throwing);
-    }
+    static ExceptionInfo createUnknown() { return {State::Unknown}; }
+    static ExceptionInfo createNonThrowing() { return {State::Throwing}; }
 
     /// By default the exception situation is unknown and must be
     /// clarified step-wise.

diff --git a/clang-tools-extra/clang-tidy/utils/FixItHintUtils.cpp b/clang-tools-extra/clang-tidy/utils/FixItHintUtils.cpp
@@ -253,7 +253,7 @@ std::string formatDereference(const Expr &ExprNode, const ASTContext &Context) {
   StringRef Text = tooling::fixit::getText(ExprNode, Context);
 
   if (Text.empty())
-    return std::string();
+    return {};
 
   // Remove remaining '->' from overloaded operator call
   Text.consume_back("->");

diff --git a/clang-tools-extra/clang-tidy/utils/IncludeSorter.cpp b/clang-tools-extra/clang-tidy/utils/IncludeSorter.cpp
@@ -230,6 +230,6 @@ OptionEnumMapping<utils::IncludeSorter::IncludeStyle>::getEnumMapping() {
       Mapping[] = {{utils::IncludeSorter::IS_LLVM, "llvm"},
                    {utils::IncludeSorter::IS_Google, "google"},
                    {utils::IncludeSorter::IS_Google_ObjC, "google-objc"}};
-  return ArrayRef(Mapping);
+  return {Mapping};
 }
 } // namespace clang::tidy