Updated expected error in diagnostic checks in libcxx tests.

egorshamshura · egorshamshura · commit eeb8d3d27285 · 2025-06-16T03:02:05.000Z
diff --git a/libcxx/test/libcxx/utilities/expected/expected.expected/and_then.mandates.verify.cpp b/libcxx/test/libcxx/utilities/expected/expected.expected/and_then.mandates.verify.cpp
@@ -55,7 +55,7 @@ void test() {
       // expected-error-re@*:* {{static assertion failed {{.*}}The result of f(value()) must be a specialization of std::expected}}
       // expected-error-re@*:* {{{{.*}}cannot be used prior to '::' because it has no members}}
       // expected-error-re@*:* {{no matching constructor for initialization of{{.*}}}}
-      // expected-error@*:* {{excess elements in struct initializer}}
+      // expected-error@*:* 0-1{{excess elements in struct initializer}}
     }
 
     // !std::is_same_v<U:error_type, E>
@@ -75,7 +75,7 @@ void test() {
       // expected-error-re@*:* {{static assertion failed {{.*}}The result of f(value()) must be a specialization of std::expected}}
       // expected-error-re@*:* {{{{.*}}cannot be used prior to '::' because it has no members}}
       // expected-error-re@*:* {{no matching constructor for initialization of{{.*}}}}
-      // expected-error@*:* {{excess elements in struct initializer}}
+      // expected-error@*:* 0-1{{excess elements in struct initializer}}
     }
 
     // !std::is_same_v<U:error_type, E>
@@ -96,7 +96,7 @@ void test() {
       // expected-error-re@*:* {{static assertion failed {{.*}}The result of f(std::move(value())) must be a specialization of std::expected}}
       // expected-error-re@*:* {{{{.*}}cannot be used prior to '::' because it has no members}}
       // expected-error-re@*:* {{no matching constructor for initialization of{{.*}}}}
-      // expected-error@*:* {{excess elements in struct initializer}}
+      // expected-error@*:* 0-1{{excess elements in struct initializer}}
     }
 
     // !std::is_same_v<U:error_type, E>
@@ -116,7 +116,7 @@ void test() {
       // expected-error-re@*:* {{static assertion failed {{.*}}The result of f(std::move(value())) must be a specialization of std::expected}}
       // expected-error-re@*:* {{{{.*}}cannot be used prior to '::' because it has no members}}
       // expected-error-re@*:* {{no matching constructor for initialization of{{.*}}}}
-      // expected-error@*:* {{excess elements in struct initializer}}
+      // expected-error@*:* 0-1{{excess elements in struct initializer}}
     }
 
     // !std::is_same_v<U:error_type, E>
diff --git a/libcxx/test/libcxx/utilities/expected/expected.expected/or_else.mandates.verify.cpp b/libcxx/test/libcxx/utilities/expected/expected.expected/or_else.mandates.verify.cpp
@@ -55,7 +55,7 @@ void test() {
       // expected-error-re@*:* {{static assertion failed {{.*}}The result of f(error()) must be a specialization of std::expected}}
       // expected-error-re@*:* {{{{.*}}cannot be used prior to '::' because it has no members}}
       // expected-error-re@*:* {{no matching constructor for initialization of{{.*}}}}
-      // expected-error@*:* {{excess elements in struct initializer}}
+      // expected-error@*:* 0-1{{excess elements in struct initializer}}
     }
 
     // !std::is_same_v<G:value_type, T>
@@ -75,7 +75,7 @@ void test() {
       // expected-error-re@*:* {{static assertion failed {{.*}}The result of f(error()) must be a specialization of std::expected}}
       // expected-error-re@*:* {{{{.*}}cannot be used prior to '::' because it has no members}}
       // expected-error-re@*:* {{no matching constructor for initialization of{{.*}}}}
-      // expected-error@*:* {{excess elements in struct initializer}}
+      // expected-error@*:* 0-1{{excess elements in struct initializer}}
     }
 
     // !std::is_same_v<G:value_type, T>
