[libc++] Rename __range_adaptor_closure_t (llvm#110886)

ldionne · web-flow · commit 8e049fa32711 · 2024-10-03T09:35:52.000-04:00
The name __range_adaptor_closure_t can easily be confused with __range_adaptor_closure, so something more distinct is preferable. Fixes llvm#67611
diff --git a/libcxx/include/__ranges/chunk_by_view.h b/libcxx/include/__ranges/chunk_by_view.h
@@ -215,7 +215,7 @@ struct __fn {
     requires constructible_from<decay_t<_Pred>, _Pred>
   [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Pred&& __pred) const
       noexcept(is_nothrow_constructible_v<decay_t<_Pred>, _Pred>) {
-    return __range_adaptor_closure_t(std::__bind_back(*this, std::forward<_Pred>(__pred)));
+    return __pipeable(std::__bind_back(*this, std::forward<_Pred>(__pred)));
   }
 };
 } // namespace __chunk_by
diff --git a/libcxx/include/__ranges/drop_view.h b/libcxx/include/__ranges/drop_view.h
@@ -307,7 +307,7 @@ struct __fn {
     requires constructible_from<decay_t<_Np>, _Np>
   [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Np&& __n) const
       noexcept(is_nothrow_constructible_v<decay_t<_Np>, _Np>) {
-    return __range_adaptor_closure_t(std::__bind_back(*this, std::forward<_Np>(__n)));
+    return __pipeable(std::__bind_back(*this, std::forward<_Np>(__n)));
   }
 };
 
diff --git a/libcxx/include/__ranges/drop_while_view.h b/libcxx/include/__ranges/drop_while_view.h
@@ -115,7 +115,7 @@ struct __fn {
     requires constructible_from<decay_t<_Pred>, _Pred>
   [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Pred&& __pred) const
       noexcept(is_nothrow_constructible_v<decay_t<_Pred>, _Pred>) {
-    return __range_adaptor_closure_t(std::__bind_back(*this, std::forward<_Pred>(__pred)));
+    return __pipeable(std::__bind_back(*this, std::forward<_Pred>(__pred)));
   }
 };
 
diff --git a/libcxx/include/__ranges/filter_view.h b/libcxx/include/__ranges/filter_view.h
@@ -239,7 +239,7 @@ struct __fn {
     requires constructible_from<decay_t<_Pred>, _Pred>
   [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Pred&& __pred) const
       noexcept(is_nothrow_constructible_v<decay_t<_Pred>, _Pred>) {
-    return __range_adaptor_closure_t(std::__bind_back(*this, std::forward<_Pred>(__pred)));
+    return __pipeable(std::__bind_back(*this, std::forward<_Pred>(__pred)));
   }
 };
 } // namespace __filter
diff --git a/libcxx/include/__ranges/lazy_split_view.h b/libcxx/include/__ranges/lazy_split_view.h
@@ -420,7 +420,7 @@ struct __fn {
     requires constructible_from<decay_t<_Pattern>, _Pattern>
   [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Pattern&& __pattern) const
       noexcept(is_nothrow_constructible_v<decay_t<_Pattern>, _Pattern>) {
-    return __range_adaptor_closure_t(std::__bind_back(*this, std::forward<_Pattern>(__pattern)));
+    return __pipeable(std::__bind_back(*this, std::forward<_Pattern>(__pattern)));
   }
 };
 } // namespace __lazy_split_view
