[libc++] Granularize <functional> includes
Reviewed By: Mordante, #libc
Spies: libcxx-commits, miyuki
Differential Revision: https://reviews.llvm.org/D123912
NOKEYCHECK=True
GitOrigin-RevId: faef447e72a5c63dfb12bb7b02d44c3c916d31cd
diff --git a/include/__ranges/join_view.h b/include/__ranges/join_view.h
index 1a1dfad..b95db5b 100644
--- a/include/__ranges/join_view.h
+++ b/include/__ranges/join_view.h
@@ -9,8 +9,15 @@
#ifndef _LIBCPP___RANGES_JOIN_VIEW_H
#define _LIBCPP___RANGES_JOIN_VIEW_H
+#include <__concepts/constructible.h>
+#include <__concepts/convertible_to.h>
+#include <__concepts/copyable.h>
+#include <__concepts/derived_from.h>
+#include <__concepts/equality_comparable.h>
#include <__config>
#include <__iterator/concepts.h>
+#include <__iterator/iter_move.h>
+#include <__iterator/iter_swap.h>
#include <__iterator/iterator_traits.h>
#include <__ranges/access.h>
#include <__ranges/all.h>
diff --git a/include/algorithm b/include/algorithm
index 9feb59b..ff2a54e 100644
--- a/include/algorithm
+++ b/include/algorithm
@@ -881,7 +881,7 @@
#include <__debug>
#include <cstddef>
#include <cstring>
-#include <functional>
+#include <functional> // TODO: Remove this include
#include <initializer_list>
#include <iterator>
#include <memory>
diff --git a/include/experimental/coroutine b/include/experimental/coroutine
index e94450b..50c7fcf 100644
--- a/include/experimental/coroutine
+++ b/include/experimental/coroutine
@@ -46,9 +46,10 @@
*/
#include <__assert> // all public C++ headers provide the assertion handler
+#include <__functional/hash.h>
#include <cstddef>
#include <experimental/__config>
-#include <functional>
+#include <functional> // TODO: Remove this include
#include <memory> // for hash<T*>
#include <new>
#include <type_traits>
diff --git a/include/experimental/propagate_const b/include/experimental/propagate_const
index 7c9b783..2ed17c7 100644
--- a/include/experimental/propagate_const
+++ b/include/experimental/propagate_const
@@ -108,10 +108,12 @@
*/
#include <__assert> // all public C++ headers provide the assertion handler
+#include <__functional/operations.h>
+#include <__utility/forward.h>
#include <__utility/move.h>
#include <__utility/swap.h>
#include <experimental/__config>
-#include <functional>
+#include <functional> // TODO: Remove this include
#include <type_traits>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
diff --git a/include/experimental/simd b/include/experimental/simd
index 7fa185f..cf255b8 100644
--- a/include/experimental/simd
+++ b/include/experimental/simd
@@ -650,10 +650,12 @@
*/
#include <__assert> // all public C++ headers provide the assertion handler
+#include <__functional/operations.h>
#include <array>
#include <cstddef>
#include <experimental/__config>
-#include <functional>
+#include <functional> // TODO: Remove this include
+#include <tuple>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header
diff --git a/include/ext/hash_map b/include/ext/hash_map
index 92572c0..7919878 100644
--- a/include/ext/hash_map
+++ b/include/ext/hash_map
@@ -206,7 +206,7 @@
#include <__hash_table>
#include <algorithm>
#include <ext/__hash>
-#include <functional>
+#include <functional> // TODO: Remove this include
#include <stdexcept>
#include <type_traits>
diff --git a/include/ext/hash_set b/include/ext/hash_set
index eb61939..76631da 100644
--- a/include/ext/hash_set
+++ b/include/ext/hash_set
@@ -197,7 +197,7 @@
#include <__hash_table>
#include <algorithm>
#include <ext/__hash>
-#include <functional>
+#include <functional> // TODO: Remove this include
#if defined(__DEPRECATED) && __DEPRECATED
#if defined(_LIBCPP_WARNING)
diff --git a/include/map b/include/map
index 7371d51..346fa89 100644
--- a/include/map
+++ b/include/map
@@ -539,7 +539,7 @@
#include <__utility/forward.h>
#include <__utility/swap.h>
#include <compare>
-#include <functional>
+#include <functional> // TODO: Remove this include
#include <initializer_list>
#include <iterator> // __libcpp_erase_if_container
#include <memory>
diff --git a/include/mutex b/include/mutex
index a94e3b7..7368887 100644
--- a/include/mutex
+++ b/include/mutex
@@ -192,7 +192,7 @@
#include <__threading_support>
#include <__utility/forward.h>
#include <cstdint>
-#include <functional>
+#include <functional> // TODO: Remove this include
#include <memory>
#ifndef _LIBCPP_CXX03_LANG
# include <tuple>
diff --git a/include/numeric b/include/numeric
index ef96336..d9265da 100644
--- a/include/numeric
+++ b/include/numeric
@@ -147,7 +147,7 @@
#include <__assert> // all public C++ headers provide the assertion handler
#include <__config>
#include <cmath> // for isnormal
-#include <functional>
+#include <functional> // TODO: Remove this include
#include <iterator>
#include <version>
diff --git a/include/optional b/include/optional
index 8dc1a13..48a1a5f 100644
--- a/include/optional
+++ b/include/optional
@@ -162,10 +162,17 @@
#include <__availability>
#include <__concepts/invocable.h>
#include <__config>
+#include <__functional/hash.h>
+#include <__functional/invoke.h>
+#include <__functional/unary_function.h>
+#include <__memory/construct_at.h>
+#include <__tuple>
+#include <__utility/forward.h>
#include <__utility/in_place.h>
+#include <__utility/move.h>
#include <__utility/swap.h>
#include <compare>
-#include <functional>
+#include <functional> // TODO: Remove this include
#include <initializer_list>
#include <new>
#include <stdexcept>
diff --git a/include/queue b/include/queue
index d15c141..4074460 100644
--- a/include/queue
+++ b/include/queue
@@ -227,7 +227,7 @@
#include <__utility/forward.h>
#include <compare>
#include <deque>
-#include <functional>
+#include <functional> // TODO: Remove this include
#include <type_traits>
#include <vector>
#include <version>
diff --git a/include/regex b/include/regex
index 456f34d..5d07874 100644
--- a/include/regex
+++ b/include/regex
@@ -763,6 +763,7 @@
*/
#include <__algorithm/find.h>
+#include <__algorithm/search.h>
#include <__assert> // all public C++ headers provide the assertion handler
#include <__config>
#include <__iterator/wrap_iter.h>
diff --git a/include/set b/include/set
index a2d43cd..baad396 100644
--- a/include/set
+++ b/include/set
@@ -481,7 +481,7 @@
#include <__tree>
#include <__utility/forward.h>
#include <compare>
-#include <functional>
+#include <functional> // TODO: Remove this include
#include <initializer_list>
#include <iterator> // __libcpp_erase_if_container
#include <version>
diff --git a/include/thread b/include/thread
index 540f591..55e6fba 100644
--- a/include/thread
+++ b/include/thread
@@ -90,7 +90,7 @@
#include <__threading_support>
#include <__utility/forward.h>
#include <cstddef>
-#include <functional>
+#include <functional> // TODO: Remove this include
#include <iosfwd>
#include <memory>
#include <system_error>
diff --git a/include/unordered_map b/include/unordered_map
index b7acfc3..9b58995 100644
--- a/include/unordered_map
+++ b/include/unordered_map
@@ -525,7 +525,7 @@
#include <__node_handle>
#include <__utility/forward.h>
#include <compare>
-#include <functional>
+#include <functional> // TODO: Remove this include
#include <iterator> // __libcpp_erase_if_container
#include <stdexcept>
#include <tuple>
diff --git a/include/unordered_set b/include/unordered_set
index f4ec9f5..c3955ba 100644
--- a/include/unordered_set
+++ b/include/unordered_set
@@ -469,7 +469,7 @@
#include <__node_handle>
#include <__utility/forward.h>
#include <compare>
-#include <functional>
+#include <functional> // TODO: Remove this include
#include <iterator> // __libcpp_erase_if_container
#include <version>
diff --git a/include/valarray b/include/valarray
index d79b0b2..fc044f4 100644
--- a/include/valarray
+++ b/include/valarray
@@ -350,9 +350,14 @@
#include <__algorithm/unwrap_iter.h>
#include <__assert> // all public C++ headers provide the assertion handler
#include <__config>
+#include <__functional/operations.h>
+#include <__memory/allocator.h>
+#include <__memory/uninitialized_algorithms.h>
+#include <__utility/move.h>
+#include <__utility/swap.h>
#include <cmath>
#include <cstddef>
-#include <functional>
+#include <functional> // TODO: Remove this include
#include <initializer_list>
#include <new>
#include <version>