@@ -95,7 +95,7 @@ void test() {
       // expected-error-re@*:* {{static assertion failed {{.*}}The result of f(std::move(error())) must be a specialization of std::expected}}
       // expected-error-re@*:* {{{{.*}}cannot be used prior to '::' because it has no members}}
       // expected-error-re@*:* {{no matching constructor for initialization of{{.*}}}}
-      // expected-error@*:* {{excess elements in struct initializer}}
+      // expected-error@*:* 0-1{{excess elements in struct initializer}}
     }
 
     // !std::is_same_v<G:value_type, T>
@@ -115,7 +115,7 @@ void test() {
       // expected-error-re@*:* {{static assertion failed {{.*}}The result of f(std::move(error())) must be a specialization of std::expected}}
       // expected-error-re@*:* {{{{.*}}cannot be used prior to '::' because it has no members}}
       // expected-error-re@*:* {{no matching constructor for initialization of{{.*}}}}
-      // expected-error@*:* {{excess elements in struct initializer}}
+      // expected-error@*:* 0-1{{excess elements in struct initializer}}
     }
 
     // !std::is_same_v<G:value_type, T>
diff --git a/libcxx/test/libcxx/utilities/expected/expected.expected/value.observers.verify.cpp b/libcxx/test/libcxx/utilities/expected/expected.expected/value.observers.verify.cpp
@@ -82,7 +82,7 @@ void test() {
       std::expected<int, MoveOnly> e;
       [[maybe_unused]] auto val = std::move(e).value();
       // expected-error-re@*:* {{static assertion failed {{.*}}error_type has to be both copy constructible and constructible from decltype(std::move(error()))}}
-      // expected-error@*:* {{call to deleted constructor of 'MoveOnly'}}
+      // expected-error@*:* 0-1{{call to deleted constructor of 'MoveOnly'}}
     }
 
     // is_copy_constructible_v<E> is true and is_constructible_v<E, decltype(std::move(error()))> is true.
@@ -96,7 +96,7 @@ void test() {
       std::expected<int, CopyConstructibleButNotMoveConstructible> e;
       [[maybe_unused]] auto val = std::move(e).value();
       // expected-error-re@*:* {{static assertion failed {{.*}}error_type has to be both copy constructible and constructible from decltype(std::move(error()))}}
-      // expected-error@*:* {{call to deleted constructor of 'CopyConstructibleButNotMoveConstructible'}}
+      // expected-error@*:* 0-1{{call to deleted constructor of 'CopyConstructibleButNotMoveConstructible'}}
     }
   }
 
diff --git a/libcxx/test/libcxx/utilities/expected/expected.void/and_then.mandates.verify.cpp b/libcxx/test/libcxx/utilities/expected/expected.void/and_then.mandates.verify.cpp
@@ -55,7 +55,7 @@ void test() {
       // expected-error-re@*:* {{static assertion failed {{.*}}The result of f() must be a specialization of std::expected}}
       // expected-error-re@*:* {{{{.*}}cannot be used prior to '::' because it has no members}}
       // expected-error-re@*:* {{no matching constructor for initialization of{{.*}}}}
-      // expected-error@*:* {{excess elements in struct initializer}}
+      // expected-error@*:* 0-1{{excess elements in struct initializer}}
     }
 
     // !std::is_same_v<U:error_type, E>
@@ -75,7 +75,7 @@ void test() {
       // expected-error-re@*:* {{static assertion failed {{.*}}The result of f() must be a specialization of std::expected}}
       // expected-error-re@*:* {{{{.*}}cannot be used prior to '::' because it has no members}}
       // expected-error-re@*:* {{no matching constructor for initialization of{{.*}}}}
-      // expected-error@*:* {{excess elements in struct initializer}}
+      // expected-error@*:* 0-1{{excess elements in struct initializer}}
     }
 
     // !std::is_same_v<U:error_type, E>
