Merge 866373b into 1016250

.inshpect.toml

@@ -337,6 +337,7 @@ patterns = [
     { pattern = '\bstd::any(|_cast)\b', include = 'any' },
     { pattern = '\bstd::error_(code|condition|category)\b', include = 'system_error' },
     { pattern = '\bstd::system_error\b', include = 'system_error' },
+    { pattern = '\bstd::chrono\b', include = 'chrono' },
     { pattern = '\bpika::intrusive_ptr\b', include = 'pika/memory/intrusive_ptr.hpp' },
     { pattern = '\bpika::detail::from_string\b', include = 'pika/string_util/from_string.hpp' },
     { pattern = '\bpika::detail::to_string\b', include = 'pika/string_util/to_string.hpp' },

examples/1d_stencil/1d_stencil_1.cpp

@@ -14,6 +14,7 @@
 #include <pika/chrono.hpp>
 #include <pika/init.hpp>
 
+#include <chrono>
 #include <cstddef>
 #include <cstdint>
 #include <iostream>

examples/1d_stencil/1d_stencil_2.cpp

@@ -23,6 +23,7 @@
 #include <pika/future.hpp>
 #include <pika/init.hpp>
 
+#include <chrono>
 #include <cstddef>
 #include <cstdint>
 #include <iostream>

examples/1d_stencil/1d_stencil_3.cpp

@@ -18,6 +18,7 @@
 #include <pika/future.hpp>
 #include <pika/init.hpp>
 
+#include <chrono>
 #include <cstddef>
 #include <cstdint>
 #include <iostream>

examples/balancing/thread_phase.cpp

@@ -5,7 +5,7 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <pika/barrier.hpp>
-#include <pika/functional.hpp>
+#include <pika/functional/bind.hpp>
 #include <pika/init.hpp>
 #include <pika/mutex.hpp>
 #include <pika/thread.hpp>

examples/jacobi_smp/jacobi_nonuniform_pika.cpp

@@ -8,9 +8,10 @@
 #include "jacobi_nonuniform.hpp"
 
 #include <pika/chrono.hpp>
-#include <pika/functional.hpp>
+#include <pika/functional/bind.hpp>
 #include <pika/future.hpp>
 
+#include <chrono>
 #include <cstddef>
 #include <functional>
 #include <iostream>

examples/jacobi_smp/jacobi_omp.hpp

@@ -6,8 +6,9 @@
 
 #pragma once
 
-#include <pika/chrono.hpp>
+#include <pika/timing/high_resolution_timer.hpp>
 
+#include <chrono>
 #include <cstddef>
 #include <cstdint>
 #include <memory>

examples/jacobi_smp/jacobi_pika.cpp

@@ -10,6 +10,7 @@
 #include <pika/chrono.hpp>
 #include <pika/future.hpp>
 
+#include <chrono>
 #include <cstddef>
 #include <functional>
 #include <memory>

examples/quickstart/fibonacci.cpp

@@ -18,6 +18,7 @@
 #include <fmt/ostream.h>
 #include <fmt/printf.h>
 
+#include <chrono>
 #include <cstdint>
 #include <iostream>
 

examples/quickstart/fibonacci_await.cpp

@@ -9,14 +9,14 @@
 // http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3564.pdf). The
 // necessary transformations are performed by hand.
 
-#include <pika/chrono.hpp>
-#include <pika/functional.hpp>
+#include <pika/functional/bind.hpp>
 #include <pika/future.hpp>
 #include <pika/init.hpp>
 
 #include <fmt/ostream.h>
 #include <fmt/printf.h>
 
+#include <chrono>
 #include <cstddef>
 #include <cstdint>
 #include <iostream>

examples/quickstart/fibonacci_dataflow.cpp

@@ -17,6 +17,7 @@
 #include <fmt/ostream.h>
 #include <fmt/printf.h>
 
+#include <chrono>
 #include <cstdint>
 #include <iostream>
 #include <string>

examples/quickstart/fibonacci_futures.cpp

@@ -14,6 +14,7 @@
 #include <fmt/ostream.h>
 #include <fmt/printf.h>
 
+#include <chrono>
 #include <cstddef>
 #include <cstdint>
 #include <iostream>

libs/pika/async_combinators/tests/unit/when_any_std_array.cpp

@@ -14,6 +14,7 @@
 #include <pika/thread.hpp>
 
 #include <array>
+#include <chrono>
 #include <string>
 #include <thread>
 #include <utility>

libs/pika/async_combinators/tests/unit/when_some_std_array.cpp

@@ -14,6 +14,7 @@
 #include <pika/thread.hpp>
 
 #include <array>
+#include <chrono>
 #include <string>
 #include <thread>
 #include <utility>

libs/pika/async_cuda/tests/performance/cuda_scheduler_throughput.cpp

@@ -27,6 +27,7 @@
 #include <whip.hpp>
 
 #include <algorithm>
+#include <chrono>
 #include <cmath>
 #include <cstddef>
 #include <iostream>

libs/pika/async_cuda/tests/unit/cublas_matmul.cpp

@@ -29,13 +29,14 @@
 #include <pika/chrono.hpp>
 #include <pika/cuda.hpp>
 #include <pika/execution.hpp>
-#include <pika/functional.hpp>
+#include <pika/functional/bind_front.hpp>
 #include <pika/init.hpp>
 #include <pika/testing.hpp>
 
 #include <whip.hpp>
 
 #include <algorithm>
+#include <chrono>
 #include <cmath>
 #include <cstddef>
 #include <iostream>

libs/pika/async_cuda/tests/unit/cuda_sender.cu

@@ -6,7 +6,7 @@
 
 #include <pika/cuda.hpp>
 #include <pika/execution.hpp>
-#include <pika/functional.hpp>
+#include <pika/functional/bind_front.hpp>
 #include <pika/init.hpp>
 #include <pika/testing.hpp>
 

libs/pika/execution/include/pika/execution/executors/auto_chunk_size.hpp

@@ -16,6 +16,7 @@
 #include <pika/execution_base/execution.hpp>
 
 #include <algorithm>
+#include <chrono>
 #include <cstddef>
 #include <cstdint>
 #include <type_traits>

libs/pika/execution/include/pika/execution/executors/persistent_auto_chunk_size.hpp

@@ -13,6 +13,7 @@
 #include <pika/modules/timing.hpp>
 
 #include <algorithm>
+#include <chrono>
 #include <cstddef>
 #include <cstdint>
 #include <type_traits>

libs/pika/execution_base/tests/unit/basic_sender.cpp

@@ -6,7 +6,6 @@
 
 #include <pika/execution_base/receiver.hpp>
 #include <pika/execution_base/sender.hpp>
-#include <pika/modules/functional.hpp>
 #include <pika/testing.hpp>
 
 #include <cstddef>

libs/pika/executors/tests/unit/thread_pool_scheduler.cpp

@@ -6,7 +6,6 @@
 
 #include <pika/condition_variable.hpp>
 #include <pika/execution.hpp>
-#include <pika/functional.hpp>
 #include <pika/init.hpp>
 #include <pika/mutex.hpp>
 #include <pika/testing.hpp>

libs/pika/functional/tests/regressions/bind_sfinae_5488.cpp

@@ -6,7 +6,7 @@
 
 // #5488: pika::util::detail::bind doesn't bounds-check placeholders
 
-#include <pika/modules/functional.hpp>
+#include <pika/functional/bind.hpp>
 
 #include <type_traits>
 

libs/pika/functional/tests/unit/function_object_size.cpp

@@ -6,7 +6,7 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <pika/modules/functional.hpp>
+#include <pika/functional/function.hpp>
 #include <pika/testing.hpp>
 
 #include <cstdint>

libs/pika/futures/src/future_data.cpp

@@ -20,6 +20,7 @@
 #include <pika/threading_base/annotated_function.hpp>
 
 #include <atomic>
+#include <chrono>
 #include <cstddef>
 #include <exception>
 #include <functional>

libs/pika/include/docs/index.rst

@@ -12,8 +12,7 @@ include
 =============
 
 This module provides no functionality in itself. Instead it provides headers
-that group together other headers that often appear together. This module
-provides local-only headers.
+that group together other headers that often appear together.
 
 See the :ref:`API reference <modules_include_api>` of this module for
 more details.

libs/pika/include/include/pika/chrono.hpp

@@ -6,5 +6,4 @@
 
 #pragma once
 
-#include <pika/timing/high_resolution_timer.hpp>
 #include <pika/timing/steady_clock.hpp>

libs/pika/include/include/pika/functional.hpp

@@ -6,21 +6,5 @@
 
 #pragma once
 
-#include <pika/functional/bind.hpp>
-#include <pika/functional/bind_back.hpp>
-#include <pika/functional/bind_front.hpp>
-#include <pika/functional/function.hpp>
-#include <pika/functional/invoke.hpp>
-#include <pika/functional/invoke_fused.hpp>
-#include <pika/functional/traits/is_bind_expression.hpp>
-#include <pika/functional/unique_function.hpp>
 #include <pika/threading_base/annotated_function.hpp>
 #include <pika/threading_base/scoped_annotation.hpp>
-
-namespace pika {
-    using pika::detail::is_bind_expression;
-    using pika::util::detail::function;
-    using pika::util::detail::invoke;
-    using pika::util::detail::invoke_fused;
-    using pika::util::detail::unique_function;
-}    // namespace pika

libs/pika/include/include/pika/stop_token.hpp

@@ -8,5 +8,3 @@
 
 #include <pika/config.hpp>
 #include <pika/synchronization/stop_token.hpp>
-
-// C++20 stop_token

libs/pika/lcos/tests/unit/dataflow_external_future.cpp

@@ -9,14 +9,15 @@
 #include <pika/chrono.hpp>
 #include <pika/errors/try_catch_exception_ptr.hpp>
 #include <pika/execution.hpp>
-#include <pika/functional.hpp>
+#include <pika/functional/invoke.hpp>
 #include <pika/future.hpp>
 #include <pika/init.hpp>
 #include <pika/memory/intrusive_ptr.hpp>
 #include <pika/program_options.hpp>
 #include <pika/testing.hpp>
 
 #include <atomic>
+#include <chrono>
 #include <cstddef>
 #include <cstdint>
 #include <exception>
@@ -41,15 +42,15 @@ struct external_future_executor
     decltype(auto) async_execute_helper(std::true_type, F&& f, Ts&&... ts)
     {
         // The completion of f is signalled out-of-band.
-        pika::invoke(std::forward<F>(f), std::forward<Ts>(ts)...);
+        pika::util::detail::invoke(std::forward<F>(f), std::forward<Ts>(ts)...);
         return pika::async([]() { pika::util::yield_while([]() { return !done; }); });
     }
 
     template <typename F, typename... Ts>
     decltype(auto) async_execute_helper(std::false_type, F&& f, Ts&&... ts)
     {
         // The completion of f is signalled out-of-band.
-        auto&& r = pika::invoke(std::forward<F>(f), std::forward<Ts>(ts)...);
+        auto&& r = pika::util::detail::invoke(std::forward<F>(f), std::forward<Ts>(ts)...);
         return pika::async([r = std::move(r)]() {
             pika::util::yield_while([]() { return !done; });
             return r;
@@ -123,15 +124,17 @@ struct external_future_additional_argument_executor
     decltype(auto) async_execute_helper(std::true_type, F&& f, Ts&&... ts)
     {
         // The completion of f is signalled out-of-band.
-        pika::invoke(std::forward<F>(f), additional_argument{}, std::forward<Ts>(ts)...);
+        pika::util::detail::invoke(
+            std::forward<F>(f), additional_argument{}, std::forward<Ts>(ts)...);
         return pika::async([]() { pika::util::yield_while([]() { return !done; }); });
     }
 
     template <typename F, typename... Ts>
     decltype(auto) async_execute_helper(std::false_type, F&& f, Ts&&... ts)
     {
         // The completion of f is signalled out-of-band.
-        auto&& r = pika::invoke(std::forward<F>(f), additional_argument{}, std::forward<Ts>(ts)...);
+        auto&& r = pika::util::detail::invoke(
+            std::forward<F>(f), additional_argument{}, std::forward<Ts>(ts)...);
         return pika::async([r = std::move(r)]() {
             pika::util::yield_while([]() { return !done; });
             return r;

libs/pika/resource_partitioner/tests/unit/async_customization.cpp

@@ -8,7 +8,8 @@
 
 #include <pika/debugging/demangle_helper.hpp>
 #include <pika/execution.hpp>
-#include <pika/functional.hpp>
+#include <pika/functional/deferred_call.hpp>
+#include <pika/functional/invoke_fused.hpp>
 #include <pika/future.hpp>
 #include <pika/init.hpp>
 #include <pika/modules/resource_partitioner.hpp>

libs/pika/resource_partitioner/tests/unit/cross_pool_injection.cpp

@@ -14,7 +14,7 @@
 // problems such as lockups.
 
 #include <pika/execution.hpp>
-#include <pika/functional.hpp>
+#include <pika/functional/bind_back.hpp>
 #include <pika/future.hpp>
 #include <pika/init.hpp>
 #include <pika/modules/resource_partitioner.hpp>
@@ -23,6 +23,7 @@
 #include <pika/thread.hpp>
 
 #include <atomic>
+#include <chrono>
 #include <cstddef>
 #include <iostream>
 #include <random>

libs/pika/resource_partitioner/tests/unit/scheduler_binding_check.cpp

@@ -19,6 +19,7 @@
 #include <pika/thread.hpp>
 
 #include <atomic>
+#include <chrono>
 #include <cstddef>
 #include <cstdint>
 #include <iostream>

libs/pika/resource_partitioner/tests/unit/scheduler_priority_check.cpp

@@ -18,6 +18,7 @@
 #include <pika/threading_base/annotated_function.hpp>
 
 #include <atomic>
+#include <chrono>
 #include <cstddef>
 #include <iostream>
 #include <string>

libs/pika/synchronization/tests/performance/channel_mpmc_throughput.cpp

@@ -12,6 +12,7 @@
 #include <pika/synchronization/channel_mpmc.hpp>
 #include <pika/thread.hpp>
 
+#include <chrono>
 #include <cstddef>
 #include <cstdint>
 #include <functional>

libs/pika/synchronization/tests/performance/channel_mpsc_throughput.cpp

@@ -12,6 +12,7 @@
 #include <pika/synchronization/channel_mpsc.hpp>
 #include <pika/thread.hpp>
 
+#include <chrono>
 #include <cstddef>
 #include <cstdint>
 #include <functional>

libs/pika/synchronization/tests/performance/channel_spsc_throughput.cpp

@@ -12,6 +12,7 @@
 #include <pika/synchronization/channel_spsc.hpp>
 #include <pika/thread.hpp>
 
+#include <chrono>
 #include <cstddef>
 #include <cstdint>
 #include <functional>

libs/pika/thread_manager/src/thread_manager.cpp

@@ -12,6 +12,7 @@
 #include <pika/assert.hpp>
 #include <pika/async_combinators/wait_all.hpp>
 #include <pika/execution_base/this_thread.hpp>
+#include <pika/functional/bind.hpp>
 #include <pika/futures/future.hpp>
 #include <pika/modules/errors.hpp>
 #include <pika/modules/logging.hpp>