Update #includes in exec/ and stdexec/ based on clangd symbol uses (N…

…VIDIA#1226) * Update #includes based on clangd symbol uses * Remove #include <coroutine> from files other than coroutine.hpp
caugonnet · Jan 30, 2024 · baeb83e · baeb83e
1 parent 6a6b7ae
commit baeb83e
Show file tree

Hide file tree

Showing 34 changed files with 105 additions and 31 deletions.
diff --git a/include/exec/__detail/__atomic_intrusive_queue.hpp b/include/exec/__detail/__atomic_intrusive_queue.hpp
@@ -18,6 +18,8 @@
 
 #include "../../stdexec/__detail/__intrusive_queue.hpp"
 
+#include <atomic>
+
 namespace exec {
   template <auto _NextPtr>
   class __atomic_intrusive_queue;

diff --git a/include/exec/__detail/__basic_sequence.hpp b/include/exec/__detail/__basic_sequence.hpp
@@ -16,10 +16,12 @@
  */
 #pragma once
 
-#include "../sequence_senders.hpp"
-
+#include "../../stdexec/__detail/__config.hpp"
+#include "../../stdexec/__detail/__meta.hpp"
 #include "../../stdexec/__detail/__basic_sender.hpp"
 
+#include "../sequence_senders.hpp"
+
 namespace exec {
   //////////////////////////////////////////////////////////////////////////////////////////////////
   // __seqexpr

diff --git a/include/exec/__detail/__bit_cast.hpp b/include/exec/__detail/__bit_cast.hpp
@@ -16,6 +16,8 @@
  */
 #pragma once
 
+#include "../../stdexec/__detail/__config.hpp"
+
 #if __has_include(<bit>)
 #include <bit>
 #if __cpp_lib_bit_cast >= 201806L
@@ -26,8 +28,6 @@
 #include <cstring>
 #include <type_traits>
 
-#include "../../stdexec/__detail/__config.hpp"
-
 namespace exec {
 
   template <class _Ty>

diff --git a/include/exec/__detail/__bwos_lifo_queue.hpp b/include/exec/__detail/__bwos_lifo_queue.hpp
@@ -20,6 +20,7 @@
 
 #include <atomic>
 #include <bit>
+#include <cstddef>
 #include <cstdint>
 #include <memory>
 #include <new>

diff --git a/include/exec/__detail/__manual_lifetime.hpp b/include/exec/__detail/__manual_lifetime.hpp
@@ -16,6 +16,8 @@
  */
 #pragma once
 
+#include <cstddef>
+#include <memory>
 #include <type_traits>
 
 namespace exec {

diff --git a/include/exec/__detail/__sender_facade.hpp b/include/exec/__detail/__sender_facade.hpp
@@ -16,6 +16,7 @@
 #pragma once
 
 #include "../../stdexec/execution.hpp"
+#include "../../stdexec/concepts.hpp"
 
 STDEXEC_PRAGMA_PUSH()
 STDEXEC_PRAGMA_IGNORE_EDG(1302)

diff --git a/include/exec/any_sender_of.hpp b/include/exec/any_sender_of.hpp
@@ -15,10 +15,14 @@
  */
 #pragma once
 
+#include "../stdexec/concepts.hpp"
 #include "../stdexec/execution.hpp"
+#include "../stdexec/functional.hpp"
+
 #include "./sequence_senders.hpp"
 
 #include <cstddef>
+#include <utility>
 
 namespace exec {
   namespace __any {

diff --git a/include/exec/async_scope.hpp b/include/exec/async_scope.hpp
@@ -16,9 +16,12 @@
 #pragma once
 
 #include "../stdexec/execution.hpp"
+#include "../stdexec/stop_token.hpp"
 #include "../stdexec/__detail/__intrusive_queue.hpp"
 #include "env.hpp"
 
+#include <mutex>
+
 namespace exec {
   /////////////////////////////////////////////////////////////////////////////
   // async_scope

diff --git a/include/exec/finally.hpp b/include/exec/finally.hpp
@@ -17,6 +17,7 @@
 #pragma once
 
 #include "../stdexec/execution.hpp"
+#include "../stdexec/concepts.hpp"
 
 #include "__detail/__manual_lifetime.hpp"
 

diff --git a/include/exec/linux/memory_mapped_region.hpp b/include/exec/linux/memory_mapped_region.hpp
@@ -16,6 +16,7 @@
  */
 #pragma once
 
+#include <cstddef>
 #include <cstdint>
 
 namespace exec {

diff --git a/include/exec/materialize.hpp b/include/exec/materialize.hpp
@@ -16,7 +16,9 @@
  */
 #pragma once
 
-#include <stdexec/execution.hpp>
+#include "../stdexec/execution.hpp"
+#include "../stdexec/concepts.hpp"
+
 
 namespace exec {
   namespace __materialize {

diff --git a/include/exec/on_coro_disposition.hpp b/include/exec/on_coro_disposition.hpp
@@ -18,14 +18,15 @@
 
 // The original idea is taken from libunifex and adapted to stdexec.
 
-#include <exception>
-#include <type_traits>
-
 #include "../stdexec/execution.hpp"
+#include "../stdexec/coroutine.hpp"
 #include "task.hpp"
 #include "inline_scheduler.hpp"
 #include "any_sender_of.hpp"
 
+#include <exception>
+#include <type_traits>
+
 namespace exec {
   namespace __on_coro_disp {
     using namespace stdexec;

diff --git a/include/exec/repeat_n.hpp b/include/exec/repeat_n.hpp
@@ -28,6 +28,7 @@
 
 #include <atomic>
 #include <concepts>
+#include <cstddef>
 
 namespace exec {
   namespace __repeat_n {

diff --git a/include/exec/sequence/any_sequence_of.hpp b/include/exec/sequence/any_sequence_of.hpp
@@ -16,6 +16,9 @@
  */
 #pragma once
 
+#include "../../stdexec/concepts.hpp"
+#include "../../stdexec/execution.hpp"
+#include "../sequence_senders.hpp"
 #include "../any_sender_of.hpp"
 
 namespace exec {

diff --git a/include/exec/sequence/empty_sequence.hpp b/include/exec/sequence/empty_sequence.hpp
@@ -16,6 +16,8 @@
  */
 #pragma once
 
+#include "../../stdexec/concepts.hpp"
+#include "../../stdexec/execution.hpp"
 #include "../sequence_senders.hpp"
 
 namespace exec {

diff --git a/include/exec/sequence/ignore_all_values.hpp b/include/exec/sequence/ignore_all_values.hpp
@@ -16,8 +16,12 @@
  */
 #pragma once
 
+#include "../../stdexec/concepts.hpp"
+#include "../../stdexec/execution.hpp"
 #include "../sequence_senders.hpp"
 
+#include <atomic>
+
 namespace exec {
   template <class _Variant, class _Type, class... _Args>
   concept __variant_emplaceable = requires(_Variant& __v, _Args&&... __args) {

diff --git a/include/exec/sequence/iterate.hpp b/include/exec/sequence/iterate.hpp
@@ -20,14 +20,18 @@
 
 #if STDEXEC_HAS_STD_RANGES()
 
+#include "../../stdexec/concepts.hpp"
+#include "../../stdexec/execution.hpp"
 #include "../sequence_senders.hpp"
 #include "../__detail/__basic_sequence.hpp"
 
 #include "../env.hpp"
 #include "../trampoline_scheduler.hpp"
 
+#include <exception>
 #include <ranges>
 
+
 namespace exec {
   namespace __iterate {
     using namespace stdexec;

diff --git a/include/exec/sequence/transform_each.hpp b/include/exec/sequence/transform_each.hpp
@@ -16,6 +16,8 @@
  */
 #pragma once
 
+#include "../../stdexec/concepts.hpp"
+#include "../../stdexec/execution.hpp"
 #include "../sequence_senders.hpp"
 
 #include "../__detail/__basic_sequence.hpp"

diff --git a/include/exec/static_thread_pool.hpp b/include/exec/static_thread_pool.hpp
@@ -33,6 +33,7 @@
 #include <algorithm>
 #include <atomic>
 #include <condition_variable>
+#include <cstdint>
 #include <exception>
 #include <mutex>
 #include <span>

diff --git a/include/exec/timed_scheduler.hpp b/include/exec/timed_scheduler.hpp
@@ -17,6 +17,7 @@
 #pragma once
 
 #include "../stdexec/execution.hpp"
+#include "../stdexec/functional.hpp"
 
 namespace exec {
   namespace __now {

diff --git a/include/exec/trampoline_scheduler.hpp b/include/exec/trampoline_scheduler.hpp
@@ -17,6 +17,7 @@
 #pragma once
 
 #include "../stdexec/execution.hpp"
+#include "../stdexec/stop_token.hpp"
 
 #include <cstddef>
 #include <type_traits>

diff --git a/include/exec/when_any.hpp b/include/exec/when_any.hpp
@@ -16,7 +16,11 @@
  */
 #pragma once
 
-#include <stdexec/execution.hpp>
+#include "../stdexec/execution.hpp"
+#include "../stdexec/stop_token.hpp"
+
+#include <type_traits>
+#include <exception>
 
 namespace exec {
   namespace __when_any {

diff --git a/include/stdexec/__detail/__basic_sender.hpp b/include/stdexec/__detail/__basic_sender.hpp
@@ -17,6 +17,7 @@
 
 #include "__execution_fwd.hpp"
 
+#include "__config.hpp"
 #include "__env.hpp"
 #include "__meta.hpp"
 #include "__tuple.hpp"
@@ -25,6 +26,8 @@
 #include "../concepts.hpp"
 
 #include <utility> // for tuple_size/tuple_element
+#include <cstddef>
+#include <type_traits>
 
 namespace stdexec {
   /////////////////////////////////////////////////////////////////////////////

diff --git a/include/stdexec/__detail/__domain.hpp b/include/stdexec/__detail/__domain.hpp
@@ -17,6 +17,7 @@
 
 #include "__execution_fwd.hpp"
 
+#include "__config.hpp"
 #include "__basic_sender.hpp"
 #include "__env.hpp"
 #include "__meta.hpp"

diff --git a/include/stdexec/__detail/__env.hpp b/include/stdexec/__detail/__env.hpp
@@ -15,15 +15,19 @@
  */
 #pragma once
 
-#include <concepts>
-
 #include "__execution_fwd.hpp"
 
+#include "__config.hpp"
+#include "__meta.hpp"
 #include "__concepts.hpp"
 
 #include "../functional.hpp"
 #include "../stop_token.hpp"
 
+#include <concepts>
+#include <type_traits>
+#include <exception>
+
 STDEXEC_PRAGMA_PUSH()
 STDEXEC_PRAGMA_IGNORE_EDG(probable_guiding_friend)
 STDEXEC_PRAGMA_IGNORE_EDG(type_qualifiers_ignored_on_reference)

diff --git a/include/stdexec/__detail/__intrusive_ptr.hpp b/include/stdexec/__detail/__intrusive_ptr.hpp
@@ -21,6 +21,8 @@
 #include <atomic>
 #include <memory>
 #include <new>
+#include <cstddef>
+#include <type_traits>
 
 #if STDEXEC_TSAN()
 #include <sanitizer/tsan_interface.h>

diff --git a/include/stdexec/__detail/__intrusive_queue.hpp b/include/stdexec/__detail/__intrusive_queue.hpp
@@ -16,12 +16,13 @@
  */
 #pragma once
 
+#include "__config.hpp"
+
+#include <cstddef>
 #include <cassert>
 #include <tuple>
 #include <utility>
 
-#include "__config.hpp"
-
 namespace stdexec {
   namespace __queue {
     template <auto _Next>

diff --git a/include/stdexec/__detail/__scope.hpp b/include/stdexec/__detail/__scope.hpp
@@ -15,6 +15,7 @@
  */
 #pragma once
 
+#include "__config.hpp"
 #include "__meta.hpp"
 
 namespace stdexec {

diff --git a/include/stdexec/__detail/__tuple.hpp b/include/stdexec/__detail/__tuple.hpp
@@ -16,8 +16,11 @@
 #pragma once
 
 #include "__config.hpp"
+#include "__type_traits.hpp"
 #include "__meta.hpp"
 
+#include <cstddef>
+
 namespace stdexec {
   namespace __tup {
     template <class _Ty, std::size_t _Idx>

diff --git a/include/stdexec/concepts.hpp b/include/stdexec/concepts.hpp
@@ -19,6 +19,11 @@
 #error This library requires support for C++20 concepts
 #endif
 
+#include "__detail/__config.hpp"
+#include "__detail/__meta.hpp"
+#include "__detail/__concepts.hpp"
+#include "__detail/__type_traits.hpp"
+
 #include <version>
 
 // Perhaps the stdlib lacks support for concepts though:
@@ -34,8 +39,6 @@
 #include <type_traits>
 #endif
 
-#include "__detail/__meta.hpp"
-#include "__detail/__concepts.hpp"
 
 namespace stdexec::__std_concepts {
   // Make sure we're using a same_as concept that doesn't instantiate std::is_same

diff --git a/include/stdexec/coroutine.hpp b/include/stdexec/coroutine.hpp
@@ -17,6 +17,9 @@
 
 #include "concepts.hpp"
 
+#include "__detail/__config.hpp"
+#include "__detail/__concepts.hpp"
+
 #include <version>
 #if __cpp_impl_coroutine >= 201902 && __cpp_lib_coroutine >= 201902
 #include <coroutine>