[clang-tidy][NFC] Tweak some generation of diag messages

Fix up cases where diag is called by piecing together a string in favour of placeholders.
Fix up cases where select could be used instead of duplicating the message for sake of 1 word difference.

Reviewed By: aaron.ballman

Differential Revision: https://reviews.llvm.org/D97488

1 files changed, 3 insertions, 6 deletions

diff --git a/clang-tools-extra/clang-tidy/modernize/AvoidCArraysCheck.cpp b/clang-tools-extra/clang-tidy/modernize/AvoidCArraysCheck.cpp
index bc586d30..872dd18 100644
--- a/clang-tools-extra/clang-tidy/modernize/AvoidCArraysCheck.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/AvoidCArraysCheck.cpp
@@ -57,13 +57,10 @@ void AvoidCArraysCheck::registerMatchers(MatchFinder *Finder) {
 void AvoidCArraysCheck::check(const MatchFinder::MatchResult &Result) {
   const auto *ArrayType = Result.Nodes.getNodeAs<TypeLoc>("typeloc");
 
-  static constexpr llvm::StringLiteral UseArray = llvm::StringLiteral(
-      "do not declare C-style arrays, use std::array<> instead");
-  static constexpr llvm::StringLiteral UseVector = llvm::StringLiteral(
-      "do not declare C VLA arrays, use std::vector<> instead");
-
   diag(ArrayType->getBeginLoc(),
-       ArrayType->getTypePtr()->isVariableArrayType() ? UseVector : UseArray);
+       "do not declare %select{C-style|C VLA}0 arrays, use "
+       "%select{std::array<>|std::vector<>}0 instead")
+      << ArrayType->getTypePtr()->isVariableArrayType();
 }
 
 } // namespace modernize