implement P3557, get_completion_signatures with constexpr exceptions (NVIDIA#1745)

Author: ericniebler

.clang-format

@@ -121,7 +121,9 @@ RequiresClausePosition: OwnLine
 IndentRequiresClause: true
 SeparateDefinitionBlocks: Leave
 ShortNamespaceLines: 0
-SortIncludes: Never
+SortIncludes:
+  Enabled: true
+  IgnoreCase: false
 SortUsingDeclarations: false
 SpaceAfterCStyleCast: true
 SpaceAfterLogicalNot: false

examples/hello_coro.cpp

@@ -18,7 +18,7 @@
 // Pull in the reference implementation of P2300:
 #include <stdexec/execution.hpp>
 
-#if !STDEXEC_STD_NO_COROUTINES() && !STDEXEC_NVHPC()
+#if !STDEXEC_NO_STD_COROUTINES() && !STDEXEC_NVHPC()
 #  include <exec/task.hpp>
 
 using namespace stdexec;

examples/server_theme/let_value.cpp

@@ -52,7 +52,7 @@
 // Use a thread pool
 #include "exec/static_thread_pool.hpp"
 
-#if !STDEXEC_STD_NO_EXCEPTIONS()
+#if !STDEXEC_NO_STD_EXCEPTIONS()
 namespace ex = stdexec;
 
 struct http_request {
@@ -159,4 +159,4 @@ int main() {
   std::cout << "This example requires C++ exceptions to be enabled.\n";
   return 0;
 }
-#endif // !STDEXEC_STD_NO_EXCEPTIONS()
+#endif // !STDEXEC_NO_STD_EXCEPTIONS()

include/asioexec/as_default_on.hpp

@@ -18,10 +18,10 @@
 
 #pragma once
 
-#include <type_traits>
-#include <utility>
 #include <asioexec/asio_config.hpp>
 #include <asioexec/executor_with_default.hpp>
+#include <type_traits>
+#include <utility>
 
 namespace asioexec {
 

include/asioexec/completion_token.hpp

@@ -18,18 +18,18 @@
 
 #pragma once
 
+#include <asioexec/as_default_on.hpp>
+#include <asioexec/asio_config.hpp>
 #include <concepts>
 #include <exception>
 #include <functional>
 #include <mutex>
 #include <optional>
+#include <stdexec/execution.hpp>
 #include <tuple>
 #include <type_traits>
 #include <utility>
 #include <version>
-#include <asioexec/as_default_on.hpp>
-#include <asioexec/asio_config.hpp>
-#include <stdexec/execution.hpp>
 
 namespace asioexec {
 
@@ -527,7 +527,7 @@ namespace ASIOEXEC_ASIO_NAMESPACE {
   template <typename... Signatures>
   struct async_result<::asioexec::completion_token_t, Signatures...> {
     template <typename Initiation, typename... Args>
-      requires (std::is_constructible_v<std::decay_t<Args>, Args> && ...)
+      requires(std::is_constructible_v<std::decay_t<Args>, Args> && ...)
     static constexpr auto
       initiate(Initiation&& i, const ::asioexec::completion_token_t&, Args&&... args) {
       return ::asioexec::detail::completion_token::sender<

include/asioexec/use_sender.hpp

@@ -18,15 +18,15 @@
 
 #pragma once
 
+#include <asioexec/as_default_on.hpp>
+#include <asioexec/asio_config.hpp>
+#include <asioexec/completion_token.hpp>
 #include <concepts>
 #include <exception>
+#include <stdexec/execution.hpp>
 #include <system_error>
 #include <type_traits>
 #include <utility>
-#include <asioexec/as_default_on.hpp>
-#include <asioexec/asio_config.hpp>
-#include <asioexec/completion_token.hpp>
-#include <stdexec/execution.hpp>
 
 namespace asioexec {
 

include/exec/__detail/__basic_sequence.hpp

@@ -16,9 +16,9 @@
  */
 #pragma once
 
+#include "../../stdexec/__detail/__basic_sender.hpp"
 #include "../../stdexec/__detail/__config.hpp"
 #include "../../stdexec/__detail/__meta.hpp"
-#include "../../stdexec/__detail/__basic_sender.hpp"
 
 #include "../sequence_senders.hpp"
 
@@ -63,24 +63,17 @@ namespace exec {
       return _Self::__tag().get_env(*this);
     }
 
-    template <stdexec::__decays_to<__seqexpr> _Self, class... _Env>
-    STDEXEC_EXPLICIT_THIS_BEGIN(
-      auto get_completion_signatures)(this _Self&& __self, _Env&&... __env)
-      -> decltype(__self.__tag().get_completion_signatures(
-        static_cast<_Self&&>(__self),
-        static_cast<_Env&&>(__env)...)) {
-      return {};
+    template <stdexec::__decays_to_derived_from<__seqexpr> _Self, class... _Env>
+    static consteval auto get_completion_signatures() {
+      return __tag_t::template get_completion_signatures<_Self, _Env...>();
     }
-    STDEXEC_EXPLICIT_THIS_END(get_completion_signatures)
 
-    template <stdexec::__decays_to<__seqexpr> _Self, class... _Env>
-    static auto get_item_types(_Self&& __self, _Env&&... __env)
-      -> decltype(__self.__tag()
-                    .get_item_types(static_cast<_Self&&>(__self), static_cast<_Env&&>(__env)...)) {
-      return {};
+    template <stdexec::__decays_to_derived_from<__seqexpr> _Self, class... _Env>
+    static consteval auto get_item_types() {
+      return __tag_t::template get_item_types<_Self, _Env...>();
     }
 
-    template <stdexec::__decays_to<__seqexpr> _Self, stdexec::receiver _Receiver>
+    template <stdexec::__decays_to_derived_from<__seqexpr> _Self, stdexec::receiver _Receiver>
     static auto subscribe(_Self&& __self, _Receiver&& __rcvr) noexcept(noexcept(
       __self.__tag().subscribe(static_cast<_Self&&>(__self), static_cast<_Receiver&&>(__rcvr))))
       -> decltype(__self.__tag()

include/exec/__detail/__system_context_replaceability_api.hpp

@@ -19,11 +19,11 @@
 
 #include "../../stdexec/__detail/__execution_fwd.hpp"
 
-#include <cstdint>
 #include <cstddef>
+#include <cstdint>
 #include <exception>
-#include <optional>
 #include <memory>
+#include <optional>
 #include <span>
 
 struct __uuid {

include/exec/any_sender_of.hpp

@@ -15,8 +15,8 @@
  */
 #pragma once
 
-#include "../stdexec/execution.hpp"
 #include "../stdexec/__detail/__any_receiver_ref.hpp"
+#include "../stdexec/execution.hpp"
 
 #include "sequence_senders.hpp"
 
@@ -245,7 +245,8 @@ namespace exec {
       class _Allocator,
       bool _Copyable = false,
       std::size_t _InlineSize = 3 * sizeof(void*),
-      std::size_t _Alignment = alignof(std::max_align_t)>
+      std::size_t _Alignment = alignof(std::max_align_t)
+    >
     struct __storage {
       class __t;
     };
@@ -254,7 +255,8 @@ namespace exec {
       class _Vtable,
       class _Allocator,
       std::size_t _InlineSize = 3 * sizeof(void*),
-      std::size_t _Alignment = alignof(std::max_align_t)>
+      std::size_t _Alignment = alignof(std::max_align_t)
+    >
     struct __immovable_storage {
       class __t : __immovable {
         static constexpr std::size_t __buffer_size = std::max(_InlineSize, sizeof(void*));
@@ -374,7 +376,8 @@ namespace exec {
       class _Allocator,
       bool _Copyable,
       std::size_t _InlineSize,
-      std::size_t _Alignment>
+      std::size_t _Alignment
+    >
     class __storage<_Vtable, _Allocator, _Copyable, _InlineSize, _Alignment>::__t
       : __if_c<_Copyable, __, __move_only> {
       static_assert(
@@ -393,7 +396,8 @@ namespace exec {
       using __vtable_t = __if_c<
         _Copyable,
         __storage_vtable<_Vtable, __with_delete, __with_move, __with_copy>,
-        __storage_vtable<_Vtable, __with_delete, __with_move>>;
+        __storage_vtable<_Vtable, __with_delete, __with_move>
+      >;
 
       template <class _Tp>
       static constexpr auto __get_vtable_of_type() noexcept -> const __vtable_t* {
@@ -404,7 +408,8 @@ namespace exec {
             _Vtable,
             __with_delete,
             __with_move,
-            __with_copy>;
+            __with_copy
+          >;
         } else {
           return &__storage_vtbl<__t, __decay_t<_Tp>, _Vtable, __with_delete, __with_move>;
         }
@@ -581,7 +586,8 @@ namespace exec {
       class _VTable = __empty_vtable,
       class _Allocator = std::allocator<std::byte>,
       std::size_t _InlineSize = 3 * sizeof(void*),
-      std::size_t _Alignment = alignof(std::max_align_t)>
+      std::size_t _Alignment = alignof(std::max_align_t)
+    >
     using __immovable_storage_t =
       __t<__immovable_storage<_VTable, _Allocator, _InlineSize, _Alignment>>;
 
@@ -591,7 +597,8 @@ namespace exec {
     template <
       class _VTable,
       std::size_t _InlineSize = 3 * sizeof(void*),
-      class _Allocator = std::allocator<std::byte>>
+      class _Allocator = std::allocator<std::byte>
+    >
     using __copyable_storage_t = __t<__storage<_VTable, _Allocator, true, _InlineSize>>;
 
     template <class _Tag, class... _As>
@@ -755,7 +762,8 @@ namespace exec {
         using _FilteredQueries =
           __minvoke<__mremove_if<__q<__is_never_stop_token_query_t>>, _Queries...>;
         using __vtable_t = stdexec::__t<
-          __mapply<__mbind_front_q<__vtable, completion_signatures<_Sigs...>>, _FilteredQueries>>;
+          __mapply<__mbind_front_q<__vtable, completion_signatures<_Sigs...>>, _FilteredQueries>
+        >;
 
         struct __env_t {
           const __vtable_t* __vtable_;
@@ -1052,7 +1060,8 @@ namespace exec {
 
         template <receiver_of<_Sigs> _Rcvr>
         auto connect(_Rcvr __rcvr) && -> stdexec::__t<
-          __operation<stdexec::__id<_Rcvr>, __with_inplace_stop_token>> {
+          __operation<stdexec::__id<_Rcvr>, __with_inplace_stop_token>
+        > {
           return {static_cast<__t&&>(*this), static_cast<_Rcvr&&>(__rcvr)};
         }
 
@@ -1207,7 +1216,8 @@ namespace exec {
     template <auto... _SenderQueries>
     class any_sender {
       using __sender_base = stdexec::__t<
-        __any::__sender<_Completions, queries<_SenderQueries...>, queries<_ReceiverQueries...>>>;
+        __any::__sender<_Completions, queries<_SenderQueries...>, queries<_ReceiverQueries...>>
+      >;
       __sender_base __sender_;
 
      public:
@@ -1243,7 +1253,8 @@ namespace exec {
         // Add the required set_value_t() completions to the schedule-sender.
         using __schedule_completions = stdexec::__concat_completion_signatures<
           _Completions,
-          stdexec::completion_signatures<stdexec::set_value_t()>>;
+          stdexec::completion_signatures<stdexec::set_value_t()>
+        >;
         using __schedule_receiver = any_receiver_ref<__schedule_completions, _ReceiverQueries...>;
 
         template <class _BaseSender>
@@ -1291,8 +1302,10 @@ namespace exec {
         using __schedule_sender_base_t = stdexec::__minvoke<
           stdexec::__mremove_if<
             __any::__ret_equals_to<stdexec::get_completion_scheduler_t<stdexec::set_value_t>>,
-            stdexec::__q<__any_sender_t>>,
-          decltype(_SenderQueries)...>;
+            stdexec::__q<__any_sender_t>
+          >,
+          decltype(_SenderQueries)...
+        >;
 
         using __schedule_sender_t = __schedule_sender<__schedule_sender_base_t>;
 

include/exec/async_scope.hpp

@@ -15,10 +15,10 @@
  */
 #pragma once
 
-#include "../stdexec/execution.hpp"
-#include "../stdexec/stop_token.hpp"
 #include "../stdexec/__detail/__intrusive_queue.hpp"
 #include "../stdexec/__detail/__optional.hpp"
+#include "../stdexec/execution.hpp"
+#include "../stdexec/stop_token.hpp"
 #include "env.hpp"
 
 #include "../stdexec/__detail/__atomic.hpp"
@@ -383,15 +383,17 @@ namespace exec {
         }
 
         template <class _Receiver2>
-        explicit __t(
-          _Receiver2&& __rcvr, std::unique_ptr<__future_state<_Sender, _Env>> __state)
-          : __subscription{{},
-            [](__subscription* __self) noexcept -> void {
+        explicit __t(_Receiver2&& __rcvr, std::unique_ptr<__future_state<_Sender, _Env>> __state)
+          : __subscription{
+              {},
+              [](__subscription* __self) noexcept -> void {
                 static_cast<__t*>(__self)->__complete_();
-            }}
+              }}
           , __rcvr_(static_cast<_Receiver2&&>(__rcvr))
           , __state_(std::move(__state))
-          , __forward_consumer_(std::in_place, get_stop_token(get_env(__rcvr_)),
+          , __forward_consumer_(
+              std::in_place,
+              get_stop_token(get_env(__rcvr_)),
               __forward_stopped{&__state_->__stop_source_}) {
         }
 
@@ -485,7 +487,10 @@ namespace exec {
     template <class _Completions, class _Env>
     struct __future_state_base {
       __future_state_base(_Env __env, const __impl* __scope)
-        : __forward_scope_{std::in_place, __scope->__stop_source_.get_token(), __forward_stopped{&__stop_source_}}
+        : __forward_scope_{
+            std::in_place,
+            __scope->__stop_source_.get_token(),
+            __forward_stopped{&__stop_source_}}
         , __env_(make_env(
             static_cast<_Env&&>(__env),
             stdexec::prop{get_stop_token, __scope->__stop_source_.get_token()})) {
@@ -757,9 +762,8 @@ namespace exec {
 
       struct __t : __spawn_op_base<_EnvId> {
         __t(connect_t, _Sender&& __sndr, _Env __env, const __impl* __scope)
-          : __spawn_op_base<
-              _EnvId
-            >{__env::__join(
+          : __spawn_op_base<_EnvId>{
+              __env::__join(
                 static_cast<_Env&&>(__env),
                 __spawn_env_{__scope->__stop_source_.get_token()}),
               [](__spawn_op_base<_EnvId>* __op) { delete static_cast<__t*>(__op); }}