[libc++] Removes unneeded <iterator> includes.

Reviewed By: #libc, philnik Differential Revision: https://reviews.llvm.org/D127675
llvm · Jun 15, 2022 · 4cd04d1 · 4cd04d1
1 parent 6834803
commit 4cd04d1
Show file tree

Hide file tree

Showing 21 changed files with 4 additions and 19 deletions.
diff --git a/libcxx/docs/ReleaseNotes.rst b/libcxx/docs/ReleaseNotes.rst
@@ -99,6 +99,7 @@ API Changes
     - ``<chrono>``
     - ``<exception>``
     - ``<functional>``
+    - ``<iterator>``
     - ``<new>``
     - ``<typeinfo>``
     - ``<utility>``

diff --git a/libcxx/include/algorithm b/libcxx/include/algorithm
@@ -1068,7 +1068,6 @@ template <class BidirectionalIterator, class Compare>
 #include <cstddef>
 #include <cstring>
 #include <initializer_list>
-#include <iterator> // TODO: Remove this include
 #include <memory>
 #include <type_traits>
 #include <version>

diff --git a/libcxx/include/array b/libcxx/include/array
@@ -120,7 +120,6 @@ template <size_t I, class T, size_t N> const T&& get(const array<T, N>&&) noexce
 #include <__utility/move.h>
 #include <__utility/unreachable.h>
 #include <compare>
-#include <iterator> // TODO: Remove this include
 #include <stdexcept>
 #include <type_traits>
 #include <version>

diff --git a/libcxx/include/deque b/libcxx/include/deque
@@ -182,7 +182,6 @@ template <class T, class Allocator, class Predicate>
 #include <__utility/swap.h>
 #include <compare>
 #include <initializer_list>
-#include <iterator> // TODO: Remove this include
 #include <limits>
 #include <stdexcept>
 #include <type_traits>

diff --git a/libcxx/include/ext/hash_map b/libcxx/include/ext/hash_map
@@ -207,7 +207,6 @@ template <class Key, class T, class Hash, class Pred, class Alloc>
 #include <algorithm>
 #include <ext/__hash>
 #include <functional>
-#include <iterator> // TODO: Remove this include
 #include <stdexcept>
 #include <type_traits>
 

diff --git a/libcxx/include/ext/hash_set b/libcxx/include/ext/hash_set
@@ -198,7 +198,6 @@ template <class Value, class Hash, class Pred, class Alloc>
 #include <algorithm>
 #include <ext/__hash>
 #include <functional>
-#include <iterator> // TODO: Remove this include
 
 #if defined(__DEPRECATED) && __DEPRECATED
 #if defined(_LIBCPP_WARNING)

