Fix tests

Author: H-G-Hristov

libcxx/test/std/strings/basic.string/string.ops/string_substr/nodiscard.verify.cpp

@@ -6,28 +6,17 @@
 //
 //===----------------------------------------------------------------------===//
 
-// #include <allocator>
-#include <string>
+// REQUIRES: std-at-least-c++26
 
-#include "constexpr_char_traits.h"
-#include "test_macros.h"
-#include "type_algorithms.h"
+// <string>
 
-template <typename CharT, typename TraitsT, typename AllocT>
-constexpr void test() {
-#if TEST_STD_VER >= 26
-  std::basic_string<CharT, TraitsT, AllocT> s;
+//    constexpr basic_string_view<charT, traits> subview(size_type pos = 0,
+//                                                       size_type n = npos) const;
 
-  s.subview(); // expected-warning {{ignoring return value of function}}
-#endif
-}
+#include <string>
 
-class Test {
-public:
-  template <typename CharT>
-  constexpr void operator()() const {
-    test<CharT, std::char_traits<CharT>, std::allocator<CharT>>();
-  }
-};
+void test() {
+  std::string s;
 
-void test() { types::for_each(types::character_types(), Test{}); }
+  s.subview(); // expected-warning {{ignoring return value of function}}
+}

libcxx/test/std/strings/basic.string/string.ops/string_substr/subview.pass.cpp

@@ -10,7 +10,8 @@
 
 // <string>
 
-// constexpr basic_string_view<_CharT, _Traits> subview(size_type __pos = 0, size_type __n = npos) const;
+//    constexpr basic_string_view<charT, traits> subview(size_type pos = 0,
+//                                                       size_type n = npos) const;
 
 #include <cassert>
 #include <concepts>
@@ -61,7 +62,7 @@ constexpr void test() {
   if (!std::is_constant_evaluated()) {
     { // With a position that is out of range.
       try {
-        s.subview(s.size() + 1);
+        std::ignore = s.subview(s.size() + 1);
         assert(false);
       } catch ([[maybe_unused]] const std::out_of_range& ex) {
         LIBCPP_ASSERT(std::string(ex.what()) == "string_view::substr");
@@ -72,7 +73,7 @@ constexpr void test() {
 
     { // With a position that is out of range and a 0 character length.
       try {
-        s.subview(s.size() + 1, 0);
+        std::ignore = s.subview(s.size() + 1, 0);
         assert(false);
       } catch ([[maybe_unused]] const std::out_of_range& ex) {
         LIBCPP_ASSERT(std::string(ex.what()) == "string_view::substr");
@@ -83,7 +84,7 @@ constexpr void test() {
 
     { // With a position that is out of range and a some character length.
       try {
-        s.subview(s.size() + 1, 1);
+        std::ignore = s.subview(s.size() + 1, 1);
         assert(false);
       } catch ([[maybe_unused]] const std::out_of_range& ex) {
         LIBCPP_ASSERT(std::string(ex.what()) == "string_view::substr");

libcxx/test/std/strings/string.view/string.view.ops/nodiscard.verify.cpp

@@ -6,27 +6,17 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <string_view>
+// REQUIRES: std-at-least-c++26
 
-#include "constexpr_char_traits.h"
-#include "test_macros.h"
-#include "type_algorithms.h"
+// <string>
 
-template <typename CharT, typename TraitsT, typename AllocT>
-constexpr void test() {
-#if TEST_STD_VER >= 26
-  std::basic_string_view<CharT, TraitsT> sv;
+// constexpr basic_string_view subview(size_type pos = 0,
+//                                     size_type n = npos) const;      // freestanding-deleted
 
-  sv.subview(); // expected-warning {{ignoring return value of function}}
-#endif
-}
+#include <string>
 
-class Test {
-public:
-  template <typename CharT>
-  constexpr void operator()() const {
-    test<CharT, std::char_traits<CharT>>();
-  }
-};
+void test() {
+  std::string_view sv;
 
-void test() { types::for_each(types::character_types(), Test{}); }
+  sv.subview(); // expected-warning {{ignoring return value of function}}
+}

libcxx/test/std/strings/string.view/string.view.ops/subview.pass.cpp

@@ -59,7 +59,7 @@ constexpr void test() {
   if (!std::is_constant_evaluated()) {
     { // With a position that is out of range.
       try {
-        sv.subview(sv.size() + 1);
+        std::ignore = sv.subview(sv.size() + 1);
         assert(false);
       } catch ([[maybe_unused]] const std::out_of_range& ex) {
         LIBCPP_ASSERT(std::string(ex.what()) == "string_view::substr");
@@ -70,7 +70,7 @@ constexpr void test() {
 
     { // With a position that is out of range and a 0 character length.
       try {
-        sv.subview(sv.size() + 1, 0);
+        std::ignore = sv.subview(sv.size() + 1, 0);
         assert(false);
       } catch ([[maybe_unused]] const std::out_of_range& ex) {
         LIBCPP_ASSERT(std::string(ex.what()) == "string_view::substr");
@@ -81,7 +81,7 @@ constexpr void test() {
 
     { // With a position that is out of range and a some character length.
       try {
-        sv.subview(sv.size() + 1, 1);
+        std::ignore = sv.subview(sv.size() + 1, 1);
         assert(false);
       } catch ([[maybe_unused]] const std::out_of_range& ex) {
         LIBCPP_ASSERT(std::string(ex.what()) == "string_view::substr");