From 9bb9a3e284e033a30c2ef1b73d39d6efc92fd7f0 Mon Sep 17 00:00:00 2001
From: Luc Grosheintz <luc.grosheintz@gmail.com>
Date: Mon, 21 Jul 2025 15:35:29 +0200
Subject: [PATCH] libstdc++: Remove redundant parens in mdspan testsuite.

A recent commit improved the macro VERIFY to eliminate the need for
certain parens. This commit updates the test code in

  23_containers/mdspan

libstdc++-v3/ChangeLog:

	* testsuite/23_containers/mdspan/extents/ctor_ints.cc: Remove
	superfluous parens.
	* testsuite/23_containers/mdspan/extents/ctor_shape.cc: Ditto.
	* testsuite/23_containers/mdspan/mdspan.cc: Ditto.

Signed-off-by: Luc Grosheintz <luc.grosheintz@gmail.com>
---
 .../23_containers/mdspan/extents/ctor_ints.cc | 20 ++++++++--------
 .../mdspan/extents/ctor_shape.cc              | 10 ++++----
 .../testsuite/23_containers/mdspan/mdspan.cc  | 24 +++++++++----------
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/libstdc++-v3/testsuite/23_containers/mdspan/extents/ctor_ints.cc b/libstdc++-v3/testsuite/23_containers/mdspan/extents/ctor_ints.cc
index 3a70efd85d0..d5f07c106aa 100644
--- a/libstdc++-v3/testsuite/23_containers/mdspan/extents/ctor_ints.cc
+++ b/libstdc++-v3/testsuite/23_containers/mdspan/extents/ctor_ints.cc
@@ -35,20 +35,20 @@ test_all()
   auto expected = std::extents<int, 1, 2, 3>(1, 2, 3);
 
   // From all extents.
-  VERIFY((std::extents<int, 1, 2, 3>(1, 2, 3)) == expected);
-  VERIFY((std::extents<int, dyn, 2, 3>(1, 2, 3)) == expected);
-  VERIFY((std::extents<int, dyn, 2, dyn>(1, 2, 3)) == expected);
+  VERIFY(std::extents<int, 1, 2, 3>(1, 2, 3) == expected);
+  VERIFY(std::extents<int, dyn, 2, 3>(1, 2, 3) == expected);
+  VERIFY(std::extents<int, dyn, 2, dyn>(1, 2, 3) == expected);
 
-  VERIFY((std::extents<int, 1, 2, 3>{1, 2, 3}) == expected);
-  VERIFY((std::extents<int, dyn, 2, 3>{1, 2, 3}) == expected);
-  VERIFY((std::extents<int, dyn, 2, dyn>{1, 2, 3}) == expected);
+  VERIFY(std::extents<int, 1, 2, 3>{1, 2, 3} == expected);
+  VERIFY(std::extents<int, dyn, 2, 3>{1, 2, 3} == expected);
+  VERIFY(std::extents<int, dyn, 2, dyn>{1, 2, 3} == expected);
 
   // From only dynamic extents.
-  VERIFY((std::extents<int, dyn, 2, 3>(1)) == expected);
-  VERIFY((std::extents<int, dyn, 2, dyn>(1, 3)) == expected);
+  VERIFY(std::extents<int, dyn, 2, 3>(1) == expected);
+  VERIFY(std::extents<int, dyn, 2, dyn>(1, 3) == expected);
 
-  VERIFY((std::extents<int, dyn, 2, 3>{1}) == expected);
-  VERIFY((std::extents<int, dyn, 2, dyn>{1, 3}) == expected);
+  VERIFY(std::extents<int, dyn, 2, 3>{1} == expected);
+  VERIFY(std::extents<int, dyn, 2, dyn>{1, 3} == expected);
 
   return true;
 }
diff --git a/libstdc++-v3/testsuite/23_containers/mdspan/extents/ctor_shape.cc b/libstdc++-v3/testsuite/23_containers/mdspan/extents/ctor_shape.cc
index 01624f27482..1682cc5a0ab 100644
--- a/libstdc++-v3/testsuite/23_containers/mdspan/extents/ctor_shape.cc
+++ b/libstdc++-v3/testsuite/23_containers/mdspan/extents/ctor_shape.cc
@@ -66,9 +66,9 @@ namespace all_extents
     test_ctor(Shape shape)
     {
       auto expected = std::extents<int, 1, 2, 3>();
-      VERIFY((std::extents<int, 1, dyn, 3>(shape)) == expected);
-      VERIFY((std::extents<int, dyn, dyn, dyn>(shape)) == expected);
-      VERIFY((std::extents<int, 1, 2, 3>(shape)) == expected);
+      VERIFY(std::extents<int, 1, dyn, 3>(shape) == expected);
+      VERIFY(std::extents<int, dyn, dyn, dyn>(shape) == expected);
+      VERIFY(std::extents<int, 1, 2, 3>(shape) == expected);
     }
 
   constexpr void
