From 4cd04d1687f1096990119304a3eb22081ab4bb29 Mon Sep 17 00:00:00 2001 From: Mark de Wever Date: Mon, 13 Jun 2022 20:05:36 +0200 Subject: [PATCH] [libc++] Removes unneeded includes. Reviewed By: #libc, philnik Differential Revision: https://reviews.llvm.org/D127675 --- libcxx/docs/ReleaseNotes.rst | 1 + libcxx/include/algorithm | 1 - libcxx/include/array | 1 - libcxx/include/deque | 1 - libcxx/include/ext/hash_map | 1 - libcxx/include/ext/hash_set | 1 - libcxx/include/format | 1 + libcxx/include/forward_list | 1 - libcxx/include/list | 1 - libcxx/include/locale | 1 - libcxx/include/map | 1 - libcxx/include/memory | 1 - libcxx/include/numeric | 1 - libcxx/include/ostream | 1 - libcxx/include/regex | 1 - libcxx/include/set | 1 - libcxx/include/span | 3 ++- libcxx/include/string | 1 - libcxx/include/string_view | 1 - libcxx/include/unordered_map | 1 - libcxx/include/unordered_set | 1 - 21 files changed, 4 insertions(+), 19 deletions(-) diff --git a/libcxx/docs/ReleaseNotes.rst b/libcxx/docs/ReleaseNotes.rst index bae9567893d2..d2084aeab7da 100644 --- a/libcxx/docs/ReleaseNotes.rst +++ b/libcxx/docs/ReleaseNotes.rst @@ -99,6 +99,7 @@ API Changes - ```` - ```` - ```` + - ```` - ```` - ```` - ```` diff --git a/libcxx/include/algorithm b/libcxx/include/algorithm index 0a9513ffb558..8b82ea5b2e1a 100644 --- a/libcxx/include/algorithm +++ b/libcxx/include/algorithm @@ -1068,7 +1068,6 @@ template #include #include #include -#include // TODO: Remove this include #include #include #include diff --git a/libcxx/include/array b/libcxx/include/array index 425885385342..a058f423174e 100644 --- a/libcxx/include/array +++ b/libcxx/include/array @@ -120,7 +120,6 @@ template const T&& get(const array&&) noexce #include <__utility/move.h> #include <__utility/unreachable.h> #include -#include // TODO: Remove this include #include #include #include diff --git a/libcxx/include/deque b/libcxx/include/deque index 559de77f070d..e0a0ef00b1d9 100644 --- a/libcxx/include/deque +++ b/libcxx/include/deque @@ -182,7 +182,6 @@ template #include <__utility/swap.h> #include #include -#include // TODO: Remove this include #include #include #include diff --git a/libcxx/include/ext/hash_map b/libcxx/include/ext/hash_map index eec8a8ad9992..92572c08c24c 100644 --- a/libcxx/include/ext/hash_map +++ b/libcxx/include/ext/hash_map @@ -207,7 +207,6 @@ template #include #include #include -#include // TODO: Remove this include #include #include diff --git a/libcxx/include/ext/hash_set b/libcxx/include/ext/hash_set index 4b68bec43680..eb6193940668 100644 --- a/libcxx/include/ext/hash_set +++ b/libcxx/include/ext/hash_set @@ -198,7 +198,6 @@ template #include #include #include -#include // TODO: Remove this include #if defined(__DEPRECATED) && __DEPRECATED #if defined(_LIBCPP_WARNING) diff --git a/libcxx/include/format b/libcxx/include/format index b60a6aaa6815..c88206666096 100644 --- 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 diff --git a/libcxx/include/forward_list b/libcxx/include/forward_list index 3dd0308c22c6..e34fa790ad9c 100644 --- a/libcxx/include/forward_list +++ b/libcxx/include/forward_list @@ -190,7 +190,6 @@ template #include <__iterator/next.h> #include <__utility/forward.h> #include -#include // TODO: Remove this include #include #include #include diff --git a/libcxx/include/list b/libcxx/include/list index 2ad428a23c1d..9c646561f709 100644 --- a/libcxx/include/list +++ b/libcxx/include/list @@ -198,7 +198,6 @@ template #include <__utility/move.h> #include <__utility/swap.h> #include -#include // TODO: Remove this include #include #include #include diff --git a/libcxx/include/locale b/libcxx/include/locale index 9d58be472477..b95a64168777 100644 --- a/libcxx/include/locale +++ b/libcxx/include/locale @@ -208,7 +208,6 @@ template class messages_byname; #include #include #include -#include // TODO: Remove this include #include #include #include diff --git a/libcxx/include/map b/libcxx/include/map index 33d83591ed82..36a99037b6f9 100644 --- a/libcxx/include/map +++ b/libcxx/include/map @@ -544,7 +544,6 @@ erase_if(multimap& c, Predicate pred); // C++20 #include <__utility/swap.h> #include #include -#include // TODO: Remove this include #include #include #include diff --git a/libcxx/include/memory b/libcxx/include/memory index f69fc4d67dda..d0bb99933d25 100644 --- a/libcxx/include/memory +++ b/libcxx/include/memory @@ -864,7 +864,6 @@ template #include #include #include -#include // TODO: Remove this include #include #include #include diff --git a/libcxx/include/numeric b/libcxx/include/numeric index 4b142756e5df..809838b21071 100644 --- a/libcxx/include/numeric +++ b/libcxx/include/numeric @@ -147,7 +147,6 @@ template #include <__assert> // all public C++ headers provide the assertion handler #include <__config> #include // for isnormal -#include // TODO: Remove this include #include #include <__numeric/accumulate.h> diff --git a/libcxx/include/ostream b/libcxx/include/ostream index 9679e42b318d..aa4c8c3d8792 100644 --- a/libcxx/include/ostream +++ b/libcxx/include/ostream @@ -138,7 +138,6 @@ template #include <__config> #include #include -#include // TODO: Remove this include #include #include #include diff --git a/libcxx/include/regex b/libcxx/include/regex index a6ad7d625a52..88acb5554e85 100644 --- a/libcxx/include/regex +++ b/libcxx/include/regex @@ -775,7 +775,6 @@ typedef regex_token_iterator wsregex_token_iterator; #include #include #include -#include // TODO: Remove this include #include #include #include diff --git a/libcxx/include/set b/libcxx/include/set index fb29e4dbc4f8..7cd4fe21ee0e 100644 --- a/libcxx/include/set +++ b/libcxx/include/set @@ -485,7 +485,6 @@ erase_if(multiset& c, Predicate pred); // C++20 #include <__utility/forward.h> #include #include -#include // TODO: Remove this include #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/span b/libcxx/include/span index 023e62778414..e60f22a1c881 100644 --- a/libcxx/include/span +++ b/libcxx/include/span @@ -132,7 +132,9 @@ template #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 #include <__utility/forward.h> #include // for array #include // for byte -#include // TODO: Remove this include #include #include // for remove_cv, etc #include diff --git a/libcxx/include/string b/libcxx/include/string index fa939af8123d..47cccc7320f3 100644 --- a/libcxx/include/string +++ b/libcxx/include/string @@ -546,7 +546,6 @@ basic_string operator "" s( const char32_t *str, size_t len ); #include #include #include -#include // TODO: Remove this include #include #include #include diff --git a/libcxx/include/string_view b/libcxx/include/string_view index 9e60bae22b06..851cbf776504 100644 --- a/libcxx/include/string_view +++ b/libcxx/include/string_view @@ -214,7 +214,6 @@ namespace std { #include <__string/char_traits.h> #include #include -#include // TODO: Remove this include #include #include #include diff --git a/libcxx/include/unordered_map b/libcxx/include/unordered_map index 4fc068d6e696..cf51ca0fdbf0 100644 --- a/libcxx/include/unordered_map +++ b/libcxx/include/unordered_map @@ -528,7 +528,6 @@ template #include <__node_handle> #include <__utility/forward.h> #include -#include // TODO: Remove this include #include #include #include diff --git a/libcxx/include/unordered_set b/libcxx/include/unordered_set index 48c6ff48df30..d12185a9061f 100644 --- a/libcxx/include/unordered_set +++ b/libcxx/include/unordered_set @@ -473,7 +473,6 @@ template #include <__node_handle> #include <__utility/forward.h> #include -#include // TODO: Remove this include #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)