diff --git a/libcxx/include/format b/libcxx/include/format
@@ -157,6 +157,7 @@ namespace std {
 #include <__format/formatter_pointer.h>
 #include <__format/formatter_string.h>
 #include <__format/parser_std_format_spec.h>
+#include <__iterator/back_insert_iterator.h>
 #include <__iterator/incrementable_traits.h>
 #include <__variant/monostate.h>
 #include <array>

diff --git a/libcxx/include/forward_list b/libcxx/include/forward_list
@@ -190,7 +190,6 @@ template <class T, class Allocator, class Predicate>
 #include <__iterator/next.h>
 #include <__utility/forward.h>
 #include <initializer_list>
-#include <iterator> // TODO: Remove this include
 #include <limits>
 #include <memory>
 #include <type_traits>

diff --git a/libcxx/include/list b/libcxx/include/list
@@ -198,7 +198,6 @@ template <class T, class Allocator, class Predicate>
 #include <__utility/move.h>
 #include <__utility/swap.h>
 #include <initializer_list>
-#include <iterator> // TODO: Remove this include
 #include <limits>
 #include <memory>
 #include <type_traits>

diff --git a/libcxx/include/locale b/libcxx/include/locale
@@ -208,7 +208,6 @@ template <class charT> class messages_byname;
 #include <cstdlib>
 #include <ctime>
 #include <ios>
-#include <iterator> // TODO: Remove this include
 #include <limits>
 #include <memory>
 #include <streambuf>

diff --git a/libcxx/include/map b/libcxx/include/map
@@ -544,7 +544,6 @@ erase_if(multimap<Key, T, Compare, Allocator>& c, Predicate pred);  // C++20
 #include <__utility/swap.h>
 #include <compare>
 #include <initializer_list>
-#include <iterator> // TODO: Remove this include
 #include <memory>
 #include <type_traits>
 #include <version>

diff --git a/libcxx/include/memory b/libcxx/include/memory
@@ -864,7 +864,6 @@ template<size_t N, class T>
 #include <cstdint>
 #include <cstring>
 #include <iosfwd>
-#include <iterator> // TODO: Remove this include
 #include <new>
 #include <stdexcept>
 #include <tuple>

diff --git a/libcxx/include/numeric b/libcxx/include/numeric
@@ -147,7 +147,6 @@ template<class T>
 #include <__assert> // all public C++ headers provide the assertion handler
 #include <__config>
 #include <cmath> // for isnormal
-#include <iterator> // TODO: Remove this include
 #include <version>
 
 #include <__numeric/accumulate.h>

diff --git a/libcxx/include/ostream b/libcxx/include/ostream
@@ -138,7 +138,6 @@ template <class Stream, class T>
 #include <__config>
 #include <bitset>
 #include <ios>
-#include <iterator> // TODO: Remove this include
 #include <locale>
 #include <streambuf>
 #include <version>

diff --git a/libcxx/include/regex b/libcxx/include/regex
@@ -775,7 +775,6 @@ typedef regex_token_iterator<wstring::const_iterator> wsregex_token_iterator;
 #include <compare>
 #include <deque>
 #include <initializer_list>
-#include <iterator> // TODO: Remove this include
 #include <memory>
 #include <stdexcept>
 #include <string>

diff --git a/libcxx/include/set b/libcxx/include/set
@@ -485,7 +485,6 @@ erase_if(multiset<Key, Compare, Allocator>& c, Predicate pred);  // C++20
 #include <__utility/forward.h>
 #include <compare>
 #include <initializer_list>
-#include <iterator> // TODO: Remove this include
 #include <version>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)

diff --git a/libcxx/include/span b/libcxx/include/span
@@ -132,7 +132,9 @@ template<class R>
 #include <__debug>
 #include <__fwd/span.h>
 #include <__iterator/concepts.h>
+#include <__iterator/data.h>
 #include <__iterator/iterator_traits.h>
+#include <__iterator/size.h>
 #include <__iterator/wrap_iter.h>
 #include <__memory/pointer_traits.h>
 #include <__ranges/concepts.h>
@@ -143,7 +145,6 @@ template<class R>
 #include <__utility/forward.h>
 #include <array>        // for array
 #include <cstddef>      // for byte
-#include <iterator> // TODO: Remove this include
 #include <limits>
 #include <type_traits>  // for remove_cv, etc
 #include <version>

diff --git a/libcxx/include/string b/libcxx/include/string
@@ -546,7 +546,6 @@ basic_string<char32_t> operator "" s( const char32_t *str, size_t len );
 #include <cstring>
 #include <initializer_list>
 #include <iosfwd>
-#include <iterator> // TODO: Remove this include
 #include <limits>
 #include <memory>
 #include <stdexcept>

diff --git a/libcxx/include/string_view b/libcxx/include/string_view
@@ -214,7 +214,6 @@ namespace std {
 #include <__string/char_traits.h>
 #include <compare>
 #include <iosfwd>
-#include <iterator> // TODO: Remove this include
 #include <limits>
 #include <stdexcept>
 #include <type_traits>

diff --git a/libcxx/include/unordered_map b/libcxx/include/unordered_map
@@ -528,7 +528,6 @@ template <class Key, class T, class Hash, class Pred, class Alloc>
 #include <__node_handle>
 #include <__utility/forward.h>
 #include <compare>
-#include <iterator> // TODO: Remove this include
 #include <stdexcept>
 #include <tuple>
 #include <version>

diff --git a/libcxx/include/unordered_set b/libcxx/include/unordered_set
@@ -473,7 +473,6 @@ template <class Value, class Hash, class Pred, class Alloc>
 #include <__node_handle>
 #include <__utility/forward.h>
 #include <compare>
-#include <iterator> // TODO: Remove this include
 #include <version>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)