diff --git a/libcxx/include/__ranges/range_adaptor.h b/libcxx/include/__ranges/range_adaptor.h
@@ -47,15 +47,15 @@ namespace ranges {
 // - `f1 | f2` is an adaptor closure `g` such that `g(x)` is equivalent to `f2(f1(x))`
 template <class _Tp>
   requires is_class_v<_Tp> && same_as<_Tp, remove_cv_t<_Tp>>
-struct __range_adaptor_closure;
+struct __range_adaptor_closure {};
 
 // Type that wraps an arbitrary function object and makes it into a range adaptor closure,
 // i.e. something that can be called via the `x | f` notation.
 template <class _Fn>
-struct __range_adaptor_closure_t : _Fn, __range_adaptor_closure<__range_adaptor_closure_t<_Fn>> {
-  _LIBCPP_HIDE_FROM_ABI constexpr explicit __range_adaptor_closure_t(_Fn&& __f) : _Fn(std::move(__f)) {}
+struct __pipeable : _Fn, __range_adaptor_closure<__pipeable<_Fn>> {
+  _LIBCPP_HIDE_FROM_ABI constexpr explicit __pipeable(_Fn&& __f) : _Fn(std::move(__f)) {}
 };
-_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(__range_adaptor_closure_t);
+_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(__pipeable);
 
 template <class _Tp>
 _Tp __derived_from_range_adaptor_closure(__range_adaptor_closure<_Tp>*);
@@ -79,13 +79,9 @@ template <_RangeAdaptorClosure _Closure, _RangeAdaptorClosure _OtherClosure>
 [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator|(_Closure&& __c1, _OtherClosure&& __c2) noexcept(
     is_nothrow_constructible_v<decay_t<_Closure>, _Closure> &&
     is_nothrow_constructible_v<decay_t<_OtherClosure>, _OtherClosure>) {
-  return __range_adaptor_closure_t(std::__compose(std::forward<_OtherClosure>(__c2), std::forward<_Closure>(__c1)));
+  return __pipeable(std::__compose(std::forward<_OtherClosure>(__c2), std::forward<_Closure>(__c1)));
 }
 
-template <class _Tp>
-  requires is_class_v<_Tp> && same_as<_Tp, remove_cv_t<_Tp>>
-struct __range_adaptor_closure {};
-
 #  if _LIBCPP_STD_VER >= 23
 template <class _Tp>
   requires is_class_v<_Tp> && same_as<_Tp, remove_cv_t<_Tp>>
diff --git a/libcxx/include/__ranges/split_view.h b/libcxx/include/__ranges/split_view.h
@@ -211,7 +211,7 @@ struct __fn {
     requires constructible_from<decay_t<_Pattern>, _Pattern>
   [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Pattern&& __pattern) const
       noexcept(is_nothrow_constructible_v<decay_t<_Pattern>, _Pattern>) {
-    return __range_adaptor_closure_t(std::__bind_back(*this, std::forward<_Pattern>(__pattern)));
+    return __pipeable(std::__bind_back(*this, std::forward<_Pattern>(__pattern)));
   }
 };
 } // namespace __split_view
diff --git a/libcxx/include/__ranges/take_view.h b/libcxx/include/__ranges/take_view.h
@@ -347,7 +347,7 @@ struct __fn {
     requires constructible_from<decay_t<_Np>, _Np>
   [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Np&& __n) const
       noexcept(is_nothrow_constructible_v<decay_t<_Np>, _Np>) {
-    return __range_adaptor_closure_t(std::__bind_back(*this, std::forward<_Np>(__n)));
+    return __pipeable(std::__bind_back(*this, std::forward<_Np>(__n)));
   }
 };
 
diff --git a/libcxx/include/__ranges/take_while_view.h b/libcxx/include/__ranges/take_while_view.h
@@ -149,7 +149,7 @@ struct __fn {
     requires constructible_from<decay_t<_Pred>, _Pred>
   [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Pred&& __pred) const
       noexcept(is_nothrow_constructible_v<decay_t<_Pred>, _Pred>) {
-    return __range_adaptor_closure_t(std::__bind_back(*this, std::forward<_Pred>(__pred)));
+    return __pipeable(std::__bind_back(*this, std::forward<_Pred>(__pred)));
   }
 };
 
diff --git a/libcxx/include/__ranges/to.h b/libcxx/include/__ranges/to.h
@@ -214,7 +214,7 @@ template <class _Container, class... _Args>
     }
   { return ranges::to<_Container>(std::forward<_Range>(__range), std::forward<_Tail>(__tail)...); };
 
-  return __range_adaptor_closure_t(std::__bind_back(__to_func, std::forward<_Args>(__args)...));
+  return __pipeable(std::__bind_back(__to_func, std::forward<_Args>(__args)...));
 }
 
 // Range adaptor closure object 2 -- wrapping the `ranges::to` version where `_Container` is a template template
