[NFC] Rename warning message to use a structured binding...

Author: flovent

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

@@ -360,7 +360,7 @@ void UseStructuredBindingCheck::check(const MatchFinder::MatchResult &Result) {
         (Twine(Prefix) + " [" + FirstVar->getNameAsString() + ", " +
          SecondVar->getNameAsString() + "]" + (CFRS ? " :" : ""))
             .str();
-    diag(DiagLoc, "use structured binding to decompose a pair")
+    diag(DiagLoc, "use a structured binding to decompose a pair")
         << FixItHint::CreateReplacement(ReplaceRange, ReplacementText)
         << FixItHint::CreateRemoval(
                SourceRange{BeginDS->getBeginLoc(), EndDS->getEndLoc()});

clang-tools-extra/test/clang-tidy/checkers/modernize/use-structured-binding-custom.cpp

@@ -16,15 +16,15 @@ struct otherPair {
 void OptionTest() {
   {
     auto P = custom::pair();
-    // CHECK-MESSAGES: :[[@LINE-1]]:5: warning: use structured binding to decompose a pair [modernize-use-structured-binding]
+    // CHECK-MESSAGES: :[[@LINE-1]]:5: warning: use a structured binding to decompose a pair [modernize-use-structured-binding]
     // CHECK-FIXES: auto [x, y] = custom::pair();
     int x = P.first;
     int y = P.second;
   }
 
   {
     auto P = otherPair();
-    // CHECK-MESSAGES: :[[@LINE-1]]:5: warning: use structured binding to decompose a pair [modernize-use-structured-binding]
+    // CHECK-MESSAGES: :[[@LINE-1]]:5: warning: use a structured binding to decompose a pair [modernize-use-structured-binding]
     // CHECK-FIXES: auto [x, y] = otherPair();
     int x = P.first;
     int y = P.second;

clang-tools-extra/test/clang-tidy/checkers/modernize/use-structured-binding.cpp

@@ -16,7 +16,7 @@ struct TestClass {
 void DecomposeByAssignWarnCases() {
   {
     auto P = getPair<int, int>();
-    // CHECK-MESSAGES-ALL: :[[@LINE-1]]:5: warning: use structured binding to decompose a pair [modernize-use-structured-binding]
+    // CHECK-MESSAGES-ALL: :[[@LINE-1]]:5: warning: use a structured binding to decompose a pair [modernize-use-structured-binding]
     // CHECK-FIXES-ALL: auto [x, y] = getPair<int, int>();
     int x = P.first;
     int y = P.second; // REMOVE
@@ -25,15 +25,15 @@ void DecomposeByAssignWarnCases() {
 
   {
     auto P = getPair<int, int>();
-    // CHECK-MESSAGES-ALL: :[[@LINE-1]]:5: warning: use structured binding to decompose a pair [modernize-use-structured-binding]
+    // CHECK-MESSAGES-ALL: :[[@LINE-1]]:5: warning: use a structured binding to decompose a pair [modernize-use-structured-binding]
     // CHECK-FIXES-ALL: auto [x, y] = getPair<int, int>();
     int x = P.first, y = P.second; // REMOVE
     // CHECK-FIXES-ALL: // REMOVE
   }
 
   {
     auto P = getPair<int, int>();
-    // CHECK-MESSAGES-ALL: :[[@LINE-1]]:5: warning: use structured binding to decompose a pair [modernize-use-structured-binding]
+    // CHECK-MESSAGES-ALL: :[[@LINE-1]]:5: warning: use a structured binding to decompose a pair [modernize-use-structured-binding]
     // CHECK-FIXES-ALL: auto [x, y] = getPair<int, int>();
     int x = P.first, y = P.second; // REMOVE
     // CHECK-FIXES-ALL: // REMOVE
@@ -42,7 +42,7 @@ void DecomposeByAssignWarnCases() {
 
   {
     auto P = getPair<int, int>();
-    // CHECK-MESSAGES-ALL: :[[@LINE-1]]:5: warning: use structured binding to decompose a pair [modernize-use-structured-binding]
+    // CHECK-MESSAGES-ALL: :[[@LINE-1]]:5: warning: use a structured binding to decompose a pair [modernize-use-structured-binding]
     // CHECK-FIXES-ALL: auto [x, y] = getPair<int, int>();
     int x = P.first;
     auto y = P.second; // REMOVE
@@ -51,7 +51,7 @@ void DecomposeByAssignWarnCases() {
 
   {
     const auto P = getPair<int, int>();
-    // CHECK-MESSAGES-ALL: :[[@LINE-1]]:5: warning: use structured binding to decompose a pair [modernize-use-structured-binding]
+    // CHECK-MESSAGES-ALL: :[[@LINE-1]]:5: warning: use a structured binding to decompose a pair [modernize-use-structured-binding]
     // CHECK-FIXES-ALL: const auto [x, y] = getPair<int, int>();
     const int x = P.first;
     const auto y = P.second; // REMOVE
@@ -61,7 +61,7 @@ void DecomposeByAssignWarnCases() {
   {
     std::pair<int, int> otherP;
     auto& P = otherP;
-    // CHECK-MESSAGES-ALL: :[[@LINE-1]]:5: warning: use structured binding to decompose a pair [modernize-use-structured-binding]
+    // CHECK-MESSAGES-ALL: :[[@LINE-1]]:5: warning: use a structured binding to decompose a pair [modernize-use-structured-binding]
     // CHECK-FIXES-ALL: auto& [x, y] = otherP;
     int& x = P.first;
     auto& y = P.second; // REMOVE
@@ -71,7 +71,7 @@ void DecomposeByAssignWarnCases() {
   {
     std::pair<int, int> otherP;
     const auto& P = otherP;
-    // CHECK-MESSAGES-ALL: :[[@LINE-1]]:5: warning: use structured binding to decompose a pair [modernize-use-structured-binding]
+    // CHECK-MESSAGES-ALL: :[[@LINE-1]]:5: warning: use a structured binding to decompose a pair [modernize-use-structured-binding]
     // CHECK-FIXES-ALL: const auto& [x, y] = otherP;
     const int& x = P.first;
     const auto& y = P.second; // REMOVE
@@ -82,46 +82,46 @@ void DecomposeByAssignWarnCases() {
 void forRangeWarnCases() {
   std::pair<int, int> Pairs[10];
   for (auto P : Pairs) {
-    // CHECK-MESSAGES-ALL: :[[@LINE-1]]:8: warning: use structured binding to decompose a pair [modernize-use-structured-binding]
+    // CHECK-MESSAGES-ALL: :[[@LINE-1]]:8: warning: use a structured binding to decompose a pair [modernize-use-structured-binding]
     // CHECK-FIXES-ALL: for (auto [x, y] : Pairs) {
     int x = P.first;
     int y = P.second; // REMOVE
     // CHECK-FIXES-ALL: // REMOVE
   }
 
   for (auto P : Pairs) {
-    // CHECK-MESSAGES-ALL: :[[@LINE-1]]:8: warning: use structured binding to decompose a pair [modernize-use-structured-binding]
+    // CHECK-MESSAGES-ALL: :[[@LINE-1]]:8: warning: use a structured binding to decompose a pair [modernize-use-structured-binding]
     // CHECK-FIXES-ALL: for (auto [x, y] : Pairs) {
     int x = P.first, y = P.second; // REMOVE
     // CHECK-FIXES-ALL: // REMOVE
   }
 
   for (auto P : Pairs) {
-    // CHECK-MESSAGES-ALL: :[[@LINE-1]]:8: warning: use structured binding to decompose a pair [modernize-use-structured-binding]
+    // CHECK-MESSAGES-ALL: :[[@LINE-1]]:8: warning: use a structured binding to decompose a pair [modernize-use-structured-binding]
     // CHECK-FIXES-ALL: for (auto [x, y] : Pairs) {
     int x = P.first, y = P.second; // REMOVE
     // CHECK-FIXES-ALL: // REMOVE
     int z;
   }
 
   for (const auto P : Pairs) {
-    // CHECK-MESSAGES-ALL: :[[@LINE-1]]:8: warning: use structured binding to decompose a pair [modernize-use-structured-binding]
+    // CHECK-MESSAGES-ALL: :[[@LINE-1]]:8: warning: use a structured binding to decompose a pair [modernize-use-structured-binding]
     // CHECK-FIXES-ALL: for (const auto [x, y] : Pairs) {
     const int x = P.first;
     const int y = P.second; // REMOVE
     // CHECK-FIXES-ALL: // REMOVE
   }
 
   for (auto& P : Pairs) {
-    // CHECK-MESSAGES-ALL: :[[@LINE-1]]:8: warning: use structured binding to decompose a pair [modernize-use-structured-binding]
+    // CHECK-MESSAGES-ALL: :[[@LINE-1]]:8: warning: use a structured binding to decompose a pair [modernize-use-structured-binding]
     // CHECK-FIXES-ALL: for (auto& [x, y] : Pairs) {
     int& x = P.first;
     int& y = P.second; // REMOVE
     // CHECK-FIXES-ALL: // REMOVE
   }
 
   for (const auto& P : Pairs) {
-    // CHECK-MESSAGES-ALL: :[[@LINE-1]]:8: warning: use structured binding to decompose a pair [modernize-use-structured-binding]
+    // CHECK-MESSAGES-ALL: :[[@LINE-1]]:8: warning: use a structured binding to decompose a pair [modernize-use-structured-binding]
     // CHECK-FIXES-ALL: for (const auto& [x, y] : Pairs) {
     const int& x = P.first;
     const int& y = P.second; // REMOVE
@@ -130,15 +130,15 @@ void forRangeWarnCases() {
 
   std::pair<TestClass, TestClass> ClassPairs[10];
   for (auto P : ClassPairs) {
-    // CHECK-MESSAGES-ALL: :[[@LINE-1]]:8: warning: use structured binding to decompose a pair [modernize-use-structured-binding]
+    // CHECK-MESSAGES-ALL: :[[@LINE-1]]:8: warning: use a structured binding to decompose a pair [modernize-use-structured-binding]
     // CHECK-FIXES-ALL: for (auto [c1, c2] : ClassPairs) {
     TestClass c1 = P.first;
     TestClass c2 = P.second; // REMOVE
     // CHECK-FIXES-ALL: // REMOVE
   }
 
   for (const auto P : ClassPairs) {
-    // CHECK-MESSAGES-ALL: :[[@LINE-1]]:8: warning: use structured binding to decompose a pair [modernize-use-structured-binding]
+    // CHECK-MESSAGES-ALL: :[[@LINE-1]]:8: warning: use a structured binding to decompose a pair [modernize-use-structured-binding]
     // CHECK-FIXES-ALL: for (const auto [c1, c2] : ClassPairs) {
     const TestClass c1 = P.first;
     const TestClass c2 = P.second; // REMOVE
@@ -186,27 +186,27 @@ void stdTieWarnCases() {
   int b = 0; // REMOVE
   // CHECK-FIXES-ALL: // REMOVE
   std::tie(a, b) = getPair<int, int>();
-  // CHECK-MESSAGES-ALL: :[[@LINE-1]]:3: warning: use structured binding to decompose a pair [modernize-use-structured-binding]
+  // CHECK-MESSAGES-ALL: :[[@LINE-1]]:3: warning: use a structured binding to decompose a pair [modernize-use-structured-binding]
   // CHECK-FIXES-ALL: auto [a, b] = getPair<int, int>();
 
   int x = 0, y = 0; // REMOVE
   // CHECK-FIXES-ALL: // REMOVE
   std::tie(x, y) = getPair<int, int>();
-  // CHECK-MESSAGES-ALL: :[[@LINE-1]]:3: warning: use structured binding to decompose a pair [modernize-use-structured-binding]
+  // CHECK-MESSAGES-ALL: :[[@LINE-1]]:3: warning: use a structured binding to decompose a pair [modernize-use-structured-binding]
   // CHECK-FIXES-ALL: auto [x, y] = getPair<int, int>();
 
   int* pa = nullptr;
   int* pb = nullptr; // REMOVE
   // CHECK-FIXES-ALL: // REMOVE
   std::tie(pa, pb) = getPair<int*, int*>();
-  // CHECK-MESSAGES-ALL: :[[@LINE-1]]:3: warning: use structured binding to decompose a pair [modernize-use-structured-binding]
+  // CHECK-MESSAGES-ALL: :[[@LINE-1]]:3: warning: use a structured binding to decompose a pair [modernize-use-structured-binding]
   // CHECK-FIXES-ALL: auto [pa, pb] = getPair<int*, int*>();
 
   TestClass c1 (1, 2);
   TestClass c2 = TestClass {3, 4}; // REMOVE
   // CHECK-FIXES-ALL: // REMOVE
   std::tie(c1, c2) = getPair<TestClass, TestClass>();
-  // CHECK-MESSAGES-ALL: :[[@LINE-1]]:3: warning: use structured binding to decompose a pair [modernize-use-structured-binding]
+  // CHECK-MESSAGES-ALL: :[[@LINE-1]]:3: warning: use a structured binding to decompose a pair [modernize-use-structured-binding]
   // CHECK-FIXES-ALL: auto [c1, c2] = getPair<TestClass, TestClass>();
 }
 
@@ -309,7 +309,7 @@ void NotWarnForMacro2() {
 
 void captureByVal() {
   auto P = getPair<int, int>();
-  // CHECK-MESSAGES-CPP20ORLATER: :[[@LINE-1]]:3: warning: use structured binding to decompose a pair [modernize-use-structured-binding]
+  // CHECK-MESSAGES-CPP20ORLATER: :[[@LINE-1]]:3: warning: use a structured binding to decompose a pair [modernize-use-structured-binding]
   // CHECK-FIXES-CPP20ORLATER: auto [x, y] = getPair<int, int>();
   int x = P.first;
   int y = P.second; // REMOVE
@@ -322,7 +322,7 @@ void captureByVal() {
 
 void captureByRef() {
   auto P = getPair<int, int>();
-  // CHECK-MESSAGES-CPP20ORLATER: :[[@LINE-1]]:3: warning: use structured binding to decompose a pair [modernize-use-structured-binding]
+  // CHECK-MESSAGES-CPP20ORLATER: :[[@LINE-1]]:3: warning: use a structured binding to decompose a pair [modernize-use-structured-binding]
   // CHECK-FIXES-CPP20ORLATER: auto [x, y] = getPair<int, int>();
   int x = P.first;
   int y = P.second; // REMOVE
@@ -335,7 +335,7 @@ void captureByRef() {
 
 void captureByAllRef() {
   auto P = getPair<int, int>();
-  // CHECK-MESSAGES-CPP20ORLATER: :[[@LINE-1]]:3: warning: use structured binding to decompose a pair [modernize-use-structured-binding]
+  // CHECK-MESSAGES-CPP20ORLATER: :[[@LINE-1]]:3: warning: use a structured binding to decompose a pair [modernize-use-structured-binding]
   // CHECK-FIXES-CPP20ORLATER: auto [x, y] = getPair<int, int>();
   int x = P.first;
   int y = P.second; // REMOVE
@@ -348,7 +348,7 @@ void captureByAllRef() {
 
 void deepLambda() {
   auto P = getPair<int, int>();
-  // CHECK-MESSAGES-CPP20ORLATER: :[[@LINE-1]]:3: warning: use structured binding to decompose a pair [modernize-use-structured-binding]
+  // CHECK-MESSAGES-CPP20ORLATER: :[[@LINE-1]]:3: warning: use a structured binding to decompose a pair [modernize-use-structured-binding]
   // CHECK-FIXES-CPP20ORLATER: auto [x, y] = getPair<int, int>();
   int x = P.first;
   int y = P.second; // REMOVE
@@ -364,7 +364,7 @@ void deepLambda() {
 void forRangeNotWarn() {
   std::pair<int, int> Pairs[10];
   for (auto P : Pairs) {
-  // CHECK-MESSAGES-CPP20ORLATER: :[[@LINE-1]]:8: warning: use structured binding to decompose a pair [modernize-use-structured-binding]
+  // CHECK-MESSAGES-CPP20ORLATER: :[[@LINE-1]]:8: warning: use a structured binding to decompose a pair [modernize-use-structured-binding]
   // CHECK-FIXES-CPP20ORLATER: for (auto [x, y] : Pairs) {
     int x = P.first;
     int y = P.second; // REMOVE
@@ -381,7 +381,7 @@ void stdTieNotWarn() {
   int y = 0; // REMOVE
   // CHECK-FIXES-CPP20ORLATER: // REMOVE
   std::tie(x, y) = getPair<int, int>();
-  // CHECK-MESSAGES-CPP20ORLATER: :[[@LINE-1]]:3: warning: use structured binding to decompose a pair [modernize-use-structured-binding]
+  // CHECK-MESSAGES-CPP20ORLATER: :[[@LINE-1]]:3: warning: use a structured binding to decompose a pair [modernize-use-structured-binding]
   // CHECK-FIXES-CPP20ORLATER: auto [x, y] = getPair<int, int>();
 
   auto lambda = [&x]() {