@@ -95,7 +95,7 @@ void test() {
       // expected-error-re@*:* {{static assertion failed {{.*}}The result of f() must be a specialization of std::expected}}
       // expected-error-re@*:* {{{{.*}}cannot be used prior to '::' because it has no members}}
       // expected-error-re@*:* {{no matching constructor for initialization of{{.*}}}}
-      // expected-error@*:* {{excess elements in struct initializer}}
+      // expected-error@*:* 0-1{{excess elements in struct initializer}}
     }
 
     // !std::is_same_v<U:error_type, E>
@@ -115,7 +115,7 @@ void test() {
       // expected-error-re@*:* {{static assertion failed {{.*}}The result of f() must be a specialization of std::expected}}
       // expected-error-re@*:* {{{{.*}}cannot be used prior to '::' because it has no members}}
       // expected-error-re@*:* {{no matching constructor for initialization of{{.*}}}}
-      // expected-error@*:* {{excess elements in struct initializer}}
+      // expected-error@*:* 0-1{{excess elements in struct initializer}}
     }
 
     // !std::is_same_v<U:error_type, E>
diff --git a/libcxx/test/std/containers/sequences/array/array.creation/to_array.verify.cpp b/libcxx/test/std/containers/sequences/array/array.creation/to_array.verify.cpp
@@ -29,7 +29,7 @@ int main(int, char**) {
     MoveOnly mo[] = {MoveOnly{3}};
     // expected-error@array:* {{to_array requires copy constructible elements}}
     // expected-error-re@array:* {{{{(call to implicitly-deleted copy constructor of 'MoveOnly')|(call to deleted constructor of 'MoveOnly')}}}}
-    // expected-error@array:* {{call to deleted constructor of 'MoveOnly'}}
+    // expected-error@array:* 0-1{{call to deleted constructor of 'MoveOnly'}}
     std::to_array(mo); // expected-note {{requested here}}
   }
 
