review

Author: huixie90

libcxx/docs/ReleaseNotes/21.rst

@@ -53,7 +53,6 @@ Implemented Papers
 - P2711R1: Making multi-param constructors of ``views`` ``explicit`` (`Github <https://github.com/llvm/llvm-project/issues/105252>`__)
 - P2770R0: Stashing stashing ``iterators`` for proper flattening (`Github <https://github.com/llvm/llvm-project/issues/105250>`__)
 - P2655R3: ``common_reference_t`` of ``reference_wrapper`` Should Be a Reference Type (`Github <https://github.com/llvm/llvm-project/issues/105260>`__)
-- P2321R2: ``zip`` (`Github <https://github.com/llvm/llvm-project/issues/105169>`__) (The paper is partially implemented. ``zip_transform_view`` is implemented in this release)
 
 Improvements and New Features
 -----------------------------

libcxx/docs/ReleaseNotes/22.rst

@@ -38,6 +38,7 @@ What's New in Libc++ 22.0.0?
 Implemented Papers
 ------------------
 
+- P2321R2: ``zip`` (`Github <https://github.com/llvm/llvm-project/issues/105169>`__) (The paper is partially implemented. ``zip_transform_view`` is implemented in this release)
 
 Improvements and New Features
 -----------------------------

libcxx/test/std/library/description/conventions/customization.point.object/cpo.compile.pass.cpp

@@ -26,7 +26,7 @@ constexpr bool test(CPO& o, Args&&...) {
   static_assert(std::is_trivially_copyable_v<CPO>);
   static_assert(std::is_trivially_default_constructible_v<CPO>);
 
-  auto p = o;
+  auto p  = o;
   using T = decltype(p);
 
   // The type of a customization point object, ignoring cv-qualifiers, shall model semiregular.
@@ -89,11 +89,12 @@ static_assert(test(std::views::counted, a, 10));
 static_assert(test(std::views::drop, a, 10));
 //static_assert(test(std::views::drop_while, a, [](int x){ return x < 10; }));
 //static_assert(test(std::views::elements<0>, pairs));
-static_assert(test(std::views::filter, a, [](int x){ return x < 10; }));
+static_assert(test(std::views::filter, a, [](int x) { return x < 10; }));
 static_assert(test(std::views::join, arrays));
 //static_assert(test(std::views::split, a, 4));
 static_assert(test(std::views::lazy_split, a, 4));
 static_assert(test(std::views::reverse, a));
 static_assert(test(std::views::take, a, 10));
 //static_assert(test(std::views::take_while, a, [](int x){ return x < 10; }));
-static_assert(test(std::views::transform, a, [](int x){ return x + 1; }));
+static_assert(test(std::views::transform, a, [](int x) { return x + 1; }));
+static_assert(test(std::views::zip_transform, [](int x, int y) { return x + y; }, a, a));

libcxx/test/std/ranges/range.adaptors/range.zip.transform/types.h

@@ -15,7 +15,7 @@
 #include "test_macros.h"
 #include "test_iterators.h"
 #include "test_range.h"
-#include "../types.h"
+#include "../range_adaptor_types.h"
 
 #if TEST_STD_VER <= 20
 #  error "range.zip.transform/types.h" can only be included in builds supporting C++20

libcxx/test/std/ranges/range.adaptors/range.zip/begin.pass.cpp

@@ -18,7 +18,7 @@
 #include <tuple>
 #include <utility>
 
-#include "../types.h"
+#include "../range_adaptor_types.h"
 
 template <class T>
 concept HasConstBegin = requires(const T& ct) { ct.begin(); };

libcxx/test/std/ranges/range.adaptors/range.zip/cpo.pass.cpp

@@ -18,7 +18,7 @@
 #include <type_traits>
 #include <utility>
 
-#include "../types.h"
+#include "../range_adaptor_types.h"
 
 static_assert(std::is_invocable_v<decltype((std::views::zip))>);
 static_assert(!std::is_invocable_v<decltype((std::views::zip)), int>);

libcxx/test/std/ranges/range.adaptors/range.zip/ctor.views.pass.cpp

@@ -13,7 +13,7 @@
 #include <ranges>
 #include <tuple>
 
-#include "../types.h"
+#include "../range_adaptor_types.h"
 
 template <class T>
 void conversion_test(T);

libcxx/test/std/ranges/range.adaptors/range.zip/end.pass.cpp

@@ -14,7 +14,7 @@
 #include <ranges>
 #include <tuple>
 
-#include "../types.h"
+#include "../range_adaptor_types.h"
 
 // ID | simple | common | bidi | random | sized | #views |     v.end()    | as_const(v)
 //    |        |        |      | access |       |        |                |   .end()

libcxx/test/std/ranges/range.adaptors/range.zip/iterator/arithmetic.pass.cpp

@@ -25,7 +25,7 @@
 #include <concepts>
 #include <functional>
 
-#include "../../types.h"
+#include "../../range_adaptor_types.h"
 
 template <class T, class U>
 concept canPlusEqual = requires(T& t, U& u) { t += u; };

libcxx/test/std/ranges/range.adaptors/range.zip/iterator/compare.pass.cpp

@@ -19,7 +19,7 @@
 #include "test_iterators.h"
 #include "test_range.h"
 
-#include "../../types.h"
+#include "../../range_adaptor_types.h"
 
 // This is for testing that zip iterator never calls underlying iterator's >, >=, <=, !=.
 // The spec indicates that zip iterator's >= is negating zip iterator's < instead of calling underlying iterator's >=.