[libcxx-commits] [libcxx] [libc++][NFC] Simplify checks for static assertions in .verify.cpp tests (PR #67559)
via libcxx-commits
libcxx-commits at lists.llvm.org
Wed Sep 27 07:13:42 PDT 2023
llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-libcxx
<details>
<summary>Changes</summary>
We don't neeed to handle both spellings anymore since we don't support Clang 15 anymore.
---
Patch is 158.04 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/67559.diff
108 Files Affected:
- (modified) libcxx/test/libcxx/algorithms/bad_iterator_traits.verify.cpp (+1-1)
- (modified) libcxx/test/libcxx/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add.verify.cpp (+2-2)
- (modified) libcxx/test/libcxx/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add_explicit.verify.cpp (+2-2)
- (modified) libcxx/test/libcxx/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub.verify.cpp (+2-2)
- (modified) libcxx/test/libcxx/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub_explicit.verify.cpp (+2-2)
- (modified) libcxx/test/libcxx/containers/sequences/vector/invalid_allocator.verify.cpp (+1-1)
- (modified) libcxx/test/libcxx/input.output/file.streams/fstreams/filebuf/traits_mismatch.verify.cpp (+1-1)
- (modified) libcxx/test/libcxx/input.output/file.streams/fstreams/traits_mismatch.verify.cpp (+2-2)
- (modified) libcxx/test/libcxx/input.output/iostream.format/input.streams/traits_mismatch.verify.cpp (+1-1)
- (modified) libcxx/test/libcxx/input.output/iostream.format/output.streams/traits_mismatch.verify.cpp (+1-1)
- (modified) libcxx/test/libcxx/input.output/string.streams/traits_mismatch.verify.cpp (+2-2)
- (modified) libcxx/test/libcxx/iterators/predef.iterators/reverse.iterators/bad_template_argument.verify.cpp (+1-1)
- (modified) libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/bad_engine.verify.cpp (+1-1)
- (modified) libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/bad_engine.verify.cpp (+1-1)
- (modified) libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/bad_engine.verify.cpp (+1-1)
- (modified) libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/bad_engine.verify.cpp (+1-1)
- (modified) libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/bad_engine.verify.cpp (+1-1)
- (modified) libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/bad_engine.verify.cpp (+1-1)
- (modified) libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/bad_engine.verify.cpp (+1-1)
- (modified) libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/bad_engine.verify.cpp (+1-1)
- (modified) libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/bad_engine.verify.cpp (+1-1)
- (modified) libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.t/bad_engine.verify.cpp (+1-1)
- (modified) libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.exp/bad_engine.verify.cpp (+1-1)
- (modified) libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.extreme/bad_engine.verify.cpp (+1-1)
- (modified) libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.gamma/bad_engine.verify.cpp (+1-1)
- (modified) libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.poisson/bad_engine.verify.cpp (+1-1)
- (modified) libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.pois/rand.dist.pois.weibull/bad_engine.verify.cpp (+1-1)
- (modified) libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.discrete/bad_engine.verify.cpp (+1-1)
- (modified) libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.pconst/bad_engine.verify.cpp (+1-1)
- (modified) libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.samp/rand.dist.samp.plinear/bad_engine.verify.cpp (+1-1)
- (modified) libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.int/bad_engine.verify.cpp (+1-1)
- (modified) libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.uni/rand.dist.uni.real/bad_engine.verify.cpp (+1-1)
- (modified) libcxx/test/libcxx/ranges/range.utility/range.utility.conv/to.internal_constraints.verify.cpp (+5-5)
- (modified) libcxx/test/libcxx/ranges/range.utility/range.utility.conv/to.static_assert.verify.cpp (+4-4)
- (modified) libcxx/test/libcxx/utilities/expected/expected.expected/and_then.mandates.verify.cpp (+8-8)
- (modified) libcxx/test/libcxx/utilities/expected/expected.expected/error_or.mandates.verify.cpp (+4-4)
- (modified) libcxx/test/libcxx/utilities/expected/expected.expected/or_else.mandates.verify.cpp (+8-8)
- (modified) libcxx/test/libcxx/utilities/expected/expected.expected/transform_error.mandates.verify.cpp (+10-10)
- (modified) libcxx/test/libcxx/utilities/expected/expected.expected/value.observers.verify.cpp (+6-6)
- (modified) libcxx/test/libcxx/utilities/expected/expected.expected/value_or.mandates.verify.cpp (+4-4)
- (modified) libcxx/test/libcxx/utilities/expected/expected.unexpected/class.mandates.verify.cpp (+5-5)
- (modified) libcxx/test/libcxx/utilities/expected/expected.unexpected/swap.mandates.verify.cpp (+1-1)
- (modified) libcxx/test/libcxx/utilities/expected/expected.void/and_then.mandates.verify.cpp (+8-8)
- (modified) libcxx/test/libcxx/utilities/expected/expected.void/error_or.mandates.verify.cpp (+4-4)
- (modified) libcxx/test/libcxx/utilities/expected/expected.void/or_else.mandates.verify.cpp (+8-8)
- (modified) libcxx/test/libcxx/utilities/expected/expected.void/transform_error.mandates.verify.cpp (+10-10)
- (modified) libcxx/test/libcxx/utilities/memory/util.smartptr/util.smartptr.shared/function_type_default_deleter.verify.cpp (+1-1)
- (modified) libcxx/test/libcxx/utilities/utility/pairs/pairs.pair/pair.tuple_element.verify.cpp (+1-1)
- (modified) libcxx/test/libcxx/utilities/variant/variant.variant/variant.helper/variant_alternative.verify.cpp (+1-1)
- (modified) libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/sample.verify.cpp (+1-1)
- (modified) libcxx/test/std/algorithms/alg.sorting/alg.three.way/lexicographical_compare_three_way_comp.verify.cpp (+3-3)
- (modified) libcxx/test/std/containers/associative/map/allocator_mismatch.verify.cpp (+1-1)
- (modified) libcxx/test/std/containers/associative/map/map.cons/deduct.verify.cpp (+1-1)
- (modified) libcxx/test/std/containers/associative/map/map.nonmember/compare.three_way.verify.cpp (+2-2)
- (modified) libcxx/test/std/containers/associative/multimap/allocator_mismatch.verify.cpp (+1-1)
- (modified) libcxx/test/std/containers/associative/multimap/multimap.cons/deduct.verify.cpp (+1-1)
- (modified) libcxx/test/std/containers/associative/multimap/multimap.nonmember/compare.three_way.verify.cpp (+2-2)
- (modified) libcxx/test/std/containers/associative/multiset/allocator_mismatch.verify.cpp (+1-1)
- (modified) libcxx/test/std/containers/associative/set/allocator_mismatch.verify.cpp (+1-1)
- (modified) libcxx/test/std/containers/sequences/array/array.fill/fill.verify.cpp (+1-1)
- (modified) libcxx/test/std/containers/sequences/array/array.swap/swap.verify.cpp (+1-1)
- (modified) libcxx/test/std/containers/sequences/array/array.tuple/get.verify.cpp (+1-1)
- (modified) libcxx/test/std/containers/sequences/array/array.tuple/tuple_element.verify.cpp (+1-1)
- (modified) libcxx/test/std/containers/sequences/deque/allocator_mismatch.verify.cpp (+1-1)
- (modified) libcxx/test/std/containers/sequences/forwardlist/allocator_mismatch.verify.cpp (+1-1)
- (modified) libcxx/test/std/containers/sequences/list/allocator_mismatch.verify.cpp (+1-1)
- (modified) libcxx/test/std/containers/sequences/vector/allocator_mismatch.verify.cpp (+1-1)
- (modified) libcxx/test/std/containers/unord/unord.map/allocator_mismatch.verify.cpp (+1-1)
- (modified) libcxx/test/std/containers/unord/unord.multimap/allocator_mismatch.verify.cpp (+1-1)
- (modified) libcxx/test/std/containers/unord/unord.multiset/allocator_mismatch.verify.cpp (+1-1)
- (modified) libcxx/test/std/containers/unord/unord.set/allocator_mismatch.verify.cpp (+1-1)
- (modified) libcxx/test/std/containers/views/mdspan/default_accessor/element_type.verify.cpp (+2-2)
- (modified) libcxx/test/std/containers/views/mdspan/layout_left/extents.verify.cpp (+2-2)
- (modified) libcxx/test/std/containers/views/mdspan/layout_right/extents.verify.cpp (+2-2)
- (modified) libcxx/test/std/containers/views/mdspan/mdspan/conversion.verify.cpp (+2-2)
- (modified) libcxx/test/std/containers/views/mdspan/mdspan/element_type.verify.cpp (+3-3)
- (modified) libcxx/test/std/containers/views/mdspan/mdspan/extents.verify.cpp (+1-1)
- (modified) libcxx/test/std/containers/views/mdspan/mdspan/mapping.verify.cpp (+1-1)
- (modified) libcxx/test/std/language.support/support.dynamic/ptr.launder/launder.types.verify.cpp (+2-2)
- (modified) libcxx/test/std/numerics/bit/bit.pow.two/bit_ceil.verify.cpp (+13-13)
- (modified) libcxx/test/std/numerics/numbers/illformed.verify.cpp (+1-1)
- (modified) libcxx/test/std/numerics/rand/rand.eng/rand.eng.lcong/params.verify.cpp (+3-3)
- (modified) libcxx/test/std/strings/basic.string/char.bad.verify.cpp (+3-3)
- (modified) libcxx/test/std/strings/string.view/char.bad.verify.cpp (+3-3)
- (modified) libcxx/test/std/strings/string.view/string.view.comparison/comparison.verify.cpp (+2-2)
- (modified) libcxx/test/std/thread/thread.semaphore/ctor.verify.cpp (+1-1)
- (modified) libcxx/test/std/time/time.hms/hhmmss.verify.cpp (+4-4)
- (modified) libcxx/test/std/utilities/any/any.nonmembers/any.cast/any_cast_request_invalid_value_category.verify.cpp (+6-6)
- (modified) libcxx/test/std/utilities/any/any.nonmembers/any.cast/const_correctness.verify.cpp (+4-4)
- (modified) libcxx/test/std/utilities/any/any.nonmembers/any.cast/not_copy_constructible.verify.cpp (+3-3)
- (modified) libcxx/test/std/utilities/any/any.nonmembers/any.cast/reference_types.verify.cpp (+8-8)
- (modified) libcxx/test/std/utilities/format/format.formatter/format.parse.ctx/check_arg_id.verify.cpp (+1-1)
- (modified) libcxx/test/std/utilities/format/format.formatter/format.parse.ctx/next_arg_id.verify.cpp (+1-1)
- (modified) libcxx/test/std/utilities/function.objects/func.bind_front/bind_front.verify.cpp (+1-1)
- (modified) libcxx/test/std/utilities/intseq/intseq.make/make_integer_seq.verify.cpp (+1-1)
- (modified) libcxx/test/std/utilities/intseq/intseq.make/make_integer_seq_fallback.verify.cpp (+1-1)
- (modified) libcxx/test/std/utilities/memory/default.allocator/allocator.members/allocate.constexpr.size.verify.cpp (+2-2)
- (modified) libcxx/test/std/utilities/meta/meta.const.eval/is_constant_evaluated.verify.cpp (+1-1)
- (modified) libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/ctor.verify.cpp (+11-11)
- (modified) libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.verify.cpp (+1-1)
- (modified) libcxx/test/std/utilities/optional/optional.object/optional_requires_destructible_object.verify.cpp (+6-6)
- (modified) libcxx/test/std/utilities/tuple/tuple.tuple/tuple.helper/tuple_element.verify.cpp (+1-1)
- (modified) libcxx/test/std/utilities/utility/forward/forward.verify.cpp (+1-1)
- (modified) libcxx/test/std/utilities/variant/variant.relops/relops_bool_conv.verify.cpp (+1-1)
- (modified) libcxx/test/std/utilities/variant/variant.variant/variant_array.verify.cpp (+1-1)
- (modified) libcxx/test/std/utilities/variant/variant.variant/variant_empty.verify.cpp (+1-1)
- (modified) libcxx/test/std/utilities/variant/variant.variant/variant_reference.verify.cpp (+1-1)
- (modified) libcxx/test/std/utilities/variant/variant.variant/variant_void.verify.cpp (+1-1)
``````````diff
diff --git a/libcxx/test/libcxx/algorithms/bad_iterator_traits.verify.cpp b/libcxx/test/libcxx/algorithms/bad_iterator_traits.verify.cpp
index 61e1712987e7c57..a0b5b88bb9f0eb8 100644
--- a/libcxx/test/libcxx/algorithms/bad_iterator_traits.verify.cpp
+++ b/libcxx/test/libcxx/algorithms/bad_iterator_traits.verify.cpp
@@ -57,5 +57,5 @@ struct BadIter {
// behavior when these iterators are passed to standard algorithms.
void test() {
std::sort(BadIter(), BadIter());
- //expected-error-re@*:* {{{{(static_assert|static assertion)}} failed {{.*}}It looks like your iterator's `iterator_traits<It>::reference` does not match the return type of dereferencing the iterator}}
+ //expected-error-re@*:* {{static assertion failed {{.*}}It looks like your iterator's `iterator_traits<It>::reference` does not match the return type of dereferencing the iterator}}
}
diff --git a/libcxx/test/libcxx/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add.verify.cpp b/libcxx/test/libcxx/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add.verify.cpp
index 9ba2fc9b9416aa7..fbe7dbbd6d9f048 100644
--- a/libcxx/test/libcxx/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add.verify.cpp
+++ b/libcxx/test/libcxx/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add.verify.cpp
@@ -46,12 +46,12 @@ void pointer_to_incomplete_type() {
void function_pointer() {
{
volatile std::atomic<void (*)(int)> fun;
- // expected-error-re@*:* {{{{(static_assert|static assertion)}} failed due to requirement '!is_function<void (int)>::value'{{.*}}Pointer to function isn't allowed}}
+ // expected-error-re@*:* {{static assertion failed due to requirement '!is_function<void (int)>::value'{{.*}}Pointer to function isn't allowed}}
std::atomic_fetch_add(&fun, 0);
}
{
std::atomic<void (*)(int)> fun;
- // expected-error-re@*:* {{{{(static_assert|static assertion)}} failed due to requirement '!is_function<void (int)>::value'{{.*}}Pointer to function isn't allowed}}
+ // expected-error-re@*:* {{static assertion failed due to requirement '!is_function<void (int)>::value'{{.*}}Pointer to function isn't allowed}}
std::atomic_fetch_add(&fun, 0);
}
}
diff --git a/libcxx/test/libcxx/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add_explicit.verify.cpp b/libcxx/test/libcxx/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add_explicit.verify.cpp
index afcd995c895524e..176a38c7c0f7f1c 100644
--- a/libcxx/test/libcxx/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add_explicit.verify.cpp
+++ b/libcxx/test/libcxx/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add_explicit.verify.cpp
@@ -49,12 +49,12 @@ void pointer_to_incomplete_type() {
void function_pointer() {
{
volatile std::atomic<void (*)(int)> fun;
- // expected-error-re@*:* {{{{(static_assert|static assertion)}} failed due to requirement '!is_function<void (int)>::value'{{.*}}Pointer to function isn't allowed}}
+ // expected-error-re@*:* {{static assertion failed due to requirement '!is_function<void (int)>::value'{{.*}}Pointer to function isn't allowed}}
std::atomic_fetch_add_explicit(&fun, 0, std::memory_order_relaxed);
}
{
std::atomic<void (*)(int)> fun;
- // expected-error-re@*:* {{{{(static_assert|static assertion)}} failed due to requirement '!is_function<void (int)>::value'{{.*}}Pointer to function isn't allowed}}
+ // expected-error-re@*:* {{static assertion failed due to requirement '!is_function<void (int)>::value'{{.*}}Pointer to function isn't allowed}}
std::atomic_fetch_add_explicit(&fun, 0, std::memory_order_relaxed);
}
}
diff --git a/libcxx/test/libcxx/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub.verify.cpp b/libcxx/test/libcxx/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub.verify.cpp
index f179bd080466d3d..6f3039dab669749 100644
--- a/libcxx/test/libcxx/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub.verify.cpp
+++ b/libcxx/test/libcxx/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub.verify.cpp
@@ -46,12 +46,12 @@ void pointer_to_incomplete_type() {
void function_pointer() {
{
volatile std::atomic<void (*)(int)> fun;
- // expected-error-re@*:* {{{{(static_assert|static assertion)}} failed due to requirement '!is_function<void (int)>::value'{{.*}}Pointer to function isn't allowed}}
+ // expected-error-re@*:* {{static assertion failed due to requirement '!is_function<void (int)>::value'{{.*}}Pointer to function isn't allowed}}
std::atomic_fetch_sub(&fun, 0);
}
{
std::atomic<void (*)(int)> fun;
- // expected-error-re@*:* {{{{(static_assert|static assertion)}} failed due to requirement '!is_function<void (int)>::value'{{.*}}Pointer to function isn't allowed}}
+ // expected-error-re@*:* {{static assertion failed due to requirement '!is_function<void (int)>::value'{{.*}}Pointer to function isn't allowed}}
std::atomic_fetch_sub(&fun, 0);
}
}
diff --git a/libcxx/test/libcxx/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub_explicit.verify.cpp b/libcxx/test/libcxx/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub_explicit.verify.cpp
index bbab7678853921a..1b3c58fa87551c8 100644
--- a/libcxx/test/libcxx/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub_explicit.verify.cpp
+++ b/libcxx/test/libcxx/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub_explicit.verify.cpp
@@ -49,12 +49,12 @@ void pointer_to_incomplete_type() {
void function_pointer() {
{
volatile std::atomic<void (*)(int)> fun;
- // expected-error-re@*:* {{{{(static_assert|static assertion)}} failed due to requirement '!is_function<void (int)>::value'{{.*}}Pointer to function isn't allowed}}
+ // expected-error-re@*:* {{static assertion failed due to requirement '!is_function<void (int)>::value'{{.*}}Pointer to function isn't allowed}}
std::atomic_fetch_sub_explicit(&fun, 0, std::memory_order_relaxed);
}
{
std::atomic<void (*)(int)> fun;
- // expected-error-re@*:* {{{{(static_assert|static assertion)}} failed due to requirement '!is_function<void (int)>::value'{{.*}}Pointer to function isn't allowed}}
+ // expected-error-re@*:* {{static assertion failed due to requirement '!is_function<void (int)>::value'{{.*}}Pointer to function isn't allowed}}
std::atomic_fetch_sub_explicit(&fun, 0, std::memory_order_relaxed);
}
}
diff --git a/libcxx/test/libcxx/containers/sequences/vector/invalid_allocator.verify.cpp b/libcxx/test/libcxx/containers/sequences/vector/invalid_allocator.verify.cpp
index abd33a07a6cd5e7..c1d72bcd555ceb3 100644
--- a/libcxx/test/libcxx/containers/sequences/vector/invalid_allocator.verify.cpp
+++ b/libcxx/test/libcxx/containers/sequences/vector/invalid_allocator.verify.cpp
@@ -24,5 +24,5 @@ class FooAllocator {
};
void func() {
- std::vector<int, FooAllocator> v; //expected-error-re@*:* {{{{(static_assert|static assertion)}} failed {{.*}}This allocator has to implement rebind}}
+ std::vector<int, FooAllocator> v; //expected-error-re@*:* {{static assertion failed {{.*}}This allocator has to implement rebind}}
}
diff --git a/libcxx/test/libcxx/input.output/file.streams/fstreams/filebuf/traits_mismatch.verify.cpp b/libcxx/test/libcxx/input.output/file.streams/fstreams/filebuf/traits_mismatch.verify.cpp
index e6f651ca41d3245..2157b2eb3cdf5d4 100644
--- a/libcxx/test/libcxx/input.output/file.streams/fstreams/filebuf/traits_mismatch.verify.cpp
+++ b/libcxx/test/libcxx/input.output/file.streams/fstreams/filebuf/traits_mismatch.verify.cpp
@@ -18,7 +18,7 @@
#include <fstream>
std::basic_filebuf<char, std::char_traits<wchar_t> > f;
-// expected-error-re at streambuf:* {{{{(static_assert|static assertion)}} failed{{.*}}traits_type::char_type must be the same type as CharT}}
+// expected-error-re at streambuf:* {{static assertion failed{{.*}}traits_type::char_type must be the same type as CharT}}
// expected-error at fstream:* {{only virtual member functions can be marked 'override'}}
// expected-error at fstream:* {{only virtual member functions can be marked 'override'}}
// expected-error at fstream:* {{only virtual member functions can be marked 'override'}}
diff --git a/libcxx/test/libcxx/input.output/file.streams/fstreams/traits_mismatch.verify.cpp b/libcxx/test/libcxx/input.output/file.streams/fstreams/traits_mismatch.verify.cpp
index 94299fe0af4739b..82136ee025574d7 100644
--- a/libcxx/test/libcxx/input.output/file.streams/fstreams/traits_mismatch.verify.cpp
+++ b/libcxx/test/libcxx/input.output/file.streams/fstreams/traits_mismatch.verify.cpp
@@ -18,8 +18,8 @@
#include <fstream>
std::basic_fstream<char, std::char_traits<wchar_t> > f;
-// expected-error-re at ios:* {{{{(static_assert|static assertion)}} failed{{.*}}traits_type::char_type must be the same type as CharT}}
-// expected-error-re at streambuf:* {{{{(static_assert|static assertion)}} failed{{.*}}traits_type::char_type must be the same type as CharT}}
+// expected-error-re at ios:* {{static assertion failed{{.*}}traits_type::char_type must be the same type as CharT}}
+// expected-error-re at streambuf:* {{static assertion failed{{.*}}traits_type::char_type must be the same type as CharT}}
// expected-error at fstream:* {{only virtual member functions can be marked 'override'}}
// expected-error at fstream:* {{only virtual member functions can be marked 'override'}}
diff --git a/libcxx/test/libcxx/input.output/iostream.format/input.streams/traits_mismatch.verify.cpp b/libcxx/test/libcxx/input.output/iostream.format/input.streams/traits_mismatch.verify.cpp
index 5789e8e2b07b124..435e1df6dc4ba7d 100644
--- a/libcxx/test/libcxx/input.output/iostream.format/input.streams/traits_mismatch.verify.cpp
+++ b/libcxx/test/libcxx/input.output/iostream.format/input.streams/traits_mismatch.verify.cpp
@@ -21,5 +21,5 @@
struct test_istream
: public std::basic_istream<char, std::char_traits<wchar_t> > {};
-// expected-error-re at ios:* {{{{(static_assert|static assertion)}} failed{{.*}}traits_type::char_type must be the same type as CharT}}
+// expected-error-re at ios:* {{static assertion failed{{.*}}traits_type::char_type must be the same type as CharT}}
// expected-error at istream:* {{only virtual member functions can be marked 'override'}}
diff --git a/libcxx/test/libcxx/input.output/iostream.format/output.streams/traits_mismatch.verify.cpp b/libcxx/test/libcxx/input.output/iostream.format/output.streams/traits_mismatch.verify.cpp
index 6f8ba7baaa1e206..5b4f7c4694e6218 100644
--- a/libcxx/test/libcxx/input.output/iostream.format/output.streams/traits_mismatch.verify.cpp
+++ b/libcxx/test/libcxx/input.output/iostream.format/output.streams/traits_mismatch.verify.cpp
@@ -21,5 +21,5 @@
struct test_ostream
: public std::basic_ostream<char, std::char_traits<wchar_t> > {};
-// expected-error-re at ios:* {{{{(static_assert|static assertion)}} failed{{.*}}traits_type::char_type must be the same type as CharT}}
+// expected-error-re at ios:* {{static assertion failed{{.*}}traits_type::char_type must be the same type as CharT}}
// expected-error at ostream:* {{only virtual member functions can be marked 'override'}}
diff --git a/libcxx/test/libcxx/input.output/string.streams/traits_mismatch.verify.cpp b/libcxx/test/libcxx/input.output/string.streams/traits_mismatch.verify.cpp
index 36c4b23eb29782e..466ad70558fe59a 100644
--- a/libcxx/test/libcxx/input.output/string.streams/traits_mismatch.verify.cpp
+++ b/libcxx/test/libcxx/input.output/string.streams/traits_mismatch.verify.cpp
@@ -19,8 +19,8 @@
#include <sstream>
std::basic_stringbuf<char, std::char_traits<wchar_t> > sb;
-// expected-error-re at streambuf:* {{{{(static_assert|static assertion)}} failed{{.*}}traits_type::char_type must be the same type as CharT}}
-// expected-error-re at string:* {{{{(static_assert|static assertion)}} failed{{.*}}traits_type::char_type must be the same type as CharT}}
+// expected-error-re at streambuf:* {{static assertion failed{{.*}}traits_type::char_type must be the same type as CharT}}
+// expected-error-re at string:* {{static assertion failed{{.*}}traits_type::char_type must be the same type as CharT}}
// expected-error at sstream:* {{only virtual member functions can be marked 'override'}}
// expected-error at sstream:* {{only virtual member functions can be marked 'override'}}
diff --git a/libcxx/test/libcxx/iterators/predef.iterators/reverse.iterators/bad_template_argument.verify.cpp b/libcxx/test/libcxx/iterators/predef.iterators/reverse.iterators/bad_template_argument.verify.cpp
index 1ad9ca9676ffbee..997e611b9531837 100644
--- a/libcxx/test/libcxx/iterators/predef.iterators/reverse.iterators/bad_template_argument.verify.cpp
+++ b/libcxx/test/libcxx/iterators/predef.iterators/reverse.iterators/bad_template_argument.verify.cpp
@@ -18,5 +18,5 @@
void f() {
using BadIter = std::reverse_iterator<forward_iterator<int*>>;
- BadIter i; //expected-error-re@*:* {{{{(static_assert|static assertion)}} failed{{.*}}reverse_iterator<It> requires It to be a bidirectional iterator.}}
+ BadIter i; //expected-error-re@*:* {{static assertion failed{{.*}}reverse_iterator<It> requires It to be a bidirectional iterator.}}
}
diff --git a/libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/bad_engine.verify.cpp b/libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/bad_engine.verify.cpp
index c2a349a72708fc7..1c2d1837baaaa19 100644
--- a/libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/bad_engine.verify.cpp
+++ b/libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bernoulli/bad_engine.verify.cpp
@@ -25,6 +25,6 @@ void test(std::bernoulli_distribution dist)
G<int> badg;
G<unsigned> okg;
- dist(badg); //expected-error-re@*:* 2 {{{{(static_assert|static assertion)}} failed}} //expected-note {{in instantiation}}
+ dist(badg); //expected-error-re@*:* 2 {{static assertion failed}} //expected-note {{in instantiation}}
dist(okg);
}
diff --git a/libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/bad_engine.verify.cpp b/libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/bad_engine.verify.cpp
index b03f6b4f43b509e..882bfd57f0fd523 100644
--- a/libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/bad_engine.verify.cpp
+++ b/libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.bin/bad_engine.verify.cpp
@@ -25,6 +25,6 @@ void test(std::binomial_distribution<int> dist)
G<int> badg;
G<unsigned> okg;
- dist(badg); //expected-error-re@*:* 2 {{{{(static_assert|static assertion)}} failed}} //expected-note {{in instantiation}}
+ dist(badg); //expected-error-re@*:* 2 {{static assertion failed}} //expected-note {{in instantiation}}
dist(okg);
}
diff --git a/libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/bad_engine.verify.cpp b/libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/bad_engine.verify.cpp
index 4adfda81b666253..9b1775676f431b6 100644
--- a/libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/bad_engine.verify.cpp
+++ b/libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.geo/bad_engine.verify.cpp
@@ -26,6 +26,6 @@ void test(std::geometric_distribution<int> dist)
G<int> badg;
G<unsigned> okg;
- dist(badg); //expected-error-re@*:* 7 {{{{(static_assert|static assertion)}} failed}} //expected-note {{in instantiation}}
+ dist(badg); //expected-error-re@*:* 7 {{static assertion failed}} //expected-note {{in instantiation}}
dist(okg);
}
diff --git a/libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/bad_engine.verify.cpp b/libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/bad_engine.verify.cpp
index 6936d8b24847fc5..f6da020821f8ff3 100644
--- a/libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/bad_engine.verify.cpp
+++ b/libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.bern/rand.dist.bern.negbin/bad_engine.verify.cpp
@@ -26,6 +26,6 @@ void test(std::negative_binomial_distribution<int> dist)
G<int> badg;
G<unsigned> okg;
- dist(badg); //expected-error-re@*:* 7 {{{{(static_assert|static assertion)}} failed}} //expected-note {{in instantiation}}
+ dist(badg); //expected-error-re@*:* 7 {{static assertion failed}} //expected-note {{in instantiation}}
dist(okg);
}
diff --git a/libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/bad_engine.verify.cpp b/libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/bad_engine.verify.cpp
index 118e0be11f4994a..df7a25678555d73 100644
--- a/libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/bad_engine.verify.cpp
+++ b/libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.cauchy/bad_engine.verify.cpp
@@ -25,6 +25,6 @@ void test(std::cauchy_distribution<double> dist)
G<int> badg;
G<unsigned> okg;
- dist(badg); //expected-error-re@*:* 2 {{{{(static_assert|static assertion)}} failed}} //expected-note {{in instantiation}}
+ dist(badg); //expected-error-re@*:* 2 {{static assertion failed}} //expected-note {{in instantiation}}
dist(okg);
}
diff --git a/libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/bad_engine.verify.cpp b/libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/bad_engine.verify.cpp
index 347a5f289f0ae01..3472b043ee1f295 100644
--- a/libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/bad_engine.verify.cpp
+++ b/libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.chisq/bad_engine.verify.cpp
@@ -25,6 +25,6 @@ void test(std::chi_squared_distribution<double> dist)
G<int> badg;
G<unsigned> okg;
- dist(badg); //expected-error-re@*:* 3 {{{{(static_assert|static assertion)}} failed}} //expected-note {{in instantiation}}
+ dist(badg); //expected-error-re@*:* 3 {{static assertion failed}} //expected-note {{in instantiation}}
dist(okg);
}
diff --git a/libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/bad_engine.verify.cpp b/libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/bad_engine.verify.cpp
index 22268d7375f0e33..3dbbcf50fd7e0c4 100644
--- a/libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/bad_engine.verify.cpp
+++ b/libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.f/bad_engine.verify.cpp
@@ -26,6 +26,6 @@ void test(std::fisher_f_distribution<double> dist)
G<int> badg;
G<unsigned> okg;
- dist(badg); //expected-error-re@*:* 4 {{{{(static_assert|static assertion)}} failed}} //expected-note {{in instantiation}}
+ dist(badg); //expected-error-re@*:* 4 {{static assertion failed}} //expected-note {{in instantiation}}
dist(okg);
}
diff --git a/libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/bad_engine.verify.cpp b/libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/bad_engine.verify.cpp
index b168a2ac0a5f463..de91847cbedc625 100644
--- a/libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/bad_engine.verify.cpp
+++ b/libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.lognormal/bad_engine.verify.cpp
@@ -25,6 +25,6 @@ void test(std::lognormal_distribution<double> dist)
G<int> badg;
G<unsigned> okg;
- dist(badg); //expected-error-re@*:* 2 {{{{(static_assert|static assertion)}} failed}} //expected-note {{in instantiation}}
+ dist(badg); //expected-error-re@*:* 2 {{static assertion failed}} //expected-note {{in instantiation}}
dist(okg);
}
diff --git a/libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/bad_engine.verify.cpp b/libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/bad_engine.verify.cpp
index 6ccec0b7412c16f..2e00cce08eb4856 100644
--- a/libcxx/test/libcxx/numerics/rand/rand.dis/rand.dist.norm/rand.dist.norm.normal/bad_engine.verify.cpp
...
[truncated]
``````````
</details>
https://github.com/llvm/llvm-project/pull/67559
More information about the libcxx-commits
mailing list