@@ -90,8 +90,8 @@ namespace all_extents
     auto span = std::span<int, 0>(shape);
 
     auto expected = std::extents<int>();
-    VERIFY((std::extents<int>(shape)) == expected);
-    VERIFY((std::extents<int>(span)) == expected);
+    VERIFY(std::extents<int>(shape) == expected);
+    VERIFY(std::extents<int>(span) == expected);
   }
 
   constexpr bool
diff --git a/libstdc++-v3/testsuite/23_containers/mdspan/mdspan.cc b/libstdc++-v3/testsuite/23_containers/mdspan/mdspan.cc
index 6ffddd11e95..bdfc6ebcf56 100644
--- a/libstdc++-v3/testsuite/23_containers/mdspan/mdspan.cc
+++ b/libstdc++-v3/testsuite/23_containers/mdspan/mdspan.cc
@@ -240,9 +240,9 @@ test_from_pointer_and_shape()
     assert_deduced_typedefs<double, std::dextents<size_t, 2>>(md);
     VERIFY(md.rank() == 2);
     VERIFY(md.rank_dynamic() == 2);
-    VERIFY((md[0, 0]) == data[0]);
-    VERIFY((md[0, 1]) == data[1]);
-    VERIFY((md[1, 0]) == data[3]);
+    VERIFY(md[0, 0] == data[0]);
+    VERIFY(md[0, 1] == data[1]);
+    VERIFY(md[1, 0] == data[3]);
   };
 
   verify(std::mdspan(data.data(), shape[0], shape[1]));
@@ -462,10 +462,10 @@ test_from_opaque_accessor()
   using MDSpan = decltype(md);
   static_assert(std::same_as<MDSpan::accessor_type, decltype(a)>);
 
-  VERIFY((md[0, 0, 0]) == 0.0);
+  VERIFY(md[0, 0, 0] == 0.0);
   VERIFY(md.accessor().access_count == 1);
 
-  VERIFY((md[2, 4, 6]) == 0.0);
+  VERIFY(md[2, 4, 6] == 0.0);
   VERIFY(md.accessor().access_count == 2);
 }
 
@@ -514,8 +514,8 @@ test_from_base_class_accessor()
   using MDSpan = decltype(md);
   static_assert(std::same_as<MDSpan::accessor_type, decltype(a)>);
   static_assert(std::same_as<decltype(md[0, 0, 0]), Base&>);
-  VERIFY((md[0, 0, 0].value) == 1.0);
-  VERIFY((md[2, 4, 6].value) == 1.0);
+  VERIFY(md[0, 0, 0].value == 1.0);
+  VERIFY(md[2, 4, 6].value == 1.0);
 }
 
 constexpr bool
@@ -524,8 +524,8 @@ test_from_mapping_like()
   double data = 1.1;
   auto m = LayoutLike::mapping<std::extents<int, 1, 2, 3>>{};
   auto md = std::mdspan(&data, m);
-  VERIFY((md[0, 0, 0]) == data);
-  VERIFY((md[0, 1, 2]) == data);
+  VERIFY(md[0, 0, 0] == data);
+  VERIFY(md[0, 1, 2] == data);
   return true;
 }
 
@@ -569,13 +569,13 @@ template<typename Int, bool ValidForPacks, bool ValidForArrays>
 	  {
 	    storage[mapping(i, j, k)] = 1.0;
 	    if constexpr (ValidForPacks)
-	      VERIFY((md[Int(i), Int(j), Int(k)]) == 1.0);
+	      VERIFY(md[Int(i), Int(j), Int(k)] == 1.0);
 
 	    if constexpr (ValidForArrays)
 	      {
 		std::array<Int, 3> ijk{Int(i), Int(j), Int(k)};
-		VERIFY((md[ijk]) == 1.0);
-		VERIFY((md[std::span(ijk)]) == 1.0);
+		VERIFY(md[ijk] == 1.0);
+		VERIFY(md[std::span(ijk)] == 1.0);
 	      }
 	    storage[mapping(i, j, k)] = 0.0;
 	  }
-- 
2.47.2