diff --git a/libcxx/test/std/containers/views/mdspan/mdspan/conversion.verify.cpp b/libcxx/test/std/containers/views/mdspan/mdspan/conversion.verify.cpp
@@ -43,7 +43,7 @@ void cant_construct_data_handle_type() {
   int data;
   std::mdspan<int, std::extents<int>, std::layout_right, convertible_accessor_but_not_handle<int>> m_nc(&data);
   // expected-error-re@*:* {{{{.*}}no matching constructor for initialization of {{.*}} (aka 'not_const_convertible_handle<const int>')}}
-  // expected-error@*:* {{no matching constructor for initialization of 'not_const_convertible_handle<const int>'}}
+  // expected-error@*:* 0-1{{no matching constructor for initialization of 'not_const_convertible_handle<const int>'}}
   // expected-error-re@*:* {{static assertion failed {{.*}}mdspan: incompatible data_handle_type for mdspan construction}}
   [[maybe_unused]] std::
       mdspan<const int, std::extents<int>, std::layout_right, convertible_accessor_but_not_handle<const int>> m_c(m_nc);
@@ -53,6 +53,6 @@ void mapping_constructible_despite_extents_compatibility() {
   int data;
   std::mdspan<int, std::extents<int>, always_convertible_layout> m(&data);
   // expected-error-re@*:* {{static assertion failed {{.*}}mdspan: incompatible extents for mdspan construction}}
-  // expected-error@*:* {{no matching constructor for initialization of 'std::extents<int, 5>'}}
+  // expected-error@*:* 0-1{{no matching constructor for initialization of 'std::extents<int, 5>'}}
   [[maybe_unused]] std::mdspan<int, std::extents<int, 5>, always_convertible_layout> m2(m);
 }
diff --git a/libcxx/test/std/utilities/function.objects/func.bind.partial/bind_back.verify.cpp b/libcxx/test/std/utilities/function.objects/func.bind.partial/bind_back.verify.cpp
@@ -69,8 +69,8 @@ void test() {
     auto f = std::bind_back([](const Arg&) {}, x);
     // expected-error-re@*:* {{static assertion failed{{.*}}bind_back requires all decay_t<Args> to be constructible from respective Args}}
     // expected-error@*:* {{no matching constructor for initialization}}
-    // expected-error@*:* {{call to deleted constructor of 'F'}}
-    // expected-error@*:* {{call to deleted constructor of 'Arg'}}
+    // expected-error@*:* 0-1{{call to deleted constructor of 'F'}}
+    // expected-error@*:* 0-1{{call to deleted constructor of 'Arg'}}
   }
 
   { // Mandates: (is_move_constructible_v<decay_t<Args>> && ...)
diff --git a/libcxx/test/std/utilities/function.objects/func.bind_front/bind_front.verify.cpp b/libcxx/test/std/utilities/function.objects/func.bind_front/bind_front.verify.cpp
@@ -42,5 +42,5 @@ void f() {
     auto d = std::bind_front(do_nothing, n); // expected-error {{no matching function for call to 'bind_front'}}
 
     auto t = std::bind_front(testNotMoveConst, NotMoveConst(0)); // expected-error {{no matching function for call to 'bind_front'}}
-    // expected-error@*:* {{call to deleted constructor of 'NotMoveConst'}}
+    // expected-error@*:* 0-1{{call to deleted constructor of 'NotMoveConst'}}
 }

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ void test() {`
`82`	`82`	`std::expected<int, MoveOnly> e;`
`83`	`83`	`[[maybe_unused]] auto val = std::move(e).value();`
`84`	`84`	`// expected-error-re@: {{static assertion failed {{.*}}error_type has to be both copy constructible and constructible from decltype(std::move(error()))}}`
`85`		`- // expected-error@: {{call to deleted constructor of 'MoveOnly'}}`
	`85`	`+ // expected-error@: 0-1{{call to deleted constructor of 'MoveOnly'}}`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`// is_copy_constructible_v<E> is true and is_constructible_v<E, decltype(std::move(error()))> is true.`
`@@ -96,7 +96,7 @@ void test() {`
`96`	`96`	`std::expected<int, CopyConstructibleButNotMoveConstructible> e;`
`97`	`97`	`[[maybe_unused]] auto val = std::move(e).value();`
`98`	`98`	`// expected-error-re@: {{static assertion failed {{.*}}error_type has to be both copy constructible and constructible from decltype(std::move(error()))}}`
`99`		`- // expected-error@: {{call to deleted constructor of 'CopyConstructibleButNotMoveConstructible'}}`
	`99`	`+ // expected-error@: 0-1{{call to deleted constructor of 'CopyConstructibleButNotMoveConstructible'}}`
`100`	`100`	`}`
`101`	`101`	`}`
`102`	`102`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ int main(int, char**) {`
`29`	`29`	`MoveOnly mo[] = {MoveOnly{3}};`
`30`	`30`	`// expected-error@array:* {{to_array requires copy constructible elements}}`
`31`	`31`	`// expected-error-re@array:* {{{{(call to implicitly-deleted copy constructor of 'MoveOnly')\|(call to deleted constructor of 'MoveOnly')}}}}`
`32`		`- // expected-error@array:* {{call to deleted constructor of 'MoveOnly'}}`
	`32`	`+ // expected-error@array:* 0-1{{call to deleted constructor of 'MoveOnly'}}`
`33`	`33`	`std::to_array(mo); // expected-note {{requested here}}`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -42,5 +42,5 @@ void f() {`
`42`	`42`	`auto d = std::bind_front(do_nothing, n); // expected-error {{no matching function for call to 'bind_front'}}`
`43`	`43`
`44`	`44`	`auto t = std::bind_front(testNotMoveConst, NotMoveConst(0)); // expected-error {{no matching function for call to 'bind_front'}}`
`45`		`- // expected-error@: {{call to deleted constructor of 'NotMoveConst'}}`
	`45`	`+ // expected-error@: 0-1{{call to deleted constructor of 'NotMoveConst'}}`
`46`	`46`	`}`