Extend the stdexec module's coverage

MAINTAINERS.md

@@ -49,9 +49,29 @@ stdexec should follow.
     the `include/exec` directory, export them with
     `STDEXEC_MODULE_EXPORT_AUTHORING`.
 
-* The first non-comment, non-blank line in a test file should be
-  `#include <catch2/catch_all.hpp>` so as not to break the modules build.
-  If compile-time behavior needs to differ between modularized and
-  traditional builds, the next inclusion should be
-  `#include <stdexec/__detail/__config.hpp>` so that `STDEXEC_USE_MODULES()`
-  is defined and can be checked.
+* In tests, the include order should be:
+  ```c++
+  /* Copyright... */
+
+  // Catch2 must come before any potential import statements
+  #include <catch2/catch_all.hpp>
+
+  // Pull in all the macros in __config.hpp and either include all of
+  // stdexec's headers, or import stdexec, as appropriate
+  #include <stdexec/execution.hpp>
+
+  // other non-std headers, like anything in <exec/...> or in the test
+  // utility library
+  #include <exec/function.hpp>
+  #include <test_common/receivers.hpp>
+
+  // if the test has direct dependencies on std, the declarations thereof
+  // must come last, either as import std, or the usual includes. This has
+  // to come last because current compilers support including std headers
+  // *before* import std, but not *after*.
+  #if STDEXEC_USE_MODULES()
+  import std;
+  #else
+  #  include <algorithm>
+  #endif
+  ```

include/exec/any_sender_of.hpp

@@ -15,14 +15,21 @@
  */
 #pragma once
 
-#include "../stdexec/__detail/__any.hpp"
-#include "../stdexec/__detail/__concepts.hpp"
-#include "../stdexec/__detail/__receiver_ref.hpp"
-#include "../stdexec/__detail/__receivers.hpp"
+#include "../stdexec/__detail/__config.hpp"
 
+#include "../stdexec/__detail/__receiver_ref.hpp"
 #include "env.hpp"
 
-#include <utility>
+#if STDEXEC_USE_MODULES()
+import std;
+import stdexec;
+#else
+#  include "../stdexec/__detail/__any.hpp"
+#  include "../stdexec/__detail/__concepts.hpp"
+#  include "../stdexec/__detail/__receivers.hpp"
+
+#  include <utility>
+#endif
 
 STDEXEC_PRAGMA_PUSH()
 STDEXEC_PRAGMA_IGNORE_GNU("-Woverloaded-virtual")

include/exec/asio/as_default_on.hpp

@@ -20,10 +20,16 @@
 
 #include <exec/asio/asio_config.hpp>
 
+#include "../../stdexec/__detail/__config.hpp"
+
 #include "executor_with_default.hpp"
 
