Addressing the part of Piotr's review

Author: sopyb

clang-tools-extra/clang-tidy/modernize/MinMaxUseInitializerListCheck.cpp

@@ -80,27 +80,26 @@ static SmallVector<FixItHint>
 generateReplacements(const MatchFinder::MatchResult &Match,
                      const CallExpr *TopCall, const FindArgsResult &Result,
                      const bool IgnoreNonTrivialTypes,
-                     const unsigned long IgnoreTrivialTypesOfSizeAbove) {
+                     const long IgnoreTrivialTypesOfSizeAbove) {
   SmallVector<FixItHint> FixItHints;
+  const SourceManager &SourceMngr = *Match.SourceManager;
+  const LangOptions &LanguageOpts = Match.Context->getLangOpts();
 
   const QualType ResultType = TopCall->getDirectCallee()
                                   ->getReturnType()
+                                  .getCanonicalType()
                                   .getNonReferenceType()
-                                  .getUnqualifiedType()
-                                  .getCanonicalType();
+                                  .getUnqualifiedType();
 
   // check if the type is trivial
-  const bool isResultTypeTrivial = Match.Context->getBaseElementType(ResultType)
-                                       .isTrivialType(*Match.Context);
-  const SourceManager &SourceMngr = *Match.SourceManager;
-  const LangOptions &LanguageOpts = Match.Context->getLangOpts();
+  const bool isResultTypeTrivial = ResultType.isTrivialType(*Match.Context);
 
   if ((!isResultTypeTrivial && IgnoreNonTrivialTypes))
     return FixItHints;
 
   if (isResultTypeTrivial &&
       // size in bits divided by 8 to get bytes
-      Match.Context->getTypeSize(ResultType) / 8 >
+      Match.Context->getTypeSizeInChars(ResultType).getQuantity() >
           IgnoreTrivialTypesOfSizeAbove)
     return FixItHints;
 
@@ -112,8 +111,8 @@ generateReplacements(const MatchFinder::MatchResult &Match,
       // check if typecast is required
       const QualType ArgType = Arg->IgnoreParenImpCasts()
                                    ->getType()
-                                   .getUnqualifiedType()
-                                   .getCanonicalType();
+                                   .getCanonicalType()
+                                   .getUnqualifiedType();
 
       if (ArgType == ResultType)
         continue;
@@ -122,11 +121,11 @@ generateReplacements(const MatchFinder::MatchResult &Match,
           CharSourceRange::getTokenRange(Arg->getSourceRange()), SourceMngr,
           LanguageOpts);
 
-      Twine Replacement = llvm::Twine("static_cast<")
-                              .concat(ResultType.getAsString(LanguageOpts))
-                              .concat(">(")
-                              .concat(ArgText)
-                              .concat(")");
+      const auto Replacement = Twine("static_cast<")
+                                   .concat(ResultType.getAsString(LanguageOpts))
+                                   .concat(">(")
+                                   .concat(ArgText)
+                                   .concat(")");
 
       FixItHints.push_back(FixItHint::CreateReplacement(Arg->getSourceRange(),
                                                         Replacement.str()));
@@ -200,7 +199,7 @@ MinMaxUseInitializerListCheck::MinMaxUseInitializerListCheck(
     : ClangTidyCheck(Name, Context),
       IgnoreNonTrivialTypes(Options.get("IgnoreNonTrivialTypes", true)),
       IgnoreTrivialTypesOfSizeAbove(
-          Options.get("IgnoreTrivialTypesOfSizeAbove", 32UL)),
+          Options.get("IgnoreTrivialTypesOfSizeAbove", 32L)),
       Inserter(Options.getLocalOrGlobal("IncludeStyle",
                                         utils::IncludeSorter::IS_LLVM),
                areDiagsSelfContained()) {}

clang-tools-extra/clang-tidy/modernize/MinMaxUseInitializerListCheck.h

@@ -47,7 +47,7 @@ class MinMaxUseInitializerListCheck : public ClangTidyCheck {
 
 private:
   bool IgnoreNonTrivialTypes;
-  unsigned long IgnoreTrivialTypesOfSizeAbove;
+  long IgnoreTrivialTypesOfSizeAbove;
   utils::IncludeInserter Inserter;
 };
 

clang-tools-extra/docs/clang-tidy/checks/modernize/min-max-use-initializer-list.rst

@@ -3,7 +3,8 @@
 modernize-min-max-use-initializer-list
 ======================================
 
-Replaces nested ``std::min`` and ``std::max`` calls with an initializer list where applicable.
+Replaces nested ``std::min`` and ``std::max`` calls with an initializer list 
+where applicable.
 
 For instance, consider the following code:
 
@@ -20,9 +21,12 @@ The check will transform the above code to:
 Performance Considerations
 ==========================
 
-While this check simplifies the code and makes it more readable, it may cause performance degradation for non-trivial types due to the need to copy objects into the initializer list.
+While this check simplifies the code and makes it more readable, it may cause 
+performance degradation for non-trivial types due to the need to copy objects 
+into the initializer list.
 
-To avoid this, it is recommended to use `std::ref` or `std::cref` for non-trivial types:
+To avoid this, it is recommended to use `std::ref` or `std::cref` for 
+non-trivial types:
 
 .. code-block:: cpp
 
@@ -42,4 +46,5 @@ Options
 
 .. option:: IgnoreTrivialTypesOfSizeAbove
 
-   An integer specifying the size (in bytes) above which trivial types are ignored. Default is `32`.
+   An integer specifying the size (in bytes) above which trivial types are 
+ignored. Default is `32`.