Shorten test

Author: H-G-Hristov

libcxx/test/libcxx/diagnostics/array.nodiscard.verify.cpp

@@ -15,72 +15,57 @@
 
 #include <test_macros.h>
 
-template <std::size_t N>
+template <typename ArrT>
 void test_members() {
-  std::array<int, N> a;
-  const std::array<int, N> ca{};
+  ArrT a{};
 
-  a.begin();    // expected-warning 2 {{ignoring return value of function declared with 'nodiscard' attribute}}
-  ca.begin();   // expected-warning 2 {{ignoring return value of function declared with 'nodiscard' attribute}}
-  a.end();      // expected-warning 2 {{ignoring return value of function declared with 'nodiscard' attribute}}
-  ca.end();     // expected-warning 2 {{ignoring return value of function declared with 'nodiscard' attribute}}
-  a.rbegin();   // expected-warning 2 {{ignoring return value of function declared with 'nodiscard' attribute}}
-  ca.rbegin();  // expected-warning 2 {{ignoring return value of function declared with 'nodiscard' attribute}}
-  a.rend();     // expected-warning 2 {{ignoring return value of function declared with 'nodiscard' attribute}}
-  ca.rend();    // expected-warning 2 {{ignoring return value of function declared with 'nodiscard' attribute}}
-  a.cbegin();   // expected-warning 2 {{ignoring return value of function declared with 'nodiscard' attribute}}
-  ca.cbegin();  // expected-warning 2 {{ignoring return value of function declared with 'nodiscard' attribute}}
-  a.cend();     // expected-warning 2 {{ignoring return value of function declared with 'nodiscard' attribute}}
-  ca.cend();    // expected-warning 2 {{ignoring return value of function declared with 'nodiscard' attribute}}
-  a.crbegin();  // expected-warning 2 {{ignoring return value of function declared with 'nodiscard' attribute}}
-  ca.crbegin(); // expected-warning 2 {{ignoring return value of function declared with 'nodiscard' attribute}}
-  a.crend();    // expected-warning 2 {{ignoring return value of function declared with 'nodiscard' attribute}}
-  ca.crend();   // expected-warning 2 {{ignoring return value of function declared with 'nodiscard' attribute}}
+  a.begin();   // expected-warning 4 {{ignoring return value of function declared with 'nodiscard' attribute}}
+  a.end();     // expected-warning 4 {{ignoring return value of function declared with 'nodiscard' attribute}}
+  a.rbegin();  // expected-warning 4 {{ignoring return value of function declared with 'nodiscard' attribute}}
+  a.rend();    // expected-warning 4 {{ignoring return value of function declared with 'nodiscard' attribute}}
+  a.cbegin();  // expected-warning 4 {{ignoring return value of function declared with 'nodiscard' attribute}}
+  a.cend();    // expected-warning 4 {{ignoring return value of function declared with 'nodiscard' attribute}}
+  a.crbegin(); // expected-warning 4 {{ignoring return value of function declared with 'nodiscard' attribute}}
+  a.crend();   // expected-warning 4 {{ignoring return value of function declared with 'nodiscard' attribute}}
 
-  a.size();     // expected-warning 2 {{ignoring return value of function declared with 'nodiscard' attribute}}
-  a.max_size(); // expected-warning 2 {{ignoring return value of function declared with 'nodiscard' attribute}}
-  a.empty();    // expected-warning 2 {{ignoring return value of function declared with 'nodiscard' attribute}}
+  a.size();     // expected-warning 4 {{ignoring return value of function declared with 'nodiscard' attribute}}
+  a.max_size(); // expected-warning 4 {{ignoring return value of function declared with 'nodiscard' attribute}}
+  a.empty();    // expected-warning 4 {{ignoring return value of function declared with 'nodiscard' attribute}}
 
-  a[0];     // expected-warning 2 {{ignoring return value of function declared with 'nodiscard' attribute}}
-  ca[0];    // expected-warning 2 {{ignoring return value of function declared with 'nodiscard' attribute}}
-  a.at(0);  // expected-warning 2 {{ignoring return value of function declared with 'nodiscard' attribute}}
-  ca.at(0); // expected-warning 2 {{ignoring return value of function declared with 'nodiscard' attribute}}
+  a[0];    // expected-warning 4 {{ignoring return value of function declared with 'nodiscard' attribute}}
+  a.at(0); // expected-warning 4 {{ignoring return value of function declared with 'nodiscard' attribute}}
 
-  a.front();  // expected-warning 2 {{ignoring return value of function declared with 'nodiscard' attribute}}
-  ca.front(); // expected-warning 2 {{ignoring return value of function declared with 'nodiscard' attribute}}
-  a.back();   // expected-warning 2 {{ignoring return value of function declared with 'nodiscard' attribute}}
-  ca.back();  // expected-warning 2 {{ignoring return value of function declared with 'nodiscard' attribute}}
+  a.front(); // expected-warning 4 {{ignoring return value of function declared with 'nodiscard' attribute}}
+  a.back();  // expected-warning 4 {{ignoring return value of function declared with 'nodiscard' attribute}}
 
-  a.data();  // expected-warning 2 {{ignoring return value of function declared with 'nodiscard' attribute}}
-  ca.data(); // expected-warning 2 {{ignoring return value of function declared with 'nodiscard' attribute}}
+  a.data(); // expected-warning 4 {{ignoring return value of function declared with 'nodiscard' attribute}}
 }
 
-void test_nonmembers() {
-  {
-    std::array<int, 1> a;
-    const std::array<int, 1> ca{};
+template <typename ArrT>
+void test_get() {
+  ArrT a{};
 
-    // expected-warning@+1 {{ignoring return value of function declared with 'nodiscard' attribute}}
-    std::get<0>(a);
-    // expected-warning@+1 {{ignoring return value of function declared with 'nodiscard' attribute}}
-    std::get<0>(ca);
-    // expected-warning@+1 {{ignoring return value of function declared with 'nodiscard' attribute}}
-    std::get<0>(std::move(a));
-    // expected-warning@+1 {{ignoring return value of function declared with 'nodiscard' attribute}}
-    std::get<0>(std::move(ca));
-  }
+  // expected-warning@+1 2 {{ignoring return value of function declared with 'nodiscard' attribute}}
+  std::get<0>(a);
+  // expected-warning@+1 2 {{ignoring return value of function declared with 'nodiscard' attribute}}
+  std::get<0>(std::move(a));
+}
 
-  {
 #if TEST_STD_VER >= 20
-    // expected-warning@+1 {{ignoring return value of function declared with 'nodiscard' attribute}}
-    std::to_array("zmt");
-    // expected-warning@+1 {{ignoring return value of function declared with 'nodiscard' attribute}}
-    std::to_array({94, 82, 49});
-#endif
-  }
+void test_to_array() {
+  // expected-warning@+1 {{ignoring return value of function declared with 'nodiscard' attribute}}
+  std::to_array("zmt");
+  // expected-warning@+1 {{ignoring return value of function declared with 'nodiscard' attribute}}
+  std::to_array({94, 82, 49});
 }
+#endif
 
 void test() {
-  test_members<0>();
-  test_members<82>();
+  test_members<std::array<int, 82>>();
+  test_members<const std::array<int, 82>>();
+  test_members<std::array<int, 0>>();
+  test_members<const std::array<int, 0>>();
+
+  test_get<std::array<int, 82>>();
+  test_get<const std::array<int, 82>>();
 }