Adressed some review comments

Author: H-G-Hristov

libcxx/include/__fwd/spanstream.h

@@ -16,10 +16,10 @@
 #  pragma GCC system_header
 #endif
 
-_LIBCPP_BEGIN_NAMESPACE_STD
-
 #if _LIBCPP_STD_VER >= 23
 
+_LIBCPP_BEGIN_NAMESPACE_STD
+
 template <class _CharT, class _Traits = char_traits<_CharT>>
 class basic_spanbuf;
 template <class _CharT, class _Traits = char_traits<_CharT>>
@@ -41,8 +41,20 @@ using wospanstream = basic_ospanstream<wchar_t>;
 using wspanstream  = basic_spanstream<wchar_t>;
 #  endif
 
-#endif // _LIBCPP_STD_VER >= 23
+template <class _CharT, class _Traits>
+class _LIBCPP_PREFERRED_NAME(spanbuf) _LIBCPP_IF_WIDE_CHARACTERS(_LIBCPP_PREFERRED_NAME(wspanbuf)) basic_spanbuf;
+template <class _CharT, class _Traits>
+class _LIBCPP_PREFERRED_NAME(ispanstream)
+    _LIBCPP_IF_WIDE_CHARACTERS(_LIBCPP_PREFERRED_NAME(wispanstream)) basic_ispanstream;
+template <class _CharT, class _Traits>
+class _LIBCPP_PREFERRED_NAME(ospanstream)
+    _LIBCPP_IF_WIDE_CHARACTERS(_LIBCPP_PREFERRED_NAME(wospanstream)) basic_ospanstream;
+template <class _CharT, class _Traits>
+class _LIBCPP_PREFERRED_NAME(spanstream)
+    _LIBCPP_IF_WIDE_CHARACTERS(_LIBCPP_PREFERRED_NAME(wspanstream)) basic_spanstream;
 
 _LIBCPP_END_NAMESPACE_STD
 
+#endif // _LIBCPP_STD_VER >= 23
+
 #endif // _LIBCPP___FWD_SPANSTREAM_H

libcxx/include/spanstream

@@ -71,7 +71,8 @@
 #    include <__utility/move.h>
 #    include <__utility/swap.h>
 #    include <ios>
-#    include <iostream>
+#    include <istream>
+#    include <ostream>
 #    include <span>
 #    include <streambuf>
 #    include <version>
@@ -83,10 +84,10 @@
 _LIBCPP_PUSH_MACROS
 #    include <__undef_macros>
 
-_LIBCPP_BEGIN_NAMESPACE_STD
-
 #    if _LIBCPP_STD_VER >= 23
 
+_LIBCPP_BEGIN_NAMESPACE_STD
+
 // Class template basic_spanbuf [spanbuf]
 
 template <class _CharT, class _Traits>
@@ -453,10 +454,10 @@ using std::spanstream;
 using std::wspanstream;
 #      endif
 
-#    endif // _LIBCPP_STD_VER >= 23
-
 _LIBCPP_END_NAMESPACE_STD
 
+#    endif // _LIBCPP_STD_VER >= 23
+
 _LIBCPP_POP_MACROS
 
 #  endif // _LIBCPP_HAS_LOCALIZATION

libcxx/test/std/input.output/iostream.forward/iosfwd.pass.cpp

@@ -75,23 +75,19 @@ int main(int, char**)
 #endif
 
 #if TEST_STD_VER >= 23
-    test<std::basic_spanbuf<unsigned short>*>();
     test<std::basic_spanbuf<char>*>();
 #  ifndef TEST_HAS_NO_WIDE_CHARACTERS
     test<std::basic_spanbuf<wchar_t>*>();
 #  endif
-    test<std::basic_ispanstream<unsigned short>*>();
     test<std::basic_ispanstream<char>*>();
 #  ifndef TEST_HAS_NO_WIDE_CHARACTERS
     test<std::basic_ispanstream<wchar_t>*>();
 #  endif
-    test<std::basic_ospanstream<unsigned short>*>();
     test<std::basic_ospanstream<char>*>();
 #  ifndef TEST_HAS_NO_WIDE_CHARACTERS
     test<std::basic_ospanstream<wchar_t>*>();
 #  endif
     test<std::basic_spanstream<char>*>();
-    test<std::basic_spanstream<unsigned short>*>();
 #  ifndef TEST_HAS_NO_WIDE_CHARACTERS
     test<std::basic_spanstream<wchar_t>*>();
 #  endif

libcxx/test/std/input.output/span.streams/helper_functions.h

@@ -16,6 +16,7 @@
 
 //   Test stream operations inherited from `basic_istream`
 
+#include <algorithm>
 #include <cassert>
 #include <span>
 #include <spanstream>
@@ -24,7 +25,6 @@
 #include "constexpr_char_traits.h"
 #include "test_macros.h"
 
-#include "../helper_functions.h"
 #include "../helper_macros.h"
 #include "../helper_types.h"
 
@@ -80,7 +80,7 @@ void test() {
   {
     // Create a std::span test value
     CharT arr[30UZ]{};
-    initialize_array_from_string_view(arr, sv);
+    std::ranges::copy(sv, arr);
 
     std::span<CharT> sp{arr};
 
@@ -99,7 +99,7 @@ void test() {
   {
     // Create a "Read Only Sequence" test value
     CharT arr[30UZ]{};
-    initialize_array_from_string_view(arr, sv);
+    std::ranges::copy(sv, arr);
 
     ReadOnlySpan<CharT, 30UZ> ros{arr};
     assert(ros.size() == 30UZ);

libcxx/test/std/input.output/span.streams/ispanstream/inherited.stream.ops.pass.cpp

@@ -16,6 +16,7 @@
 
 //   Test stream operations inherited from `basic_ostream`
 
+#include <algorithm>
 #include <cassert>
 #include <span>
 #include <spanstream>
@@ -25,7 +26,6 @@
 #include "constexpr_char_traits.h"
 #include "test_macros.h"
 
-#include "../helper_functions.h"
 #include "../helper_macros.h"
 #include "../helper_types.h"
 
@@ -45,7 +45,7 @@ void test() {
 
   // Create a std::span test value
   CharT arr[arrSize]{};
-  initialize_array_from_string_view(arr, sv);
+  std::ranges::copy(sv, arr);
   std::span<CharT> sp{arr};
 
   // `std::span` + Mode: default (`out`)

libcxx/test/std/input.output/span.streams/ospanstream/inherited.stream.ops.pass.cpp

@@ -28,11 +28,9 @@ template <typename CharT, typename TraitsT = std::char_traits<CharT>>
 void test() {
   using SpBuf = std::basic_spanbuf<CharT, TraitsT>;
 
-  {
-    SpBuf spBuf;
-    assert(spBuf.span().data() == nullptr);
-    assert(spBuf.span().size() == 0);
-  }
+  SpBuf spBuf;
+  assert(spBuf.span().data() == nullptr);
+  assert(spBuf.span().size() == 0);
 }
 
 int main(int, char**) {