@@ -233,7 +233,7 @@ template <template <class...> class _Container, class... _Args>
   };
   // clang-format on
 
-  return __range_adaptor_closure_t(std::__bind_back(__to_func, std::forward<_Args>(__args)...));
+  return __pipeable(std::__bind_back(__to_func, std::forward<_Args>(__args)...));
 }
 
 } // namespace ranges
diff --git a/libcxx/include/__ranges/transform_view.h b/libcxx/include/__ranges/transform_view.h
@@ -398,7 +398,7 @@ struct __fn {
     requires constructible_from<decay_t<_Fn>, _Fn>
   [[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Fn&& __f) const
       noexcept(is_nothrow_constructible_v<decay_t<_Fn>, _Fn>) {
-    return __range_adaptor_closure_t(std::__bind_back(*this, std::forward<_Fn>(__f)));
+    return __pipeable(std::__bind_back(*this, std::forward<_Fn>(__f)));
   }
 };
 } // namespace __transform

Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ struct __fn {`
`215`	`215`	`requires constructible_from<decay_t<_Pred>, _Pred>`
`216`	`216`	`[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Pred&& __pred) const`
`217`	`217`	`noexcept(is_nothrow_constructible_v<decay_t<_Pred>, _Pred>) {`
`218`		`- return __range_adaptor_closure_t(std::__bind_back(*this, std::forward<_Pred>(__pred)));`
	`218`	`+ return __pipeable(std::__bind_back(*this, std::forward<_Pred>(__pred)));`
`219`	`219`	`}`
`220`	`220`	`};`
`221`	`221`	`} // namespace __chunk_by`
Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ struct __fn {`
`307`	`307`	`requires constructible_from<decay_t<_Np>, _Np>`
`308`	`308`	`[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Np&& __n) const`
`309`	`309`	`noexcept(is_nothrow_constructible_v<decay_t<_Np>, _Np>) {`
`310`		`- return __range_adaptor_closure_t(std::__bind_back(*this, std::forward<_Np>(__n)));`
	`310`	`+ return __pipeable(std::__bind_back(*this, std::forward<_Np>(__n)));`
`311`	`311`	`}`
`312`	`312`	`};`
`313`	`313`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ struct __fn {`
`115`	`115`	`requires constructible_from<decay_t<_Pred>, _Pred>`
`116`	`116`	`[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Pred&& __pred) const`
`117`	`117`	`noexcept(is_nothrow_constructible_v<decay_t<_Pred>, _Pred>) {`
`118`		`- return __range_adaptor_closure_t(std::__bind_back(*this, std::forward<_Pred>(__pred)));`
	`118`	`+ return __pipeable(std::__bind_back(*this, std::forward<_Pred>(__pred)));`
`119`	`119`	`}`
`120`	`120`	`};`
`121`	`121`
Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,7 @@ struct __fn {`
`239`	`239`	`requires constructible_from<decay_t<_Pred>, _Pred>`
`240`	`240`	`[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Pred&& __pred) const`
`241`	`241`	`noexcept(is_nothrow_constructible_v<decay_t<_Pred>, _Pred>) {`
`242`		`- return __range_adaptor_closure_t(std::__bind_back(*this, std::forward<_Pred>(__pred)));`
	`242`	`+ return __pipeable(std::__bind_back(*this, std::forward<_Pred>(__pred)));`
`243`	`243`	`}`
`244`	`244`	`};`
`245`	`245`	`} // namespace __filter`
Original file line number	Diff line number	Diff line change
`@@ -420,7 +420,7 @@ struct __fn {`
`420`	`420`	`requires constructible_from<decay_t<_Pattern>, _Pattern>`
`421`	`421`	`[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Pattern&& __pattern) const`
`422`	`422`	`noexcept(is_nothrow_constructible_v<decay_t<_Pattern>, _Pattern>) {`
`423`		`- return __range_adaptor_closure_t(std::__bind_back(*this, std::forward<_Pattern>(__pattern)));`
	`423`	`+ return __pipeable(std::__bind_back(*this, std::forward<_Pattern>(__pattern)));`
