[libcxx] renames local variable to avoid shadowing werror

[cjdb]

Due to the inclusion of a header, a global type is was being shadowed, which upset GCC.

[llvmbot]

@llvm/pr-subscribers-libcxx

Author: Christopher Di Bella (cjdb)

Changes

Due to the inclusion of a header, a global type is was being shadowed, which upset GCC.

---

Full diff: https://github.com/llvm/llvm-project/pull/77672.diff

1 Files Affected:

• (modified) libcxx/test/std/ranges/range.adaptors/range.join/range.join.sentinel/ctor.other.pass.cpp (+3-3)

diff --git a/libcxx/test/std/ranges/range.adaptors/range.join/range.join.sentinel/ctor.other.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.join/range.join.sentinel/ctor.other.pass.cpp
index fb1e8eb1ebefa6..96bcf6b2c4c913 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.join/range.join.sentinel/ctor.other.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.join/range.join.sentinel/ctor.other.pass.cpp
@@ -71,10 +71,10 @@ constexpr bool test() {
         BufferView<forward_iterator<const Inner*>, sentinel_wrapper<forward_iterator<const Inner*>>,
                    bidirectional_iterator<Inner*>, sentinel_wrapper<bidirectional_iterator<Inner*>>>;
     using JoinView = std::ranges::join_view<ConstInconvertibleOuter>;
-    using sentinel = std::ranges::sentinel_t<JoinView>;
+    using sentinel_t     = std::ranges::sentinel_t<JoinView>;
     using const_sentinel = std::ranges::sentinel_t<const JoinView>;
-    static_assert(!std::constructible_from<sentinel, const_sentinel>);
-    static_assert(!std::constructible_from<const_sentinel, sentinel>);
+    static_assert(!std::constructible_from<sentinel_t, const_sentinel>);
+    static_assert(!std::constructible_from<const_sentinel, sentinel_t>);
   }
   return true;
 }

[philnik777]

LGTM assuming GCC is now happy.

[ldionne]

LGTM, thanks for fixing. I'll merge this now to make the CI green again ASAP.

[github-actions]

⚠️ C/C++ code formatter, clang-format found issues in your code. ⚠️

You can test this locally with the following command:

git-clang-format --diff 5c9b713394486be91dc181062e5c01d696c30787 4fd5e776772500297f3e609373d15bd726076b84 -- libcxx/test/std/ranges/range.adaptors/range.join/range.join.sentinel/ctor.other.pass.cpp

View the diff from clang-format here.

diff --git a/libcxx/test/std/ranges/range.adaptors/range.join/range.join.sentinel/ctor.other.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.join/range.join.sentinel/ctor.other.pass.cpp
index 8e78c3732e..1fcbe02a52 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.join/range.join.sentinel/ctor.other.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.join/range.join.sentinel/ctor.other.pass.cpp
@@ -71,7 +71,7 @@ constexpr bool test() {
         BufferView<forward_iterator<const Inner*>, sentinel_wrapper<forward_iterator<const Inner*>>,
                    bidirectional_iterator<Inner*>, sentinel_wrapper<bidirectional_iterator<Inner*>>>;
     using JoinView = std::ranges::join_view<ConstInconvertibleOuter>;
-    using sentinel_t     = std::ranges::sentinel_t<JoinView>;
+    using sentinel_t       = std::ranges::sentinel_t<JoinView>;
     using const_sentinel_t = std::ranges::sentinel_t<const JoinView>;
     static_assert(!std::constructible_from<sentinel_t, const_sentinel_t>);
     static_assert(!std::constructible_from<const_sentinel_t, sentinel_t>);