[libc++][test][NFC] Remove unused inclusions of <iostream>
#134776
Conversation
Some test files for flat container adaptors redundantly include `<iostream>`. This patch removes the redundant inclusions.
frederick-vs-ja
added
libc++
|
@llvm/pr-subscribers-libcxx Author: A. Jiang (frederick-vs-ja) ChangesSome test files for flat container adaptors redundantly include Full diff: https://github.com/llvm/llvm-project/pull/134776.diff 4 Files Affected:
diff --git a/libcxx/test/std/containers/container.adaptors/flat.map/flat.map.iterators/reverse_iterator.pass.cpp b/libcxx/test/std/containers/container.adaptors/flat.map/flat.map.iterators/reverse_iterator.pass.cpp
index fc3949d70745f..7a111e228c115 100644
--- a/libcxx/test/std/containers/container.adaptors/flat.map/flat.map.iterators/reverse_iterator.pass.cpp
+++ b/libcxx/test/std/containers/container.adaptors/flat.map/flat.map.iterators/reverse_iterator.pass.cpp
@@ -28,7 +28,6 @@
#include <iterator>
#include "test_macros.h"
-#include <iostream>
int main(int, char**) {
{
diff --git a/libcxx/test/std/containers/container.adaptors/flat.multimap/flat.multimap.iterators/reverse_iterator.pass.cpp b/libcxx/test/std/containers/container.adaptors/flat.multimap/flat.multimap.iterators/reverse_iterator.pass.cpp
index 8c1e5451f703f..35b2b9f8a9e7e 100644
--- a/libcxx/test/std/containers/container.adaptors/flat.multimap/flat.multimap.iterators/reverse_iterator.pass.cpp
+++ b/libcxx/test/std/containers/container.adaptors/flat.multimap/flat.multimap.iterators/reverse_iterator.pass.cpp
@@ -30,7 +30,6 @@
#include <iterator>
#include "test_macros.h"
-#include <iostream>
int main(int, char**) {
{
diff --git a/libcxx/test/std/containers/container.adaptors/flat.multiset/flat.multiset.iterators/reverse_iterator.pass.cpp b/libcxx/test/std/containers/container.adaptors/flat.multiset/flat.multiset.iterators/reverse_iterator.pass.cpp
index 9d443ef8784e2..76bd49b4abd9e 100644
--- a/libcxx/test/std/containers/container.adaptors/flat.multiset/flat.multiset.iterators/reverse_iterator.pass.cpp
+++ b/libcxx/test/std/containers/container.adaptors/flat.multiset/flat.multiset.iterators/reverse_iterator.pass.cpp
@@ -28,7 +28,6 @@
#include <iterator>
#include "test_macros.h"
-#include <iostream>
void test() {
{
diff --git a/libcxx/test/std/containers/container.adaptors/flat.set/flat.set.iterators/reverse_iterator.pass.cpp b/libcxx/test/std/containers/container.adaptors/flat.set/flat.set.iterators/reverse_iterator.pass.cpp
index d1e4cef3de19e..a9ef87d483e6f 100644
--- a/libcxx/test/std/containers/container.adaptors/flat.set/flat.set.iterators/reverse_iterator.pass.cpp
+++ b/libcxx/test/std/containers/container.adaptors/flat.set/flat.set.iterators/reverse_iterator.pass.cpp
@@ -28,7 +28,6 @@
#include <iterator>
#include "test_macros.h"
-#include <iostream>
void test() {
{
|
| #include <iterator> | ||
|
|
||
| #include "test_macros.h" | ||
| #include <iostream> |
There was a problem hiding this comment.
The <vector> and <iterator> includes above seem to be unused as well. Probably also the case in the other tests.
There was a problem hiding this comment.
This is somehow tricky. These files don't explicitly write vector but implicitly use vector<T> as default template arguments. Likewise, the reverse iterator types are reverse_iterator specializations, which are guaranteed to be provided in <iterator>.
There was a problem hiding this comment.
We have to provide these things though <flat_map>.
There was a problem hiding this comment.
Oh, I found that these files use std::distance, which is only guaranteed to be available in <iterator> and <ranges>, although transitively introduced by several headers in libc++.
I think we should either keep includes of <iterator> or replace these std::distance calls with operator-.
There was a problem hiding this comment.
When they're used we can keep them.
Error: Command failed due to missing milestone. |
| #include <iterator> | ||
|
|
||
| #include "test_macros.h" | ||
| #include <iostream> |
There was a problem hiding this comment.
When they're used we can keep them.
3 participants
Some test files for flat container adaptors redundantly include
<iostream>and, surprisingly,<cstddef>. This patch removes the redundant inclusions.Inclusions of
<vector>is also removed since a sane implementation is expected to make instantiation offlat_(multi)map<K, V>orflat_(multi)set<K>valid when only<flat_map>or<flat_set>is included.