[libcxx-commits] [libcxx] [libc++][C++03] Remove code in the C++03-specific tests that is guarded on the language version (PR #169354)
via libcxx-commits
libcxx-commits at lists.llvm.org
Mon Nov 24 08:17:51 PST 2025
github-actions[bot] wrote:
<!--LLVM CODE FORMAT COMMENT: {clang-format}-->
:warning: C/C++ code formatter, clang-format found issues in your code. :warning:
<details>
<summary>
You can test this locally with the following command:
</summary>
``````````bash
git-clang-format --diff origin/main HEAD --extensions h,cpp -- libcxx/test/libcxx-03/algorithms/half_positive.pass.cpp libcxx/test/libcxx-03/algorithms/robust_against_copying_comparators.pass.cpp libcxx/test/libcxx-03/algorithms/robust_against_cpp20_hostile_iterators.compile.pass.cpp libcxx/test/libcxx-03/containers/sequences/vector/asan.pass.cpp libcxx/test/libcxx-03/containers/sequences/vector/asan_throw.pass.cpp libcxx/test/libcxx-03/depr/depr.default.allocator/allocator.members/construct.cxx20.pass.cpp libcxx/test/libcxx-03/input.output/string.streams/stringbuf/const_sso_buffer.pass.cpp libcxx/test/libcxx-03/iterators/bounded_iter/arithmetic.pass.cpp libcxx/test/libcxx-03/iterators/bounded_iter/comparison.pass.cpp libcxx/test/libcxx-03/iterators/bounded_iter/pointer_traits.pass.cpp libcxx/test/libcxx-03/iterators/bounded_iter/types.compile.pass.cpp libcxx/test/libcxx-03/iterators/contiguous_iterators.conv.compile.pass.cpp libcxx/test/libcxx-03/iterators/contiguous_iterators.pass.cpp libcxx/test/libcxx-03/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/get_container.pass.cpp libcxx/test/libcxx-03/iterators/unwrap_iter.pass.cpp libcxx/test/libcxx-03/language.support/support.dynamic/libcpp_deallocate.sh.cpp libcxx/test/libcxx-03/libcpp_alignof.pass.cpp libcxx/test/libcxx-03/memory/allocation_guard.pass.cpp libcxx/test/libcxx-03/memory/swap_allocator.pass.cpp libcxx/test/libcxx-03/numerics/bit.ops.pass.cpp libcxx/test/libcxx-03/strings/basic.string/string.capacity/max_size.pass.cpp libcxx/test/libcxx-03/strings/basic.string/string.cons/copy_shrunk_long.pass.cpp libcxx/test/libcxx-03/strings/c.strings/constexpr_memmove.pass.cpp libcxx/test/libcxx-03/type_traits/is_trivially_relocatable.compile.pass.cpp libcxx/test/libcxx-03/utilities/function.objects/func.require/bullet_1_2_3.pass.cpp libcxx/test/libcxx-03/utilities/function.objects/func.require/bullet_4_5_6.pass.cpp libcxx/test/libcxx-03/utilities/function.objects/func.require/bullet_7.pass.cpp libcxx/test/libcxx-03/utilities/function.objects/func.require/invoke.pass.cpp libcxx/test/libcxx-03/utilities/function.objects/func.require/invoke_helpers.h libcxx/test/libcxx-03/utilities/is_pointer_in_range.pass.cpp libcxx/test/libcxx-03/utilities/is_valid_range.pass.cpp libcxx/test/libcxx-03/utilities/memory/pointer.conversion/to_address.pass.cpp libcxx/test/libcxx-03/utilities/memory/pointer.conversion/to_address_std_iterators.pass.cpp libcxx/test/libcxx-03/utilities/meta/is_referenceable.compile.pass.cpp libcxx/test/libcxx-03/utilities/no_destroy.pass.cpp libcxx/test/libcxx-03/utilities/utility/pairs/pairs.pair/abi.non_trivial_copy_move.pass.cpp libcxx/test/libcxx-03/utilities/utility/pairs/pairs.pair/abi.trivial_copy_move.pass.cpp libcxx/test/libcxx-03/utilities/utility/pairs/pairs.pair/abi.trivially_copyable.compile.pass.cpp --diff_from_common_commit
``````````
:warning:
The reproduction instructions above might return results for more than one PR
in a stack if you are using a stacked PR workflow. You can limit the results by
changing `origin/main` to the base branch/commit you want to compare against.
:warning:
</details>
<details>
<summary>
View the diff from clang-format here.
</summary>
``````````diff
diff --git a/libcxx/test/libcxx-03/algorithms/robust_against_cpp20_hostile_iterators.compile.pass.cpp b/libcxx/test/libcxx-03/algorithms/robust_against_cpp20_hostile_iterators.compile.pass.cpp
index 009a23403..2991112d8 100644
--- a/libcxx/test/libcxx-03/algorithms/robust_against_cpp20_hostile_iterators.compile.pass.cpp
+++ b/libcxx/test/libcxx-03/algorithms/robust_against_cpp20_hostile_iterators.compile.pass.cpp
@@ -98,7 +98,7 @@ void test() {
(void) std::equal_range(it, it, 0);
(void) std::equal_range(it, it, 0, pred);
(void) std::equal(it, it, it);
- (void) std::equal(it, it, it, pred);
+ (void)std::equal(it, it, it, pred);
(void) std::fill_n(it, 0, 0);
(void) std::fill(it, it, 0);
(void) std::find_end(it, it, it, it);
@@ -107,7 +107,7 @@ void test() {
(void) std::find_first_of(it, it, it, it, pred);
(void) std::find_if_not(it, it, pred);
(void) std::find_if(it, it, pred);
- (void) std::find(it, it, 0);
+ (void)std::find(it, it, 0);
(void) std::for_each(it, it, pred);
(void) std::generate_n(it, 0, pred);
(void) std::generate(it, it, pred);
@@ -121,13 +121,13 @@ void test() {
(void) std::is_heap(it, it, pred);
(void) std::is_partitioned(it, it, pred);
(void) std::is_permutation(it, it, it);
- (void) std::is_permutation(it, it, it, pred);
+ (void)std::is_permutation(it, it, it, pred);
(void) std::is_sorted_until(it, it);
(void) std::is_sorted_until(it, it, pred);
(void) std::is_sorted(it, it);
(void) std::is_sorted(it, it, pred);
(void) std::lexicographical_compare(it, it, it, it);
- (void) std::lexicographical_compare(it, it, it, it, pred);
+ (void)std::lexicographical_compare(it, it, it, it, pred);
(void) std::lower_bound(it, it, 0);
(void) std::lower_bound(it, it, 0, pred);
(void) std::make_heap(it, it);
@@ -173,9 +173,9 @@ void test() {
(void) std::reverse_copy(it, it, it);
(void) std::reverse(it, it);
(void) std::rotate_copy(it, it, it, it);
- (void) std::rotate(it, it, it);
+ (void)std::rotate(it, it, it);
(void) std::search(it, it, it, it);
- (void) std::search(it, it, it, it, pred);
+ (void)std::search(it, it, it, it, pred);
(void) std::set_difference(it, it, it, it, it);
(void) std::set_difference(it, it, it, it, it, pred);
(void) std::set_intersection(it, it, it, it, it);
@@ -183,7 +183,7 @@ void test() {
(void) std::set_symmetric_difference(it, it, it, it, it);
(void) std::set_symmetric_difference(it, it, it, it, it, pred);
(void) std::set_union(it, it, it, it, it);
- (void) std::set_union(it, it, it, it, it, pred);
+ (void)std::set_union(it, it, it, it, it, pred);
(void) std::shuffle(it, it, rng);
(void) std::sort_heap(it, it);
(void) std::sort_heap(it, it, pred);
diff --git a/libcxx/test/libcxx-03/iterators/contiguous_iterators.pass.cpp b/libcxx/test/libcxx-03/iterators/contiguous_iterators.pass.cpp
index 56f12e01f..f54635b76 100644
--- a/libcxx/test/libcxx-03/iterators/contiguous_iterators.pass.cpp
+++ b/libcxx/test/libcxx-03/iterators/contiguous_iterators.pass.cpp
@@ -115,7 +115,8 @@ int main(int, char**)
static_assert((!std::__libcpp_is_contiguous_iterator<std::reverse_iterator<const char *> >::value), "");
static_assert((!std::__libcpp_is_contiguous_iterator<std::reverse_iterator<int *> >::value), "");
static_assert((!std::__libcpp_is_contiguous_iterator<std::reverse_iterator<T *> >::value), "");
- static_assert((!std::__libcpp_is_contiguous_iterator<std::reverse_iterator<my_random_access_iterator> >::value), "");
+ static_assert(
+ (!std::__libcpp_is_contiguous_iterator<std::reverse_iterator<my_random_access_iterator> >::value), "");
static_assert(( std::__libcpp_is_contiguous_iterator<std::__wrap_iter<char *> >::value), "");
static_assert(( std::__libcpp_is_contiguous_iterator<std::__wrap_iter<const char *> >::value), "");
@@ -133,7 +134,7 @@ int main(int, char**)
static_assert((!std::__libcpp_is_contiguous_iterator<cpp17_input_iterator <char *> >::value), "");
static_assert((!std::__libcpp_is_contiguous_iterator<forward_iterator <char *> >::value), "");
static_assert((!std::__libcpp_is_contiguous_iterator<bidirectional_iterator<char *> >::value), "");
- static_assert((!std::__libcpp_is_contiguous_iterator<random_access_iterator<char *> >::value), "");
+ static_assert((!std::__libcpp_is_contiguous_iterator<random_access_iterator<char*> >::value), "");
static_assert((!std::__libcpp_is_contiguous_iterator<ThrowingIterator <char *> >::value), "");
static_assert((!std::__libcpp_is_contiguous_iterator<NonThrowingIterator <char *> >::value), "");
diff --git a/libcxx/test/libcxx-03/utilities/function.objects/func.require/bullet_1_2_3.pass.cpp b/libcxx/test/libcxx-03/utilities/function.objects/func.require/bullet_1_2_3.pass.cpp
index a88311210..1e67e32a0 100644
--- a/libcxx/test/libcxx-03/utilities/function.objects/func.require/bullet_1_2_3.pass.cpp
+++ b/libcxx/test/libcxx-03/utilities/function.objects/func.require/bullet_1_2_3.pass.cpp
@@ -89,7 +89,6 @@ private:
MemFun03& operator=(MemFun03 const&);
};
-
//==============================================================================
// TestCase - A test case for a single member function.
// ClassType - The type of the class being tested.
diff --git a/libcxx/test/libcxx-03/utilities/function.objects/func.require/bullet_4_5_6.pass.cpp b/libcxx/test/libcxx-03/utilities/function.objects/func.require/bullet_4_5_6.pass.cpp
index 3a8d141a7..7295acfc9 100644
--- a/libcxx/test/libcxx-03/utilities/function.objects/func.require/bullet_4_5_6.pass.cpp
+++ b/libcxx/test/libcxx-03/utilities/function.objects/func.require/bullet_4_5_6.pass.cpp
@@ -156,14 +156,12 @@ private:
}
template <class Expect, class Fn, class T>
- void runTest(Fn M, T& obj, ObjectType* expect ) {
- {
- static_assert((std::is_same<
- decltype(std::__invoke(M, std::forward<T>(obj))), Expect
- >::value), "");
- Expect e = std::__invoke(M, std::forward<T>(obj));
- assert(&e == expect);
- }
+ void runTest(Fn M, T& obj, ObjectType* expect) {
+ {
+ static_assert((std::is_same< decltype(std::__invoke(M, std::forward<T>(obj))), Expect >::value), "");
+ Expect e = std::__invoke(M, std::forward<T>(obj));
+ assert(&e == expect);
+ }
}
};
diff --git a/libcxx/test/libcxx-03/utilities/function.objects/func.require/bullet_7.pass.cpp b/libcxx/test/libcxx-03/utilities/function.objects/func.require/bullet_7.pass.cpp
index ba1c655da..46ca59ccc 100644
--- a/libcxx/test/libcxx-03/utilities/function.objects/func.require/bullet_7.pass.cpp
+++ b/libcxx/test/libcxx-03/utilities/function.objects/func.require/bullet_7.pass.cpp
@@ -114,7 +114,6 @@ private:
Functor03& operator=(Functor03 const&);
};
-
//==============================================================================
// TestCaseFunctorImp - A test case for an operator() class method.
// ClassType - The type of the call object.
@@ -166,7 +165,7 @@ public:
//==============================================================================
template <class Sig, int Arity, class ArgCaster>
void runFunctionTestCase() {
- TestCaseFreeFunction<Sig, freeFunction03, Arity, ArgCaster>();
+ TestCaseFreeFunction<Sig, freeFunction03, Arity, ArgCaster>();
}
template <class Sig, int Arity, class ObjCaster, class ArgCaster>
diff --git a/libcxx/test/libcxx-03/utilities/function.objects/func.require/invoke.pass.cpp b/libcxx/test/libcxx-03/utilities/function.objects/func.require/invoke.pass.cpp
index bfcea06e9..47b5652ce 100644
--- a/libcxx/test/libcxx-03/utilities/function.objects/func.require/invoke.pass.cpp
+++ b/libcxx/test/libcxx-03/utilities/function.objects/func.require/invoke.pass.cpp
@@ -28,7 +28,7 @@ struct Type
int main(int, char**)
{
static_assert(sizeof(std::__invoke(&Type::f1, std::declval<Type >())) == 1, "");
- static_assert(sizeof(std::__invoke(&Type::f2, std::declval<Type const >())) == 2, "");
+ static_assert(sizeof(std::__invoke(&Type::f2, std::declval<Type const >())) == 2, "");
- return 0;
+ return 0;
}
diff --git a/libcxx/test/libcxx-03/utilities/utility/pairs/pairs.pair/abi.non_trivial_copy_move.pass.cpp b/libcxx/test/libcxx-03/utilities/utility/pairs/pairs.pair/abi.non_trivial_copy_move.pass.cpp
index d96188439..2ef5c4ed3 100644
--- a/libcxx/test/libcxx-03/utilities/utility/pairs/pairs.pair/abi.non_trivial_copy_move.pass.cpp
+++ b/libcxx/test/libcxx-03/utilities/utility/pairs/pairs.pair/abi.non_trivial_copy_move.pass.cpp
@@ -28,11 +28,11 @@
#include "test_macros.h"
template <class T>
-struct HasNonTrivialABI : std::integral_constant<bool,
- !std::is_trivially_destructible<T>::value
- || (std::is_copy_constructible<T>::value && !std::is_trivially_copy_constructible<T>::value)
-> {};
-
+struct HasNonTrivialABI
+ : std::integral_constant<
+ bool,
+ !std::is_trivially_destructible<T>::value ||
+ (std::is_copy_constructible<T>::value && !std::is_trivially_copy_constructible<T>::value) > {};
void test_trivial()
{
diff --git a/libcxx/test/libcxx-03/utilities/utility/pairs/pairs.pair/abi.trivial_copy_move.pass.cpp b/libcxx/test/libcxx-03/utilities/utility/pairs/pairs.pair/abi.trivial_copy_move.pass.cpp
index 1dafb10ce..569dab59e 100644
--- a/libcxx/test/libcxx-03/utilities/utility/pairs/pairs.pair/abi.trivial_copy_move.pass.cpp
+++ b/libcxx/test/libcxx-03/utilities/utility/pairs/pairs.pair/abi.trivial_copy_move.pass.cpp
@@ -25,10 +25,11 @@
#include "test_macros.h"
template <class T>
-struct HasTrivialABI : std::integral_constant<bool,
- std::is_trivially_destructible<T>::value
- && (!std::is_copy_constructible<T>::value || std::is_trivially_copy_constructible<T>::value)
-> {};
+struct HasTrivialABI
+ : std::integral_constant<
+ bool,
+ std::is_trivially_destructible<T>::value &&
+ (!std::is_copy_constructible<T>::value || std::is_trivially_copy_constructible<T>::value) > {};
struct TrivialNoAssignment {
int arr[4];
@@ -56,10 +57,10 @@ void test_trivial()
static_assert(std::is_trivially_destructible<P>::value, "");
}
{
- using P = std::pair<TrivialNoConstruction, int>;
- static_assert(!std::is_trivially_copy_assignable<P>::value, "");
- static_assert(!std::is_trivially_move_assignable<P>::value, "");
- static_assert(std::is_trivially_destructible<P>::value, "");
+ using P = std::pair<TrivialNoConstruction, int>;
+ static_assert(!std::is_trivially_copy_assignable<P>::value, "");
+ static_assert(!std::is_trivially_move_assignable<P>::value, "");
+ static_assert(std::is_trivially_destructible<P>::value, "");
}
}
``````````
</details>
https://github.com/llvm/llvm-project/pull/169354
More information about the libcxx-commits
mailing list