-
Notifications
You must be signed in to change notification settings - Fork 10.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Move nondiscard tests of ranges::contains() to the right place. #76887
Conversation
@llvm/pr-subscribers-libcxx Author: None (ZijunZhaoCCK) Changesnondiscard tests of ranges::contains() should be in ranges.nodiscard_extensions files rather than nodiscard_extensions files Full diff: https://github.com/llvm/llvm-project/pull/76887.diff 4 Files Affected:
diff --git a/libcxx/test/libcxx/diagnostics/nodiscard_extensions.compile.pass.cpp b/libcxx/test/libcxx/diagnostics/nodiscard_extensions.compile.pass.cpp
index 641fcd9233bc2e..e9fab0c75a98e9 100644
--- a/libcxx/test/libcxx/diagnostics/nodiscard_extensions.compile.pass.cpp
+++ b/libcxx/test/libcxx/diagnostics/nodiscard_extensions.compile.pass.cpp
@@ -45,9 +45,6 @@ void test_algorithms() {
#if TEST_STD_VER >= 17
std::clamp(2, 1, 3);
std::clamp(2, 3, 1, std::greater<int>());
-#endif
-#if TEST_STD_VER >= 23
- std::ranges::contains(arr, arr + 1, 1);
#endif
std::count_if(std::begin(arr), std::end(arr), P());
std::count(std::begin(arr), std::end(arr), 1);
diff --git a/libcxx/test/libcxx/diagnostics/nodiscard_extensions.verify.cpp b/libcxx/test/libcxx/diagnostics/nodiscard_extensions.verify.cpp
index 1e3f537f01ed6e..d7a26d99e52233 100644
--- a/libcxx/test/libcxx/diagnostics/nodiscard_extensions.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/nodiscard_extensions.verify.cpp
@@ -60,11 +60,6 @@ void test_algorithms() {
std::clamp(2, 1, 3, std::greater<int>());
#endif
-#if TEST_STD_VER >= 23
- // expected-warning@+1 {{ignoring return value of function declared with 'nodiscard' attribute}}
- std::ranges::contains(arr, arr + 1, 1);
-#endif
-
// expected-warning@+1 {{ignoring return value of function declared with 'nodiscard' attribute}}
std::count_if(std::begin(arr), std::end(arr), P());
diff --git a/libcxx/test/libcxx/diagnostics/ranges.nodiscard_extensions.compile.pass.cpp b/libcxx/test/libcxx/diagnostics/ranges.nodiscard_extensions.compile.pass.cpp
index 7e2d64b8c9b618..9dc9c46ad89090 100644
--- a/libcxx/test/libcxx/diagnostics/ranges.nodiscard_extensions.compile.pass.cpp
+++ b/libcxx/test/libcxx/diagnostics/ranges.nodiscard_extensions.compile.pass.cpp
@@ -28,6 +28,8 @@ void test() {
std::ranges::binary_search(range, 1);
std::ranges::binary_search(iter, iter, 1);
std::ranges::clamp(1, 2, 3);
+ std::ranges::contains(range, 1);
+ std::ranges::contains(iter, iter, 1);
std::ranges::count_if(range, pred);
std::ranges::count_if(iter, iter, pred);
std::ranges::count(range, 1);
diff --git a/libcxx/test/libcxx/diagnostics/ranges.nodiscard_extensions.verify.cpp b/libcxx/test/libcxx/diagnostics/ranges.nodiscard_extensions.verify.cpp
index f0a0e4889a7603..5e45ad086cbd08 100644
--- a/libcxx/test/libcxx/diagnostics/ranges.nodiscard_extensions.verify.cpp
+++ b/libcxx/test/libcxx/diagnostics/ranges.nodiscard_extensions.verify.cpp
@@ -91,6 +91,10 @@ void test() {
std::ranges::upper_bound(iter, iter, 1); // expected-warning {{ignoring return value of function declared with 'nodiscard' attribute}}
#if TEST_STD_VER >= 23
+ std::ranges::contains(range, 1);
+ // expected-warning@-1{{ignoring return value of function declared with 'nodiscard' attribute}}
+ std::ranges::contains(iter, iter, 1);
+ // expected-warning@-1{{ignoring return value of function declared with 'nodiscard' attribute}}
std::ranges::fold_left(range, 0, std::plus());
// expected-warning@-1{{ignoring return value of function declared with 'nodiscard' attribute}}
std::ranges::fold_left(iter, iter, 0, std::plus());
|
libcxx/test/libcxx/diagnostics/ranges.nodiscard_extensions.compile.pass.cpp
Show resolved
Hide resolved
Maybe you need to update the status page, papers and release notes too: |
Thank you for reminding! I will update those files after I finish |
nondiscard tests of ranges::contains() should be in ranges.nodiscard_extensions files rather than nodiscard_extensions files