Improve diagnostic messages

zwuis · zwuis · commit 7c07f2b82e49 · 2025-02-25T11:14:23.000+08:00
diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td
@@ -550,7 +550,7 @@ def err_decomp_decl_constraint : Error<
 def err_decomp_decl_parens : Error<
   "decomposition declaration cannot be declared with parentheses">;
 def err_decomp_decl_template : Error<
-  "decomposition declaration template not supported">;
+  "decomposition declaration cannot be a template">;
 def err_decomp_decl_not_alone : Error<
   "decomposition declaration must be the only declaration in its group">;
 def err_decomp_decl_requires_init : Error<
diff --git a/clang/test/Parser/cxx1z-decomposition.cpp b/clang/test/Parser/cxx1z-decomposition.cpp
@@ -137,7 +137,7 @@ namespace MultiDeclarator {
 namespace Template {
   int n[3];
   // Structured binding template is not allowed.
-  template<typename T> auto [a, b, c] = n; // expected-error {{decomposition declaration template not supported}}
+  template<typename T> auto [a, b, c] = n; // expected-error {{decomposition declaration cannot be a template}}
 }
 
 namespace Init {

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ namespace MultiDeclarator {`
`137`	`137`	`namespace Template {`
`138`	`138`	`int n[3];`
`139`	`139`	`// Structured binding template is not allowed.`
`140`		`- template<typename T> auto [a, b, c] = n; // expected-error {{decomposition declaration template not supported}}`
	`140`	`+ template<typename T> auto [a, b, c] = n; // expected-error {{decomposition declaration cannot be a template}}`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`namespace Init {`