update exposition only concepts for concat-is-random-access and concat-is-bidirectional

Author: changkhothuychung

libcxx/include/__ranges/concat_view.h

@@ -447,31 +447,31 @@ class concat_view<_Views...>::__iterator : public __concat_view_iterator_categor
   }
 
   _LIBCPP_HIDE_FROM_ABI friend constexpr bool operator<(const __iterator& __x, const __iterator& __y)
-    requires(random_access_range<__maybe_const<_Const, _Views>> && ...)
+    requires(__all_random_access<_Const, _Views> && ...)
   {
     _LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(!__x.__it_.valueless_by_exception() && !__y.__it_.valueless_by_exception(),
                                         "Trying to compare a valueless iterator of concat_view.");
     return __x.__it_ < __y.__it_;
   }
 
   _LIBCPP_HIDE_FROM_ABI friend constexpr bool operator>(const __iterator& __x, const __iterator& __y)
-    requires(random_access_range<__maybe_const<_Const, _Views>> && ...)
+    requires(__all_random_access<_Const, _Views> && ...)
   {
     _LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(!__x.__it_.valueless_by_exception() && !__y.__it_.valueless_by_exception(),
                                         "Trying to compare a valueless iterator of concat_view.");
     return __x.__it_ > __y.__it_;
   }
 
   _LIBCPP_HIDE_FROM_ABI friend constexpr bool operator<=(const __iterator& __x, const __iterator& __y)
-    requires(random_access_range<__maybe_const<_Const, _Views>> && ...)
+    requires(__all_random_access<_Const, _Views> && ...)
   {
     _LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(!__x.__it_.valueless_by_exception() && !__y.__it_.valueless_by_exception(),
                                         "Trying to compare a valueless iterator of concat_view.");
     return __x.__it_ <= __y.__it_;
   }
 
   _LIBCPP_HIDE_FROM_ABI friend constexpr bool operator>=(const __iterator& __x, const __iterator& __y)
-    requires(random_access_range<__maybe_const<_Const, _Views>> && ...)
+    requires(__all_random_access<_Const, _Views> && ...)
   {
     _LIBCPP_ASSERT_VALID_ELEMENT_ACCESS(!__x.__it_.valueless_by_exception() && !__y.__it_.valueless_by_exception(),
                                         "Trying to compare a valueless iterator of concat_view.");

libcxx/include/__ranges/concepts.h

@@ -165,14 +165,6 @@ concept __concat_indirectly_readable =
                                        iterator_t<_Rs>> &&
      ...);
 
-template <bool _Const, class... _Rs>
-concept __concat_is_random_access =
-    (random_access_range<__maybe_const<_Const, _Rs>> && ...) && (sized_range<__maybe_const<_Const, _Rs>> && ...);
-
-template <bool _Const, class... _Rs>
-concept __concat_is_bidirectional =
-    ((bidirectional_range<__maybe_const<_Const, _Rs>> && ...) && (common_range<__maybe_const<_Const, _Rs>> && ...));
-
 template <class... _Rs>
 concept __concatable = requires {
   typename __concat_reference_t<_Rs...>;
@@ -189,6 +181,16 @@ concept __all_bidirectional = (bidirectional_range<__maybe_const<_Const, _Views>
 template <bool _Const, class... _Views>
 concept __all_forward = (forward_range<__maybe_const<_Const, _Views>> && ...);
 
+template <bool _Const, class... _First, class _Tail>
+concept __concat_is_random_access =
+    (__all_random_access<_Const, _First> && ... && __all_random_access<_Const, _Tail>) &&
+    (common_range<__maybe_const<_Const, _First>> && ...);
+
+template <bool _Const, class... _First, class _Tail>
+concept __concat_is_bidirectional =
+    (__all_bidirectional<_Const, _First> && ... && __all_random_access<_Const, _Tail>) &&
+    (common_range<__maybe_const<_Const, _First>> && ...);
+
 #  endif // _LIBCPP_STD_VER >= 23
 
 } // namespace ranges