[libcxx-commits] [libcxx] cd854e6 - [libc++] Fix test synopses and remove unused includes.
Marek Kurdej via libcxx-commits
libcxx-commits at lists.llvm.org
Tue Apr 13 01:32:51 PDT 2021
Author: Marek Kurdej
Date: 2021-04-13T10:32:35+02:00
New Revision: cd854e686f0c3bfc8bcf4d6fc2549115010da260
URL: https://github.com/llvm/llvm-project/commit/cd854e686f0c3bfc8bcf4d6fc2549115010da260
DIFF: https://github.com/llvm/llvm-project/commit/cd854e686f0c3bfc8bcf4d6fc2549115010da260.diff
LOG: [libc++] Fix test synopses and remove unused includes.
Added:
Modified:
libcxx/test/std/containers/associative/map/map.ops/count0.pass.cpp
libcxx/test/std/containers/associative/map/map.ops/count1.compile.fail.cpp
libcxx/test/std/containers/associative/map/map.ops/count2.compile.fail.cpp
libcxx/test/std/containers/associative/map/map.ops/count3.compile.fail.cpp
libcxx/test/std/containers/associative/map/map.ops/count_transparent.pass.cpp
libcxx/test/std/containers/associative/map/map.ops/equal_range0.pass.cpp
libcxx/test/std/containers/associative/map/map.ops/equal_range1.compile.fail.cpp
libcxx/test/std/containers/associative/map/map.ops/equal_range2.compile.fail.cpp
libcxx/test/std/containers/associative/map/map.ops/equal_range3.compile.fail.cpp
libcxx/test/std/containers/associative/map/map.ops/equal_range_transparent.pass.cpp
libcxx/test/std/containers/associative/multimap/multimap.ops/count0.pass.cpp
libcxx/test/std/containers/associative/multimap/multimap.ops/count1.compile.fail.cpp
libcxx/test/std/containers/associative/multimap/multimap.ops/count2.compile.fail.cpp
libcxx/test/std/containers/associative/multimap/multimap.ops/count3.compile.fail.cpp
libcxx/test/std/containers/associative/multimap/multimap.ops/count_transparent.pass.cpp
libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range0.pass.cpp
libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range1.compile.fail.cpp
libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range2.compile.fail.cpp
libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range3.compile.fail.cpp
libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range_transparent.pass.cpp
libcxx/test/std/containers/associative/multiset/count_transparent.pass.cpp
libcxx/test/std/containers/associative/multiset/equal_range_transparent.pass.cpp
libcxx/test/std/containers/associative/set/count_transparent.pass.cpp
libcxx/test/std/containers/associative/set/equal_range_transparent.pass.cpp
Removed:
################################################################################
diff --git a/libcxx/test/std/containers/associative/map/map.ops/count0.pass.cpp b/libcxx/test/std/containers/associative/map/map.ops/count0.pass.cpp
index 797100fbe7b1..aa9952337bee 100644
--- a/libcxx/test/std/containers/associative/map/map.ops/count0.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.ops/count0.pass.cpp
@@ -12,8 +12,7 @@
// class map
-// iterator find(const key_type& k);
-// const_iterator find(const key_type& k) const;
+// size_type count(const key_type& k) const;
//
// The member function templates find, count, lower_bound, upper_bound, and
// equal_range shall not participate in overload resolution unless the
diff --git a/libcxx/test/std/containers/associative/map/map.ops/count1.compile.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/count1.compile.fail.cpp
index 42dc59c27891..f2cfaf71517b 100644
--- a/libcxx/test/std/containers/associative/map/map.ops/count1.compile.fail.cpp
+++ b/libcxx/test/std/containers/associative/map/map.ops/count1.compile.fail.cpp
@@ -10,8 +10,7 @@
// class map
-// iterator find(const key_type& k);
-// const_iterator find(const key_type& k) const;
+// size_type count(const key_type& k) const;
//
// The member function templates find, count, lower_bound, upper_bound, and
// equal_range shall not participate in overload resolution unless the
diff --git a/libcxx/test/std/containers/associative/map/map.ops/count2.compile.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/count2.compile.fail.cpp
index 1fe6b927d8de..228a582cf600 100644
--- a/libcxx/test/std/containers/associative/map/map.ops/count2.compile.fail.cpp
+++ b/libcxx/test/std/containers/associative/map/map.ops/count2.compile.fail.cpp
@@ -10,8 +10,7 @@
// class map
-// iterator find(const key_type& k);
-// const_iterator find(const key_type& k) const;
+// size_type count(const key_type& k) const;
//
// The member function templates find, count, lower_bound, upper_bound, and
// equal_range shall not participate in overload resolution unless the
diff --git a/libcxx/test/std/containers/associative/map/map.ops/count3.compile.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/count3.compile.fail.cpp
index 3fd930eb2542..dd1be0c759c1 100644
--- a/libcxx/test/std/containers/associative/map/map.ops/count3.compile.fail.cpp
+++ b/libcxx/test/std/containers/associative/map/map.ops/count3.compile.fail.cpp
@@ -10,8 +10,7 @@
// class map
-// iterator find(const key_type& k);
-// const_iterator find(const key_type& k) const;
+// size_type count(const key_type& k) const;
//
// The member function templates find, count, lower_bound, upper_bound, and
// equal_range shall not participate in overload resolution unless the
diff --git a/libcxx/test/std/containers/associative/map/map.ops/count_transparent.pass.cpp b/libcxx/test/std/containers/associative/map/map.ops/count_transparent.pass.cpp
index c3c5d27643b2..89686c807ed5 100644
--- a/libcxx/test/std/containers/associative/map/map.ops/count_transparent.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.ops/count_transparent.pass.cpp
@@ -19,10 +19,6 @@
#include <map>
#include <utility>
-#include "min_allocator.h"
-#include "private_constructor.h"
-#include "test_macros.h"
-
struct Comp {
using is_transparent = void;
diff --git a/libcxx/test/std/containers/associative/map/map.ops/equal_range0.pass.cpp b/libcxx/test/std/containers/associative/map/map.ops/equal_range0.pass.cpp
index d1f51fd240c9..6beb9b2246e2 100644
--- a/libcxx/test/std/containers/associative/map/map.ops/equal_range0.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.ops/equal_range0.pass.cpp
@@ -12,8 +12,8 @@
// class map
-// iterator find(const key_type& k);
-// const_iterator find(const key_type& k) const;
+// pair<iterator,iterator> equal_range(const key_type& k);
+// pair<const_iterator,const_iterator> equal_range(const key_type& k) const;
//
// The member function templates find, count, lower_bound, upper_bound, and
// equal_range shall not participate in overload resolution unless the
diff --git a/libcxx/test/std/containers/associative/map/map.ops/equal_range1.compile.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/equal_range1.compile.fail.cpp
index f8ccfc3d8a56..ef5206cd5386 100644
--- a/libcxx/test/std/containers/associative/map/map.ops/equal_range1.compile.fail.cpp
+++ b/libcxx/test/std/containers/associative/map/map.ops/equal_range1.compile.fail.cpp
@@ -10,8 +10,8 @@
// class map
-// iterator find(const key_type& k);
-// const_iterator find(const key_type& k) const;
+// pair<iterator,iterator> equal_range(const key_type& k);
+// pair<const_iterator,const_iterator> equal_range(const key_type& k) const;
//
// The member function templates find, count, lower_bound, upper_bound, and
// equal_range shall not participate in overload resolution unless the
diff --git a/libcxx/test/std/containers/associative/map/map.ops/equal_range2.compile.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/equal_range2.compile.fail.cpp
index dcde9fc2e19c..6e3190eaaa12 100644
--- a/libcxx/test/std/containers/associative/map/map.ops/equal_range2.compile.fail.cpp
+++ b/libcxx/test/std/containers/associative/map/map.ops/equal_range2.compile.fail.cpp
@@ -10,8 +10,8 @@
// class map
-// iterator find(const key_type& k);
-// const_iterator find(const key_type& k) const;
+// pair<iterator,iterator> equal_range(const key_type& k);
+// pair<const_iterator,const_iterator> equal_range(const key_type& k) const;
//
// The member function templates find, count, lower_bound, upper_bound, and
// equal_range shall not participate in overload resolution unless the
diff --git a/libcxx/test/std/containers/associative/map/map.ops/equal_range3.compile.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/equal_range3.compile.fail.cpp
index f773c482c9f5..3ce4f3d08628 100644
--- a/libcxx/test/std/containers/associative/map/map.ops/equal_range3.compile.fail.cpp
+++ b/libcxx/test/std/containers/associative/map/map.ops/equal_range3.compile.fail.cpp
@@ -10,8 +10,8 @@
// class map
-// iterator find(const key_type& k);
-// const_iterator find(const key_type& k) const;
+// pair<iterator,iterator> equal_range(const key_type& k);
+// pair<const_iterator,const_iterator> equal_range(const key_type& k) const;
//
// The member function templates find, count, lower_bound, upper_bound, and
// equal_range shall not participate in overload resolution unless the
diff --git a/libcxx/test/std/containers/associative/map/map.ops/equal_range_transparent.pass.cpp b/libcxx/test/std/containers/associative/map/map.ops/equal_range_transparent.pass.cpp
index ba600dbdd919..10330a134b05 100644
--- a/libcxx/test/std/containers/associative/map/map.ops/equal_range_transparent.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.ops/equal_range_transparent.pass.cpp
@@ -22,10 +22,6 @@
#include <map>
#include <utility>
-#include "min_allocator.h"
-#include "private_constructor.h"
-#include "test_macros.h"
-
struct Comp {
using is_transparent = void;
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/count0.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/count0.pass.cpp
index fd802ac0ec72..bb220d553d51 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.ops/count0.pass.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/count0.pass.cpp
@@ -12,8 +12,7 @@
// class multimap
-// iterator find(const key_type& k);
-// const_iterator find(const key_type& k) const;
+// size_type count(const key_type& k) const;
//
// The member function templates find, count, lower_bound, upper_bound, and
// equal_range shall not participate in overload resolution unless the
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/count1.compile.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/count1.compile.fail.cpp
index 594a424fad48..4ee0694e8c4f 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.ops/count1.compile.fail.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/count1.compile.fail.cpp
@@ -10,8 +10,7 @@
// class multimap
-// iterator find(const key_type& k);
-// const_iterator find(const key_type& k) const;
+// size_type count(const key_type& k) const;
//
// The member function templates find, count, lower_bound, upper_bound, and
// equal_range shall not participate in overload resolution unless the
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/count2.compile.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/count2.compile.fail.cpp
index 1f98052b7b2a..83e2d35822a9 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.ops/count2.compile.fail.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/count2.compile.fail.cpp
@@ -10,8 +10,7 @@
// class multimap
-// iterator find(const key_type& k);
-// const_iterator find(const key_type& k) const;
+// size_type count(const key_type& k) const;
//
// The member function templates find, count, lower_bound, upper_bound, and
// equal_range shall not participate in overload resolution unless the
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/count3.compile.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/count3.compile.fail.cpp
index 3304d9f06400..09cbb4c288b3 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.ops/count3.compile.fail.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/count3.compile.fail.cpp
@@ -10,8 +10,7 @@
// class multimap
-// iterator find(const key_type& k);
-// const_iterator find(const key_type& k) const;
+// size_type count(const key_type& k) const;
//
// The member function templates find, count, lower_bound, upper_bound, and
// equal_range shall not participate in overload resolution unless the
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/count_transparent.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/count_transparent.pass.cpp
index ba9d1e266bd6..4bb08c6d928c 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.ops/count_transparent.pass.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/count_transparent.pass.cpp
@@ -19,10 +19,6 @@
#include <map>
#include <utility>
-#include "min_allocator.h"
-#include "private_constructor.h"
-#include "test_macros.h"
-
struct Comp {
using is_transparent = void;
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range0.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range0.pass.cpp
index 38b8e6373d0d..470ac4aae490 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range0.pass.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range0.pass.cpp
@@ -12,8 +12,8 @@
// class multimap
-// iterator find(const key_type& k);
-// const_iterator find(const key_type& k) const;
+// pair<iterator, iterator> equal_range(const key_type& k);
+// pair<const_iterator, const_iterator> equal_range(const key_type& k) const;
//
// The member function templates find, count, lower_bound, upper_bound, and
// equal_range shall not participate in overload resolution unless the
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range1.compile.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range1.compile.fail.cpp
index b826f018fae8..d093618cb34e 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range1.compile.fail.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range1.compile.fail.cpp
@@ -10,8 +10,8 @@
// class multimap
-// iterator find(const key_type& k);
-// const_iterator find(const key_type& k) const;
+// pair<iterator, iterator> equal_range(const key_type& k);
+// pair<const_iterator, const_iterator> equal_range(const key_type& k) const;
//
// The member function templates find, count, lower_bound, upper_bound, and
// equal_range shall not participate in overload resolution unless the
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range2.compile.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range2.compile.fail.cpp
index a533a7144e7a..84958d3a8224 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range2.compile.fail.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range2.compile.fail.cpp
@@ -10,8 +10,8 @@
// class multimap
-// iterator find(const key_type& k);
-// const_iterator find(const key_type& k) const;
+// pair<iterator, iterator> equal_range(const key_type& k);
+// pair<const_iterator, const_iterator> equal_range(const key_type& k) const;
//
// The member function templates find, count, lower_bound, upper_bound, and
// equal_range shall not participate in overload resolution unless the
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range3.compile.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range3.compile.fail.cpp
index 2a26a5849c92..6bf34c2e537c 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range3.compile.fail.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range3.compile.fail.cpp
@@ -10,8 +10,8 @@
// class multimap
-// iterator find(const key_type& k);
-// const_iterator find(const key_type& k) const;
+// pair<iterator, iterator> equal_range(const key_type& k);
+// pair<const_iterator, const_iterator> equal_range(const key_type& k) const;
//
// The member function templates find, count, lower_bound, upper_bound, and
// equal_range shall not participate in overload resolution unless the
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range_transparent.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range_transparent.pass.cpp
index 90f872c3fdeb..4315d573c6e2 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range_transparent.pass.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range_transparent.pass.cpp
@@ -22,10 +22,6 @@
#include <map>
#include <utility>
-#include "min_allocator.h"
-#include "private_constructor.h"
-#include "test_macros.h"
-
struct Comp {
using is_transparent = void;
diff --git a/libcxx/test/std/containers/associative/multiset/count_transparent.pass.cpp b/libcxx/test/std/containers/associative/multiset/count_transparent.pass.cpp
index 9b9e58efca29..5e6add9582df 100644
--- a/libcxx/test/std/containers/associative/multiset/count_transparent.pass.cpp
+++ b/libcxx/test/std/containers/associative/multiset/count_transparent.pass.cpp
@@ -13,18 +13,12 @@
// class multiset
// template<typename K>
-// iterator lower_bound(const K& x); // C++14
-// template<typename K>
-// const_iterator lower_bound(const K& x) const; // C++14
+// size_type count(const K& x) const; // C++14
#include <cassert>
#include <set>
#include <utility>
-#include "min_allocator.h"
-#include "private_constructor.h"
-#include "test_macros.h"
-
struct Comp {
using is_transparent = void;
diff --git a/libcxx/test/std/containers/associative/multiset/equal_range_transparent.pass.cpp b/libcxx/test/std/containers/associative/multiset/equal_range_transparent.pass.cpp
index c92914a451bd..06b455093379 100644
--- a/libcxx/test/std/containers/associative/multiset/equal_range_transparent.pass.cpp
+++ b/libcxx/test/std/containers/associative/multiset/equal_range_transparent.pass.cpp
@@ -23,10 +23,6 @@
#include <set>
#include <utility>
-#include "min_allocator.h"
-#include "private_constructor.h"
-#include "test_macros.h"
-
struct Comp {
using is_transparent = void;
diff --git a/libcxx/test/std/containers/associative/set/count_transparent.pass.cpp b/libcxx/test/std/containers/associative/set/count_transparent.pass.cpp
index 00aea22b56fe..3cb7e5fd312f 100644
--- a/libcxx/test/std/containers/associative/set/count_transparent.pass.cpp
+++ b/libcxx/test/std/containers/associative/set/count_transparent.pass.cpp
@@ -12,19 +12,13 @@
// class set
-// template<typename K>
-// iterator lower_bound(const K& x); // C++14
-// template<typename K>
-// const_iterator lower_bound(const K& x) const; // C++14
+// template<typename K>
+// size_type count(const K& x) const; // C++14
#include <cassert>
#include <set>
#include <utility>
-#include "min_allocator.h"
-#include "private_constructor.h"
-#include "test_macros.h"
-
struct Comp {
using is_transparent = void;
diff --git a/libcxx/test/std/containers/associative/set/equal_range_transparent.pass.cpp b/libcxx/test/std/containers/associative/set/equal_range_transparent.pass.cpp
index 1f4f031ec791..e4b7833910a1 100644
--- a/libcxx/test/std/containers/associative/set/equal_range_transparent.pass.cpp
+++ b/libcxx/test/std/containers/associative/set/equal_range_transparent.pass.cpp
@@ -23,10 +23,6 @@
#include <set>
#include <utility>
-#include "min_allocator.h"
-#include "private_constructor.h"
-#include "test_macros.h"
-
struct Comp {
using is_transparent = void;
More information about the libcxx-commits
mailing list