-#include <type_traits>
-#include <utility>
+#if STDEXEC_USE_MODULES()
+import std;
+#else
+#  include <type_traits>
+#  include <utility>
+#endif
 
 namespace experimental::execution::asio
 {

include/exec/asio/completion_token.hpp

@@ -20,25 +20,33 @@
 
 #include <exec/asio/asio_config.hpp>
 
-#include "../../stdexec/__detail/__execution_fwd.hpp"
-
-#include "../../stdexec/__detail/__completion_signatures_of.hpp"
-#include "../../stdexec/__detail/__env.hpp"
-#include "../../stdexec/__detail/__queries.hpp"
-#include "../../stdexec/__detail/__receivers.hpp"
-#include "../../stdexec/__detail/__type_traits.hpp"
-#include "../../stdexec/stop_token.hpp"
-#include "as_default_on.hpp"
-
-#include <concepts>
-#include <exception>
-#include <functional>
-#include <mutex>
-#include <optional>
-#include <tuple>
-#include <type_traits>
-#include <utility>
-#include <version>
+#include "../../stdexec/__detail/__config.hpp"
+
+#  include "as_default_on.hpp"
+
+#if STDEXEC_USE_MODULES()
+import std;
+import stdexec;
+#else
+#  include "../../stdexec/__detail/__execution_fwd.hpp"
+
+#  include "../../stdexec/__detail/__completion_signatures_of.hpp"
+#  include "../../stdexec/__detail/__env.hpp"
+#  include "../../stdexec/__detail/__queries.hpp"
+#  include "../../stdexec/__detail/__receivers.hpp"
+#  include "../../stdexec/__detail/__type_traits.hpp"
+#  include "../../stdexec/stop_token.hpp"
+
+#  include <concepts>
+#  include <exception>
+#  include <functional>
+#  include <mutex>
+#  include <optional>
+#  include <tuple>
+#  include <type_traits>
+#  include <utility>
+#  include <version>
+#endif
 
 namespace experimental::execution::asio
 {

include/exec/asio/noexcept_boost_throw.hpp

@@ -27,8 +27,12 @@
 #  include <boost/asio/thread_pool.hpp>
 #  include <boost/throw_exception.hpp>
 
-#  include <cstdlib>
-#  include <exception>
+#  if STDEXEC_USE_MODULES()
+import std;
+#  else
+#    include <cstdlib>
+#    include <exception>
+#  endif
 
 namespace boost
 {

include/exec/asio/use_sender.hpp

@@ -20,22 +20,29 @@
 
 #include <exec/asio/asio_config.hpp>
 
-#include "../../stdexec/__detail/__execution_fwd.hpp"
-
-#include "../../stdexec/__detail/__completion_signatures_of.hpp"
-#include "../../stdexec/__detail/__receivers.hpp"
-#include "../../stdexec/__detail/__senders.hpp"
-#include "../../stdexec/__detail/__transform_completion_signatures.hpp"
-#include "../../stdexec/__detail/__type_traits.hpp"
+#include "../../stdexec/__detail/__config.hpp"
 
 #include "as_default_on.hpp"
 #include "completion_token.hpp"
 
-#include <concepts>
-#include <exception>
-#include <system_error>
-#include <type_traits>
-#include <utility>
+#if STDEXEC_USE_MODULES()
+import std;
+import stdexec;
+#else
+#  include "../../stdexec/__detail/__execution_fwd.hpp"
+
+#  include "../../stdexec/__detail/__completion_signatures_of.hpp"
+#  include "../../stdexec/__detail/__receivers.hpp"
+#  include "../../stdexec/__detail/__senders.hpp"
+#  include "../../stdexec/__detail/__transform_completion_signatures.hpp"
+#  include "../../stdexec/__detail/__type_traits.hpp"
+
+#  include <concepts>
+#  include <exception>
+#  include <system_error>
+#  include <type_traits>
+#  include <utility>
+#endif
 
 namespace experimental::execution::asio
 {
@@ -71,7 +78,7 @@ namespace experimental::execution::asio
         : r_(static_cast<T&&>(t))
       {}
 
-      using receiver_concept = ::STDEXEC::receiver_t;
+      using receiver_concept = ::STDEXEC::receiver_tag;
 
       constexpr void set_stopped() && noexcept
         requires ::STDEXEC::receiver_of<

include/exec/async_scope.hpp

@@ -130,7 +130,7 @@ namespace experimental::execution
 
       template <__decays_to<__when_empty_sender> _Self, class... _Env>
       static consteval auto get_completion_signatures()
-        -> __completion_signatures_of_t<__copy_cvref_t<_Self, _Constrained>, __env_t<_Env>...>
+        -> completion_signatures_of_t<__copy_cvref_t<_Self, _Constrained>, __env_t<_Env>...>
       {
         return {};
       }
@@ -256,7 +256,7 @@ namespace experimental::execution
 
       template <__decays_to<__nest_sender> _Self, class... _Env>
       static consteval auto get_completion_signatures()
-        -> __completion_signatures_of_t<__copy_cvref_t<_Self, _Constrained>, __env_t<_Env>...>
+        -> completion_signatures_of_t<__copy_cvref_t<_Self, _Constrained>, __env_t<_Env>...>
       {
         return {};
       }

include/exec/detail/basic_sequence.hpp

@@ -16,10 +16,16 @@
  */
 #pragma once
 
-#include "../../stdexec/__detail/__basic_sender.hpp"
 #include "../../stdexec/__detail/__config.hpp"
-#include "../../stdexec/__detail/__meta.hpp"
 
+#if STDEXEC_USE_MODULES()
+import stdexec;
+#else
+#  include "../../stdexec/__detail/__basic_sender.hpp"
+#  include "../../stdexec/__detail/__meta.hpp"
+#endif
+
+#include "../../stdexec/__detail/__basic_sender_macros.hpp"
 #include "../sequence_senders.hpp"
 
 namespace experimental::execution

include/exec/env.hpp

@@ -15,7 +15,13 @@
  */
 #pragma once
 
-#include "../stdexec/execution.hpp"
+#include "../stdexec/__detail/__config.hpp"
+
+#if STDEXEC_USE_MODULES()
+import stdexec;
+#else
+#  include "../stdexec/execution.hpp"
+#endif
 
 STDEXEC_PRAGMA_PUSH()
 STDEXEC_PRAGMA_IGNORE_EDG(1302)
@@ -229,7 +235,7 @@ namespace experimental::execution
 
       template <__decays_to<__sender> _Self, class... _Env>
       static consteval auto get_completion_signatures()
-        -> __completion_signatures_of_t<__copy_cvref_t<_Self, _Sender>, _Env...>
+        -> completion_signatures_of_t<__copy_cvref_t<_Self, _Sender>, _Env...>
       {
         return {};
       }

include/exec/sender_for.hpp

@@ -15,7 +15,13 @@
  */
 #pragma once
 
-#include "../stdexec/__detail/__sender_introspection.hpp"
+#include "../stdexec/__detail/__config.hpp"
+
+#if STDEXEC_USE_MODULES()
+import stdexec;
+#else
+#  include "../stdexec/__detail/__sender_introspection.hpp"
+#endif
 
 namespace experimental::execution
 {

include/exec/sequence/iterate.hpp

@@ -18,25 +18,31 @@
 
 #include "../../stdexec/__detail/__config.hpp"
 
-#include "../../stdexec/__detail/__concepts.hpp"
-#include "../../stdexec/__detail/__connect.hpp"
-#include "../../stdexec/__detail/__env.hpp"
-#include "../../stdexec/__detail/__execution_fwd.hpp"
-#include "../../stdexec/__detail/__operation_states.hpp"
-#include "../../stdexec/__detail/__optional.hpp"
-#include "../../stdexec/__detail/__receivers.hpp"
-#include "../../stdexec/__detail/__schedulers.hpp"
-#include "../../stdexec/__detail/__sender_concepts.hpp"
+#if STDEXEC_USE_MODULES()
+import std;
+import stdexec;
+#else
+#  include "../../stdexec/__detail/__execution_fwd.hpp"
+
+#  include "../../stdexec/__detail/__concepts.hpp"
+#  include "../../stdexec/__detail/__connect.hpp"
+#  include "../../stdexec/__detail/__env.hpp"
+#  include "../../stdexec/__detail/__operation_states.hpp"
+#  include "../../stdexec/__detail/__optional.hpp"
+#  include "../../stdexec/__detail/__receivers.hpp"
+#  include "../../stdexec/__detail/__schedulers.hpp"
+#  include "../../stdexec/__detail/__sender_concepts.hpp"
+
+#  include <exception>
+#  include <ranges>
+#endif
 
 #include "../detail/basic_sequence.hpp"
 #include "../sender_for.hpp"
 #include "../sequence.hpp"
 #include "../sequence_senders.hpp"
 #include "../trampoline_scheduler.hpp"
 
-#include <exception>
-#include <ranges>
-
 namespace experimental::execution
 {
   namespace __iterate

include/exec/sequence_senders.hpp

@@ -16,24 +16,31 @@
  */
 #pragma once
 
-#include "../stdexec/__detail/__execution_fwd.hpp"
-
-#include "../stdexec/__detail/__completion_signatures.hpp"
-#include "../stdexec/__detail/__concepts.hpp"
-#include "../stdexec/__detail/__connect.hpp"
-#include "../stdexec/__detail/__debug.hpp"
-#include "../stdexec/__detail/__diagnostics.hpp"
-#include "../stdexec/__detail/__env.hpp"
-#include "../stdexec/__detail/__just.hpp"
-#include "../stdexec/__detail/__meta.hpp"
-#include "../stdexec/__detail/__receivers.hpp"
-#include "../stdexec/__detail/__senders.hpp"
-#include "../stdexec/__detail/__stop_token.hpp"
-#include "../stdexec/__detail/__tag_invoke.hpp"
-#include "../stdexec/__detail/__transform_sender.hpp"
-#include "../stdexec/__detail/__type_traits.hpp"
-#include "../stdexec/__detail/__utility.hpp"
-#include "../stdexec/stop_token.hpp"
+#include "../stdexec/__detail/__config.hpp"
+
+#if STDEXEC_USE_MODULES()
+import stdexec;
+#  include "../stdexec/__detail/__diagnostic_macros.hpp"
+#else
+#  include "../stdexec/__detail/__execution_fwd.hpp"
+
+#  include "../stdexec/__detail/__completion_signatures.hpp"
+#  include "../stdexec/__detail/__concepts.hpp"
+#  include "../stdexec/__detail/__connect.hpp"
+#  include "../stdexec/__detail/__debug.hpp"
+#  include "../stdexec/__detail/__diagnostics.hpp"
+#  include "../stdexec/__detail/__env.hpp"
+#  include "../stdexec/__detail/__just.hpp"
+#  include "../stdexec/__detail/__meta.hpp"
+#  include "../stdexec/__detail/__receivers.hpp"
+#  include "../stdexec/__detail/__senders.hpp"
+#  include "../stdexec/__detail/__stop_token.hpp"
+#  include "../stdexec/__detail/__tag_invoke.hpp"
+#  include "../stdexec/__detail/__transform_sender.hpp"
+#  include "../stdexec/__detail/__type_traits.hpp"
+#  include "../stdexec/__detail/__utility.hpp"
+#  include "../stdexec/stop_token.hpp"
+#endif
 
 #include "completion_signatures.hpp"