`424`	`424`	`}`
`425`	`425`	`};`
`426`	`426`	`} // namespace __lazy_split_view`
Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ struct __fn {`
`211`	`211`	`requires constructible_from<decay_t<_Pattern>, _Pattern>`
`212`	`212`	`[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Pattern&& __pattern) const`
`213`	`213`	`noexcept(is_nothrow_constructible_v<decay_t<_Pattern>, _Pattern>) {`
`214`		`- return __range_adaptor_closure_t(std::__bind_back(*this, std::forward<_Pattern>(__pattern)));`
	`214`	`+ return __pipeable(std::__bind_back(*this, std::forward<_Pattern>(__pattern)));`
`215`	`215`	`}`
`216`	`216`	`};`
`217`	`217`	`} // namespace __split_view`
Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,7 @@ struct __fn {`
`347`	`347`	`requires constructible_from<decay_t<_Np>, _Np>`
`348`	`348`	`[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Np&& __n) const`
`349`	`349`	`noexcept(is_nothrow_constructible_v<decay_t<_Np>, _Np>) {`
`350`		`- return __range_adaptor_closure_t(std::__bind_back(*this, std::forward<_Np>(__n)));`
	`350`	`+ return __pipeable(std::__bind_back(*this, std::forward<_Np>(__n)));`
`351`	`351`	`}`
`352`	`352`	`};`
`353`	`353`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ struct __fn {`
`149`	`149`	`requires constructible_from<decay_t<_Pred>, _Pred>`
`150`	`150`	`[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Pred&& __pred) const`
`151`	`151`	`noexcept(is_nothrow_constructible_v<decay_t<_Pred>, _Pred>) {`
`152`		`- return __range_adaptor_closure_t(std::__bind_back(*this, std::forward<_Pred>(__pred)));`
	`152`	`+ return __pipeable(std::__bind_back(*this, std::forward<_Pred>(__pred)));`
`153`	`153`	`}`
`154`	`154`	`};`
`155`	`155`
Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ template <class _Container, class... _Args>`
`214`	`214`	`}`
`215`	`215`	`{ return ranges::to<_Container>(std::forward<_Range>(__range), std::forward<_Tail>(__tail)...); };`
`216`	`216`
`217`		`- return __range_adaptor_closure_t(std::__bind_back(__to_func, std::forward<_Args>(__args)...));`
	`217`	`+ return __pipeable(std::__bind_back(__to_func, std::forward<_Args>(__args)...));`
`218`	`218`	`}`
`219`	`219`
`220`	`220`	// Range adaptor closure object 2 -- wrapping the `ranges::to` version where `_Container` is a template template
`@@ -233,7 +233,7 @@ template <template <class...> class _Container, class... _Args>`
`233`	`233`	`};`
`234`	`234`	`// clang-format on`
`235`	`235`
`236`		`- return __range_adaptor_closure_t(std::__bind_back(__to_func, std::forward<_Args>(__args)...));`
	`236`	`+ return __pipeable(std::__bind_back(__to_func, std::forward<_Args>(__args)...));`
`237`	`237`	`}`
`238`	`238`
`239`	`239`	`} // namespace ranges`
Original file line number	Diff line number	Diff line change
`@@ -398,7 +398,7 @@ struct __fn {`
`398`	`398`	`requires constructible_from<decay_t<_Fn>, _Fn>`
`399`	`399`	`[[nodiscard]] _LIBCPP_HIDE_FROM_ABI constexpr auto operator()(_Fn&& __f) const`
`400`	`400`	`noexcept(is_nothrow_constructible_v<decay_t<_Fn>, _Fn>) {`
`401`		`- return __range_adaptor_closure_t(std::__bind_back(*this, std::forward<_Fn>(__f)));`
	`401`	`+ return __pipeable(std::__bind_back(*this, std::forward<_Fn>(__f)));`
`402`	`402`	`}`
`403`	`403`	`};`
`404`	`404`	`} // namespace __transform`