lint

Author: huixie90

libcxx/include/CMakeLists.txt

@@ -737,8 +737,8 @@ set(files
   __ranges/transform_view.h
   __ranges/view_interface.h
   __ranges/views.h
-  __ranges/zip_view.h
   __ranges/zip_transform_view.h
+  __ranges/zip_view.h
   __split_buffer
   __std_mbstate_t.h
   __stop_token/atomic_unique_lock.h

libcxx/include/__ranges/zip_transform_view.h

@@ -39,6 +39,7 @@
 #include <__utility/forward.h>
 #include <__utility/in_place.h>
 #include <__utility/move.h>
+#include <tuple> // for std::apply
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header

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

@@ -50,16 +50,16 @@ constexpr bool test() {
 
   {
     // underlying const R is not a range
-    using View = std::ranges::zip_transform_view<MakeTuple, SimpleCommon, NoConstBeginView>;
-    static_assert(HasBegin<View>);
-    static_assert(!HasConstBegin<View>);
+    using ZTV = std::ranges::zip_transform_view<MakeTuple, SimpleCommon, NoConstBeginView>;
+    static_assert(HasBegin<ZTV>);
+    static_assert(!HasConstBegin<ZTV>);
   }
 
   {
     // Fn cannot be invoked on const range
-    using View = std::ranges::zip_transform_view<NonConstOnlyFn, ConstNonConstDifferentView>;
-    static_assert(HasBegin<View>);
-    static_assert(!HasConstBegin<View>);
+    using ZTV = std::ranges::zip_transform_view<NonConstOnlyFn, ConstNonConstDifferentView>;
+    static_assert(HasBegin<ZTV>);
+    static_assert(!HasConstBegin<ZTV>);
   }
   return true;
 }

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

@@ -77,16 +77,16 @@ constexpr bool test() {
 
   {
     // underlying const R is not a range
-    using View = std::ranges::zip_transform_view<MakeTuple, SimpleCommon, NoConstBeginView>;
-    static_assert(HasEnd<View>);
-    static_assert(!HasConstEnd<View>);
+    using ZTV = std::ranges::zip_transform_view<MakeTuple, SimpleCommon, NoConstBeginView>;
+    static_assert(HasEnd<ZTV>);
+    static_assert(!HasConstEnd<ZTV>);
   }
 
   {
     // Fn cannot invoke on const range
-    using View = std::ranges::zip_transform_view<NonConstOnlyFn, ConstNonConstDifferentView>;
-    static_assert(HasEnd<View>);
-    static_assert(!HasConstEnd<View>);
+    using ZTV = std::ranges::zip_transform_view<NonConstOnlyFn, ConstNonConstDifferentView>;
+    static_assert(HasEnd<ZTV>);
+    static_assert(!HasConstEnd<ZTV>);
   }
   return true;
 }

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

@@ -102,10 +102,10 @@ constexpr bool test() {
     int buffer2[2] = {1, 2};
 
     std::ranges::zip_transform_view v{MakeTuple{}, InputCommonView(buffer1), InputCommonView(buffer2)};
-    using View = decltype(v);
-    static_assert(!std::ranges::forward_range<View>);
-    static_assert(std::ranges::input_range<View>);
-    static_assert(std::ranges::common_range<View>);
+    using ZTV = decltype(v);
+    static_assert(!std::ranges::forward_range<ZTV>);
+    static_assert(std::ranges::input_range<ZTV>);
+    static_assert(std::ranges::common_range<ZTV>);
 
     auto it1 = v.begin();
     auto it2 = v.end();