[libcxx-commits] [libcxx] 3b966c1 - [libc++] [test] Qualify `prev` as `std::prev` in a lot of tests. NFCI.
Arthur O'Dwyer via libcxx-commits
libcxx-commits at lists.llvm.org
Wed Feb 16 08:04:03 PST 2022
Author: Arthur O'Dwyer
Date: 2022-02-16T11:03:32-05:00
New Revision: 3b966c1fe9bf4ff398b2cc232d39f162663bfbcb
URL: https://github.com/llvm/llvm-project/commit/3b966c1fe9bf4ff398b2cc232d39f162663bfbcb
DIFF: https://github.com/llvm/llvm-project/commit/3b966c1fe9bf4ff398b2cc232d39f162663bfbcb.diff
LOG: [libc++] [test] Qualify `prev` as `std::prev` in a lot of tests. NFCI.
We shouldn't be calling `prev` via ADL -- and neither should anybody
in the wild be calling it via ADL, so it's not like we need to test
this ADL ability of `prev` in particular.
Reviewed as part of D119860.
Added:
Modified:
libcxx/test/std/containers/associative/map/map.modifiers/insert_cv.pass.cpp
libcxx/test/std/containers/associative/map/map.modifiers/insert_iter_cv.pass.cpp
libcxx/test/std/containers/associative/map/map.modifiers/insert_iter_rv.pass.cpp
libcxx/test/std/containers/associative/map/map.modifiers/insert_rv.pass.cpp
libcxx/test/std/containers/associative/multimap/multimap.modifiers/erase_iter.pass.cpp
libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_cv.pass.cpp
libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_iter_cv.pass.cpp
libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_iter_rv.pass.cpp
libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_rv.pass.cpp
libcxx/test/std/containers/associative/multiset/insert_cv.pass.cpp
libcxx/test/std/containers/associative/multiset/insert_iter_cv.pass.cpp
libcxx/test/std/containers/associative/multiset/insert_iter_rv.pass.cpp
libcxx/test/std/containers/associative/multiset/insert_rv.pass.cpp
libcxx/test/std/containers/associative/set/insert_cv.pass.cpp
libcxx/test/std/containers/associative/set/insert_iter_cv.pass.cpp
libcxx/test/std/containers/associative/set/insert_iter_rv.pass.cpp
libcxx/test/std/containers/associative/set/insert_rv.pass.cpp
Removed:
################################################################################
diff --git a/libcxx/test/std/containers/associative/map/map.modifiers/insert_cv.pass.cpp b/libcxx/test/std/containers/associative/map/map.modifiers/insert_cv.pass.cpp
index 079b0eaca011a..a2436440f1947 100644
--- a/libcxx/test/std/containers/associative/map/map.modifiers/insert_cv.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.modifiers/insert_cv.pass.cpp
@@ -45,7 +45,7 @@ void do_insert_cv_test()
const VT v3(3, 3.5);
r = m.insert(v3);
assert(r.second);
- assert(r.first == prev(m.end()));
+ assert(r.first == std::prev(m.end()));
assert(m.size() == 3);
assert(r.first->first == 3);
assert(r.first->second == 3.5);
@@ -53,7 +53,7 @@ void do_insert_cv_test()
const VT v4(3, 4.5);
r = m.insert(v4);
assert(!r.second);
- assert(r.first == prev(m.end()));
+ assert(r.first == std::prev(m.end()));
assert(m.size() == 3);
assert(r.first->first == 3);
assert(r.first->second == 3.5);
diff --git a/libcxx/test/std/containers/associative/map/map.modifiers/insert_iter_cv.pass.cpp b/libcxx/test/std/containers/associative/map/map.modifiers/insert_iter_cv.pass.cpp
index a49a28c67bf53..6260fd9d93e9b 100644
--- a/libcxx/test/std/containers/associative/map/map.modifiers/insert_iter_cv.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.modifiers/insert_iter_cv.pass.cpp
@@ -42,14 +42,14 @@ void do_insert_iter_cv_test()
const VT v3(3, 3.5);
r = m.insert(m.end(), v3);
- assert(r == prev(m.end()));
+ assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(r->first == 3);
assert(r->second == 3.5);
const VT v4(3, 4.5);
r = m.insert(m.end(), v4);
- assert(r == prev(m.end()));
+ assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(r->first == 3);
assert(r->second == 3.5);
diff --git a/libcxx/test/std/containers/associative/map/map.modifiers/insert_iter_rv.pass.cpp b/libcxx/test/std/containers/associative/map/map.modifiers/insert_iter_rv.pass.cpp
index 677ce11df09fd..443271d5b4739 100644
--- a/libcxx/test/std/containers/associative/map/map.modifiers/insert_iter_rv.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.modifiers/insert_iter_rv.pass.cpp
@@ -42,13 +42,13 @@ void do_insert_iter_rv_test()
assert(r->second == 1);
r = m.insert(m.end(), P(3, 3));
- assert(r == prev(m.end()));
+ assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(r->first == 3);
assert(r->second == 3);
r = m.insert(m.end(), P(3, 4));
- assert(r == prev(m.end()));
+ assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(r->first == 3);
assert(r->second == 3);
@@ -82,13 +82,13 @@ int main(int, char**)
assert(r->second == 1);
r = m.insert(m.end(), {3, MoveOnly(3)});
- assert(r == prev(m.end()));
+ assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(r->first == 3);
assert(r->second == 3);
r = m.insert(m.end(), {3, MoveOnly(3)});
- assert(r == prev(m.end()));
+ assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(r->first == 3);
assert(r->second == 3);
diff --git a/libcxx/test/std/containers/associative/map/map.modifiers/insert_rv.pass.cpp b/libcxx/test/std/containers/associative/map/map.modifiers/insert_rv.pass.cpp
index 690bed5078f8c..afb5bba86fd3e 100644
--- a/libcxx/test/std/containers/associative/map/map.modifiers/insert_rv.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.modifiers/insert_rv.pass.cpp
@@ -46,14 +46,14 @@ void do_insert_rv_test()
r = m.insert(P(3, 3));
assert(r.second);
- assert(r.first == prev(m.end()));
+ assert(r.first == std::prev(m.end()));
assert(m.size() == 3);
assert(r.first->first == 3);
assert(r.first->second == 3);
r = m.insert(P(3, 3));
assert(!r.second);
- assert(r.first == prev(m.end()));
+ assert(r.first == std::prev(m.end()));
assert(m.size() == 3);
assert(r.first->first == 3);
assert(r.first->second == 3);
@@ -91,14 +91,14 @@ int main(int, char**)
r = m.insert({3, MoveOnly(3)});
assert(r.second);
- assert(r.first == prev(m.end()));
+ assert(r.first == std::prev(m.end()));
assert(m.size() == 3);
assert(r.first->first == 3);
assert(r.first->second == 3);
r = m.insert({3, MoveOnly(3)});
assert(!r.second);
- assert(r.first == prev(m.end()));
+ assert(r.first == std::prev(m.end()));
assert(m.size() == 3);
assert(r.first->first == 3);
assert(r.first->second == 3);
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/erase_iter.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/erase_iter.pass.cpp
index 7e7c832c78a23..d958f617d1132 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/erase_iter.pass.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/erase_iter.pass.cpp
@@ -86,7 +86,7 @@ int main(int, char**)
i = m.erase(std::next(m.cbegin(), 5));
assert(m.size() == 6);
- assert(i == prev(m.end()));
+ assert(i == std::prev(m.end()));
assert(std::next(m.begin(), 0)->first == 1);
assert(std::next(m.begin(), 0)->second == 1.5);
assert(std::next(m.begin(), 1)->first == 1);
@@ -214,7 +214,7 @@ int main(int, char**)
i = m.erase(std::next(m.cbegin(), 5));
assert(m.size() == 6);
- assert(i == prev(m.end()));
+ assert(i == std::prev(m.end()));
assert(std::next(m.begin(), 0)->first == 1);
assert(std::next(m.begin(), 0)->second == 1.5);
assert(std::next(m.begin(), 1)->first == 1);
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_cv.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_cv.pass.cpp
index b83034448a145..f34016303fbe6 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_cv.pass.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_cv.pass.cpp
@@ -40,14 +40,14 @@ void do_insert_test() {
const VT v3(3, 3.5);
r = m.insert(v3);
- assert(r == prev(m.end()));
+ assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(r->first == 3);
assert(r->second == 3.5);
const VT v4(3, 3.5);
r = m.insert(v4);
- assert(r == prev(m.end()));
+ assert(r == std::prev(m.end()));
assert(m.size() == 4);
assert(r->first == 3);
assert(r->second == 3.5);
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_iter_cv.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_iter_cv.pass.cpp
index fb3283f838496..81529600ca0af 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_iter_cv.pass.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_iter_cv.pass.cpp
@@ -41,14 +41,14 @@ void do_insert_hint_test()
const VT v3(3, 3.5);
r = m.insert(m.end(), v3);
- assert(r == prev(m.end()));
+ assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(r->first == 3);
assert(r->second == 3.5);
const VT v4(3, 4.5);
- r = m.insert(prev(m.end()), v4);
- assert(r == prev(m.end(), 2));
+ r = m.insert(std::prev(m.end()), v4);
+ assert(r == std::prev(m.end(), 2));
assert(m.size() == 4);
assert(r->first == 3);
assert(r->second == 4.5);
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_iter_rv.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_iter_rv.pass.cpp
index 381c475de2df2..bd90b3c9ba32f 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_iter_rv.pass.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_iter_rv.pass.cpp
@@ -42,13 +42,13 @@ void do_insert_rv_test()
assert(r->second == 1);
r = m.insert(m.cend(), P(3, 3));
- assert(r == prev(m.end()));
+ assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(r->first == 3);
assert(r->second == 3);
r = m.insert(m.cend(), P(3, 2));
- assert(r == prev(m.end()));
+ assert(r == std::prev(m.end()));
assert(m.size() == 4);
assert(r->first == 3);
assert(r->second == 2);
@@ -84,13 +84,13 @@ int main(int, char**)
assert(r->second == 1);
r = m.insert(m.cend(), {3, MoveOnly(3)});
- assert(r == prev(m.end()));
+ assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(r->first == 3);
assert(r->second == 3);
r = m.insert(m.cend(), {3, MoveOnly(2)});
- assert(r == prev(m.end()));
+ assert(r == std::prev(m.end()));
assert(m.size() == 4);
assert(r->first == 3);
assert(r->second == 2);
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_rv.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_rv.pass.cpp
index 3f54def1bd8aa..7933d69d2e3f0 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_rv.pass.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.modifiers/insert_rv.pass.cpp
@@ -42,13 +42,13 @@ void do_insert_rv_test()
assert(r->second == 1);
r = m.insert(VT(3, 3));
- assert(r == prev(m.end()));
+ assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(r->first == 3);
assert(r->second == 3);
r = m.insert(VT(3, 3));
- assert(r == prev(m.end()));
+ assert(r == std::prev(m.end()));
assert(m.size() == 4);
assert(r->first == 3);
assert(r->second == 3);
@@ -78,13 +78,13 @@ int main(int, char**)
assert(r->second == 1);
r = m.insert({3, MoveOnly(3)});
- assert(r == prev(m.end()));
+ assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(r->first == 3);
assert(r->second == 3);
r = m.insert({3, MoveOnly(3)});
- assert(r == prev(m.end()));
+ assert(r == std::prev(m.end()));
assert(m.size() == 4);
assert(r->first == 3);
assert(r->second == 3);
diff --git a/libcxx/test/std/containers/associative/multiset/insert_cv.pass.cpp b/libcxx/test/std/containers/associative/multiset/insert_cv.pass.cpp
index 8610152e9d9b6..b8a36ec385377 100644
--- a/libcxx/test/std/containers/associative/multiset/insert_cv.pass.cpp
+++ b/libcxx/test/std/containers/associative/multiset/insert_cv.pass.cpp
@@ -39,12 +39,12 @@ void do_insert_cv_test()
const VT v3(3);
r = m.insert(v3);
- assert(r == prev(m.end()));
+ assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(*r == 3);
r = m.insert(v3);
- assert(r == prev(m.end()));
+ assert(r == std::prev(m.end()));
assert(m.size() == 4);
assert(*r == 3);
}
diff --git a/libcxx/test/std/containers/associative/multiset/insert_iter_cv.pass.cpp b/libcxx/test/std/containers/associative/multiset/insert_iter_cv.pass.cpp
index 494a4ae1d1437..242e801c2acbf 100644
--- a/libcxx/test/std/containers/associative/multiset/insert_iter_cv.pass.cpp
+++ b/libcxx/test/std/containers/associative/multiset/insert_iter_cv.pass.cpp
@@ -35,12 +35,12 @@ int main(int, char**)
assert(*r == 1);
r = m.insert(m.cend(), M::value_type(3));
- assert(r == prev(m.end()));
+ assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(*r == 3);
r = m.insert(m.cend(), M::value_type(3));
- assert(r == prev(m.end()));
+ assert(r == std::prev(m.end()));
assert(m.size() == 4);
assert(*r == 3);
}
@@ -60,12 +60,12 @@ int main(int, char**)
assert(*r == 1);
r = m.insert(m.cend(), M::value_type(3));
- assert(r == prev(m.end()));
+ assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(*r == 3);
r = m.insert(m.cend(), M::value_type(3));
- assert(r == prev(m.end()));
+ assert(r == std::prev(m.end()));
assert(m.size() == 4);
assert(*r == 3);
}
diff --git a/libcxx/test/std/containers/associative/multiset/insert_iter_rv.pass.cpp b/libcxx/test/std/containers/associative/multiset/insert_iter_rv.pass.cpp
index c643137f985d0..75df25e9b0999 100644
--- a/libcxx/test/std/containers/associative/multiset/insert_iter_rv.pass.cpp
+++ b/libcxx/test/std/containers/associative/multiset/insert_iter_rv.pass.cpp
@@ -38,12 +38,12 @@ int main(int, char**)
assert(*r == 1);
r = m.insert(m.cend(), M::value_type(3));
- assert(r == prev(m.end()));
+ assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(*r == 3);
r = m.insert(m.cend(), M::value_type(3));
- assert(r == prev(m.end()));
+ assert(r == std::prev(m.end()));
assert(m.size() == 4);
assert(*r == 3);
}
@@ -62,12 +62,12 @@ int main(int, char**)
assert(*r == 1);
r = m.insert(m.cend(), M::value_type(3));
- assert(r == prev(m.end()));
+ assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(*r == 3);
r = m.insert(m.cend(), M::value_type(3));
- assert(r == prev(m.end()));
+ assert(r == std::prev(m.end()));
assert(m.size() == 4);
assert(*r == 3);
}
diff --git a/libcxx/test/std/containers/associative/multiset/insert_rv.pass.cpp b/libcxx/test/std/containers/associative/multiset/insert_rv.pass.cpp
index c2add8d1bbb50..d34c96891d408 100644
--- a/libcxx/test/std/containers/associative/multiset/insert_rv.pass.cpp
+++ b/libcxx/test/std/containers/associative/multiset/insert_rv.pass.cpp
@@ -38,12 +38,12 @@ int main(int, char**)
assert(*r == 1);
r = m.insert(M::value_type(3));
- assert(r == prev(m.end()));
+ assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(*r == 3);
r = m.insert(M::value_type(3));
- assert(r == prev(m.end()));
+ assert(r == std::prev(m.end()));
assert(m.size() == 4);
assert(*r == 3);
}
@@ -62,12 +62,12 @@ int main(int, char**)
assert(*r == 1);
r = m.insert(M::value_type(3));
- assert(r == prev(m.end()));
+ assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(*r == 3);
r = m.insert(M::value_type(3));
- assert(r == prev(m.end()));
+ assert(r == std::prev(m.end()));
assert(m.size() == 4);
assert(*r == 3);
}
diff --git a/libcxx/test/std/containers/associative/set/insert_cv.pass.cpp b/libcxx/test/std/containers/associative/set/insert_cv.pass.cpp
index ff1119355ce1c..4ef283410c6b3 100644
--- a/libcxx/test/std/containers/associative/set/insert_cv.pass.cpp
+++ b/libcxx/test/std/containers/associative/set/insert_cv.pass.cpp
@@ -43,13 +43,13 @@ void do_insert_cv_test()
const VT v3(3);
r = m.insert(v3);
assert(r.second);
- assert(r.first == prev(m.end()));
+ assert(r.first == std::prev(m.end()));
assert(m.size() == 3);
assert(*r.first == 3);
r = m.insert(v3);
assert(!r.second);
- assert(r.first == prev(m.end()));
+ assert(r.first == std::prev(m.end()));
assert(m.size() == 3);
assert(*r.first == 3);
}
diff --git a/libcxx/test/std/containers/associative/set/insert_iter_cv.pass.cpp b/libcxx/test/std/containers/associative/set/insert_iter_cv.pass.cpp
index b4de0a355d134..a7c0b654fc878 100644
--- a/libcxx/test/std/containers/associative/set/insert_iter_cv.pass.cpp
+++ b/libcxx/test/std/containers/associative/set/insert_iter_cv.pass.cpp
@@ -35,12 +35,12 @@ int main(int, char**)
assert(*r == 1);
r = m.insert(m.cend(), M::value_type(3));
- assert(r == prev(m.end()));
+ assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(*r == 3);
r = m.insert(m.cend(), M::value_type(3));
- assert(r == prev(m.end()));
+ assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(*r == 3);
}
@@ -60,12 +60,12 @@ int main(int, char**)
assert(*r == 1);
r = m.insert(m.cend(), M::value_type(3));
- assert(r == prev(m.end()));
+ assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(*r == 3);
r = m.insert(m.cend(), M::value_type(3));
- assert(r == prev(m.end()));
+ assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(*r == 3);
}
diff --git a/libcxx/test/std/containers/associative/set/insert_iter_rv.pass.cpp b/libcxx/test/std/containers/associative/set/insert_iter_rv.pass.cpp
index 1d9df70352a6d..ce490ac17c139 100644
--- a/libcxx/test/std/containers/associative/set/insert_iter_rv.pass.cpp
+++ b/libcxx/test/std/containers/associative/set/insert_iter_rv.pass.cpp
@@ -38,12 +38,12 @@ int main(int, char**)
assert(*r == 1);
r = m.insert(m.cend(), M::value_type(3));
- assert(r == prev(m.end()));
+ assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(*r == 3);
r = m.insert(m.cend(), M::value_type(3));
- assert(r == prev(m.end()));
+ assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(*r == 3);
}
@@ -62,12 +62,12 @@ int main(int, char**)
assert(*r == 1);
r = m.insert(m.cend(), M::value_type(3));
- assert(r == prev(m.end()));
+ assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(*r == 3);
r = m.insert(m.cend(), M::value_type(3));
- assert(r == prev(m.end()));
+ assert(r == std::prev(m.end()));
assert(m.size() == 3);
assert(*r == 3);
}
diff --git a/libcxx/test/std/containers/associative/set/insert_rv.pass.cpp b/libcxx/test/std/containers/associative/set/insert_rv.pass.cpp
index ac934bc9ac71d..054cdaac899a6 100644
--- a/libcxx/test/std/containers/associative/set/insert_rv.pass.cpp
+++ b/libcxx/test/std/containers/associative/set/insert_rv.pass.cpp
@@ -41,13 +41,13 @@ int main(int, char**)
r = m.insert(M::value_type(3));
assert(r.second);
- assert(r.first == prev(m.end()));
+ assert(r.first == std::prev(m.end()));
assert(m.size() == 3);
assert(*r.first == 3);
r = m.insert(M::value_type(3));
assert(!r.second);
- assert(r.first == prev(m.end()));
+ assert(r.first == std::prev(m.end()));
assert(m.size() == 3);
assert(*r.first == 3);
}
@@ -69,13 +69,13 @@ int main(int, char**)
r = m.insert(M::value_type(3));
assert(r.second);
- assert(r.first == prev(m.end()));
+ assert(r.first == std::prev(m.end()));
assert(m.size() == 3);
assert(*r.first == 3);
r = m.insert(M::value_type(3));
assert(!r.second);
- assert(r.first == prev(m.end()));
+ assert(r.first == std::prev(m.end()));
assert(m.size() == 3);
assert(*r.first == 3);
}
More information about the libcxx-commits
mailing list