ci

Author: huixie90

libcxx/include/__ranges/adjacent_view.h

@@ -146,7 +146,7 @@ template <forward_range _View, size_t _Np>
 template <bool _Const>
 class adjacent_view<_View, _Np>::__iterator {
   friend adjacent_view;
-  using _Base                              = __maybe_const<_Const, _View>;
+  using _Base _LIBCPP_NODEBUG              = __maybe_const<_Const, _View>;
   array<iterator_t<_Base>, _Np> __current_ = array<iterator_t<_Base>, _Np>();
 
   _LIBCPP_HIDE_FROM_ABI constexpr __iterator(iterator_t<_Base> __first, sentinel_t<_Base> __last) {
@@ -246,10 +246,10 @@ class adjacent_view<_View, _Np>::__iterator {
     return *this;
   }
 
-  _LIBCPP_HIDE_FROM_ABI constexpr auto operator[](difference_type n) const
+  _LIBCPP_HIDE_FROM_ABI constexpr auto operator[](difference_type __n) const
     requires random_access_range<_Base>
   {
-    return ranges::__tuple_transform([&](auto& __i) -> decltype(auto) { return __i[n]; }, __current_);
+    return ranges::__tuple_transform([&](auto& __i) -> decltype(auto) { return __i[__n]; }, __current_);
   }
 
   _LIBCPP_HIDE_FROM_ABI friend constexpr bool operator==(const __iterator& __x, const __iterator& __y) {
@@ -335,8 +335,8 @@ template <forward_range _View, size_t _Np>
 template <bool _Const>
 class adjacent_view<_View, _Np>::__sentinel {
   friend adjacent_view;
-  using _Base              = __maybe_const<_Const, _View>;
-  sentinel_t<_Base> __end_ = sentinel_t<_Base>();
+  using _Base _LIBCPP_NODEBUG = __maybe_const<_Const, _View>;
+  sentinel_t<_Base> __end_    = sentinel_t<_Base>();
 
   _LIBCPP_HIDE_FROM_ABI constexpr explicit __sentinel(sentinel_t<_Base> __end) { __end_ = std::move(__end); }
 

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

@@ -59,7 +59,7 @@ constexpr void test() {
   {
     // arguments are moved once
     MoveAwareView mv;
-    std::ranges::adjacent_view<MoveAwareView, N> v{std::move(mv)};
+    std::ranges::adjacent_view<MoveAwareView, 1> v{std::move(mv)};
     auto tuple = *v.begin();
     assert(std::get<0>(tuple) == 2); // one move from the local variable to parameter, one move from parameter to member
   }

libcxx/test/std/ranges/range.adaptors/range.join/adaptor.pass.cpp

@@ -18,14 +18,14 @@
 #include "test_range.h"
 #include "types.h"
 
-struct MoveOnlyView : SimpleForwardCommonOuter<ForwardCommonInner> {
+struct MoveOnlyOuter : SimpleForwardCommonOuter<ForwardCommonInner> {
   using SimpleForwardCommonOuter<ForwardCommonInner>::SimpleForwardCommonOuter;
 
-  constexpr MoveOnlyView(MoveOnlyView&&) = default;
-  constexpr MoveOnlyView(const MoveOnlyView&) = delete;
+  constexpr MoveOnlyOuter(MoveOnlyOuter&&) = default;
+  constexpr MoveOnlyOuter(const MoveOnlyOuter&) = delete;
 
-  constexpr MoveOnlyView& operator=(MoveOnlyView&&) = default;
-  constexpr MoveOnlyView& operator=(const MoveOnlyView&) = delete;
+  constexpr MoveOnlyOuter& operator=(MoveOnlyOuter&&) = default;
+  constexpr MoveOnlyOuter& operator=(const MoveOnlyOuter&) = delete;
 };
 
 struct Foo {
@@ -51,13 +51,13 @@ constexpr bool test() {
   {
     // Test `views::join(move-only-view)`
     ForwardCommonInner inners[3] = {buffer1, buffer2, buffer3};
-    using Result = std::ranges::join_view<MoveOnlyView>;
-    std::same_as<Result> decltype(auto) v = std::views::join(MoveOnlyView{inners});
+    using Result = std::ranges::join_view<MoveOnlyOuter>;
+    std::same_as<Result> decltype(auto) v = std::views::join(MoveOnlyOuter{inners});
     assert(std::ranges::next(v.begin(), 9) == v.end());
     assert(&(*v.begin()) == buffer1);
 
-    static_assert(std::invocable<decltype(std::views::join), MoveOnlyView>);
-    static_assert(!std::invocable<decltype(std::views::join), MoveOnlyView&>);
+    static_assert(std::invocable<decltype(std::views::join), MoveOnlyOuter>);
+    static_assert(!std::invocable<decltype(std::views::join), MoveOnlyOuter&>);
   }
 
   {
@@ -86,13 +86,13 @@ constexpr bool test() {
   {
     // Test `move-only-view | views::join`
     ForwardCommonInner inners[3] = {buffer1, buffer2, buffer3};
-    using Result = std::ranges::join_view<MoveOnlyView>;
-    std::same_as<Result> decltype(auto) v = MoveOnlyView{inners} | std::views::join;
+    using Result = std::ranges::join_view<MoveOnlyOuter>;
+    std::same_as<Result> decltype(auto) v = MoveOnlyOuter{inners} | std::views::join;
     assert(std::ranges::next(v.begin(), 9) == v.end());
     assert(&(*v.begin()) == buffer1);
 
-    static_assert(CanBePiped<MoveOnlyView, decltype((std::views::join))>);
-    static_assert(!CanBePiped<MoveOnlyView&, decltype((std::views::join))>);
+    static_assert(CanBePiped<MoveOnlyOuter, decltype((std::views::join))>);
+    static_assert(!CanBePiped<MoveOnlyOuter&, decltype((std::views::join))>);
   }
 
   {