Skip to content

Commit

Permalink
drop support for P2300R5-style senders and receivers
Browse files Browse the repository at this point in the history 
the sender concept now requires `enable_sender<Sndr> == true`.
the easiest way to achieve that is to give your sender types
a nested type alias `is_sender`.

  struct my_sender {
    using is_sender = _unspecified_;
    ...
  };

likewise for receivers; they should have a nested `is_receiver`
type alias.
  • Loading branch information
@ericniebler
ericniebler committed Nov 2, 2023
1 parent 1d79daa commit 61b79c8
Show file tree
Hide file tree
Showing 16 changed files with 154 additions and 408 deletions.
22 changes: 1 addition & 21 deletions include/exec/__detail/__sender_facade.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,6 @@ namespace exec {
__declval<__data_placeholder&>(),
__declval<__receiver_placeholder<_Env>&>()));

struct __dependent_sender {
using is_sender = void;
using __t = __dependent_sender;
friend auto tag_invoke(get_completion_signatures_t, __dependent_sender, no_env)
-> dependent_completion_signatures<no_env>;
};

struct __sender_transform_failed {
using __t = __sender_transform_failed;
};
Expand All @@ -109,8 +102,6 @@ namespace exec {
} else {
if constexpr (__mvalid<__tfx_sender_, _Kernel, _Sender, _Env>) {
return __mtype<__tfx_sender_<_Kernel, _Sender, _Env>>{};
} else if constexpr (same_as<_Env, no_env>) {
return __dependent_sender{};
} else {
return __sender_transform_failed{};
}
Expand All @@ -120,7 +111,6 @@ namespace exec {

template <class _Kernel, class _Sender, class _Data, class _Receiver>
auto __transform_sender(_Kernel& __kernel, _Sender&& __sndr, _Data& __data, _Receiver& __rcvr) {
static_assert(!same_as<env_of_t<_Receiver>, no_env>);
if constexpr (__lacks_transform_sender<_Kernel>) {
return (_Sender&&) __sndr;
} else {
Expand All @@ -141,11 +131,7 @@ namespace exec {
__declval<_As>()...));

template <class _Kernel, class _Env>
using __get_env_ = decltype(__declval<_Kernel&>().get_env(__declval<_Env>()));

template <class _Kernel, class _Env>
using __env_t =
__minvoke< __if_c<same_as<_Env, no_env>, __mconst<no_env>, __q<__get_env_>>, _Kernel, _Env>;
using __env_t = decltype(__declval<_Kernel&>().get_env(__declval<_Env>()));

template <class _Kernel, class _Env, class _Tag, class... _As>
auto __completions_from_sig(_Tag (*)(_As...))
Expand Down Expand Up @@ -312,19 +298,13 @@ namespace exec {
__completions_t<_NewEnv, __pre_completions_t<_NewSender, _NewEnv>>;
if constexpr (__valid_completion_signatures<_Completions, _Env>) {
return (_Completions(*)()) nullptr;
} else if constexpr (same_as<no_env, _Env>) {
return (dependent_completion_signatures<no_env>(*)()) nullptr;
} else {
// assume this is an error message and return it directly
return (_Completions(*)()) nullptr;
}
} else if constexpr (same_as<no_env, _Env>) {
return (dependent_completion_signatures<no_env>(*)()) nullptr;
} else {
return (__diagnostic_t<_Env>(*)()) nullptr;
}
} else if constexpr (same_as<no_env, _Env>) {
return (dependent_completion_signatures<no_env>(*)()) nullptr;
} else if constexpr (same_as<_NewSender, __sender_transform_failed>) {
return (__diagnostic_t<_Env>(*)()) nullptr;
} else {
Expand Down
1 change: 1 addition & 0 deletions include/exec/any_sender_of.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -794,6 +794,7 @@ namespace exec {
using _Receiver = stdexec::__t<_ReceiverId>;

struct __t {
using is_receiver = void;
__operation_base<_Receiver>* __op_;

template <same_as<set_next_t> _SetNext, same_as<__t> _Self, class _Item>
Expand Down
2 changes: 1 addition & 1 deletion include/exec/env.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ namespace exec {
return {{}, ((_Self&&) __self).__default_, (_Receiver&&) __rcvr};
}

template <__none_of<no_env> _Env>
template <class _Env>
friend auto tag_invoke(get_completion_signatures_t, __sender, _Env&&)
-> __completions_t<_Env> {
return {};
Expand Down
2 changes: 1 addition & 1 deletion include/exec/finally.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ namespace exec {
(_Rec&&) __receiver};
}

template <__decays_to<__t> _Self, __none_of<no_env> _Env>
template <__decays_to<__t> _Self, class _Env>
friend auto tag_invoke(get_completion_signatures_t, _Self&&, _Env&&) noexcept
-> __completion_signatures_t<
__copy_cvref_t<_Self, _InitialSender>,
Expand Down
6 changes: 3 additions & 3 deletions include/exec/sequence/any_sequence_of.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
namespace exec {
namespace __any {
namespace __next {
template <__is_completion_signatures _Sigs>
template <__valid_completion_signatures _Sigs>
struct __rcvr_next_vfun {
using __return_sigs = completion_signatures<set_value_t(), set_stopped_t()>;
using __void_sender = typename any_receiver_ref<__return_sigs>::template any_sender<>;
Expand All @@ -37,7 +37,7 @@ namespace exec {
template <class _Sigs>
using __item_sender = typename any_receiver_ref<_Sigs>::template any_sender<>;

template <__is_completion_signatures _Sigs>
template <__valid_completion_signatures _Sigs>
constexpr __void_sender (*operator()(_Sigs*) const)(void*, __item_sender<_Sigs>&&) {
return +[](void* __r, __item_sender<_Sigs>&& __sndr) noexcept -> __void_sender {
return __void_sender{
Expand Down Expand Up @@ -295,7 +295,7 @@ namespace exec {
template <
std::same_as<exec::set_next_t> _SetNext,
std::same_as<__t> _Self,
stdexec::__sender _Sender>
stdexec::sender _Sender>
requires stdexec::__callable<set_next_t, _Self&, _Sender>
friend auto tag_invoke(_SetNext, _Self& __self, _Sender&& __sender) {
return exec::set_next(__self.__receiver_, static_cast<_Sender&&>(__sender));
Expand Down
9 changes: 0 additions & 9 deletions include/exec/sequence_senders.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,15 +333,6 @@ namespace exec {
__nothrow_callable<get_env_t, _Receiver&>
&& __nothrow_callable<transform_sender_t, _Domain, _Sender, env_of_t<_Receiver&>>;
using _TfxSender = __tfx_sndr<_Sender, _Receiver>;
if constexpr (!enable_sender<__decay_t<_Sender>>)
__connect::_PLEASE_UPDATE_YOUR_SENDER_TYPE<__decay_t<_Sender>>();

if constexpr (!enable_sender<__decay_t<_TfxSender>>)
__connect::_PLEASE_UPDATE_YOUR_SENDER_TYPE<__decay_t<_TfxSender>>();

if constexpr (!enable_receiver<__decay_t<_Receiver>>)
__connect::_PLEASE_UPDATE_YOUR_RECEIVER_TYPE<__decay_t<_Receiver>>();

if constexpr (__next_connectable_with_tag_invoke<_TfxSender, _Receiver>) {
using _Result = tag_invoke_result_t<
connect_t,
Expand Down
2 changes: 1 addition & 1 deletion include/exec/when_any.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ namespace exec {
try {
__result_.emplace(std::tuple{_CPO{}, (_Args&&) __args...});
} catch (...) {
__result_.emplace(set_error_t{}, std::current_exception());
__result_.emplace(std::tuple{set_error_t{}, std::current_exception()});
}
}
// stop pending operations
Expand Down
11 changes: 9 additions & 2 deletions include/nvexec/stream/when_all.cuh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,15 @@ namespace nvexec::STDEXEC_STREAM_DETAIL_NS {

template <class Env, class... Senders>
struct completions {
using __t = dependent_completion_signatures<Env>;
template <class Sender, class Env>
using too_many_completions = __mbool<(__v<__count_of<set_value_t, Sender, Env>> > 1)>;

using InvalidArg = //
__minvoke<
__mfind_if<__mbind_back_q<too_many_completions, Env>, __q<__mfront>>,
Senders...>;

using __t = stdexec::__when_all::__too_many_value_completions_error<InvalidArg, Env>;
};

template <class... As, class TupleT>
Expand All @@ -63,7 +71,6 @@ namespace nvexec::STDEXEC_STREAM_DETAIL_NS {
struct completions<Env, Senders...> {
using non_values = //
__concat_completion_signatures_t<

completion_signatures< set_error_t(cudaError_t), set_stopped_t()>,
__try_make_completion_signatures<
Senders,
Expand Down
2 changes: 1 addition & 1 deletion include/stdexec/__detail/__meta.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ namespace stdexec {
struct _BAD_SUBSTITUTION_ { };

template <class... _Args>
struct _WITH_TYPES_ { };
struct _WITH_TYPES_;

template <template <class...> class _Fun>
struct _WITH_META_FUNCTION_T_ {
Expand Down
22 changes: 13 additions & 9 deletions include/stdexec/__detail/__p2300.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ namespace std {
using stop_token_of_t STDEXEC_STD_DEPRECATED = stdexec::stop_token_of_t<_StopTokenProvider>;

// [exec.env], execution environments
using no_env STDEXEC_STD_DEPRECATED = stdexec::no_env;
struct __no_env {};
using no_env STDEXEC_STD_DEPRECATED = __no_env;
using get_env_t STDEXEC_STD_DEPRECATED = stdexec::get_env_t;
//using forwarding_env_query_t STDEXEC_STD_DEPRECATED = stdexec::forwarding_env_query_t; // BUGBUG
STDEXEC_STD_DEPRECATED
Expand Down Expand Up @@ -138,44 +139,47 @@ namespace std {
inline constexpr stdexec::start_t start{};

// [exec.snd], senders
template <class _Sender, class _Env = stdexec::no_env>
template <class _Sender, class _Env = __no_env>
concept sender /*STDEXEC_STD_DEPRECATED*/ = stdexec::sender_in<_Sender, _Env>;

template <class _Sender, class _Receiver>
concept sender_to /*STDEXEC_STD_DEPRECATED*/ = stdexec::sender_to<_Sender, _Receiver>;

template <class _Sender, class _SetSig, class _Env = stdexec::no_env>
template <class _Sender, class _SetSig, class _Env = __no_env>
concept sender_of /*STDEXEC_STD_DEPRECATED*/ = stdexec::sender_of<_Sender, _SetSig, _Env>;

// [exec.sndtraits], completion signatures
using get_completion_signatures_t STDEXEC_STD_DEPRECATED = stdexec::get_completion_signatures_t;
STDEXEC_STD_DEPRECATED
inline constexpr stdexec::get_completion_signatures_t get_completion_signatures{};

template <class _Sender, class _Env = stdexec::no_env>
template <class _Sender, class _Env = __no_env>
using completion_signatures_of_t STDEXEC_STD_DEPRECATED =
stdexec::completion_signatures_of_t<_Sender, _Env>;

template <class _Env>
struct __dependent_completion_signatures { };

template <class _Env>
using dependent_completion_signatures STDEXEC_STD_DEPRECATED =
stdexec::dependent_completion_signatures<_Env>;
__dependent_completion_signatures<_Env>;

template < //
class _Sender, //
class _Env = stdexec::no_env, //
class _Env = __no_env, //
template <class...> class _Tuple = stdexec::__decayed_tuple, //
template <class...> class _Variant = stdexec::__variant>
using value_types_of_t STDEXEC_STD_DEPRECATED =
stdexec::value_types_of_t<_Sender, _Env, _Tuple, _Variant>;

template < //
class _Sender, //
class _Env = stdexec::no_env, //
class _Env = __no_env, //
template <class...> class _Variant = stdexec::__variant>
using error_types_of_t STDEXEC_STD_DEPRECATED =
stdexec::error_types_of_t<_Sender, _Env, _Variant>;

template <class _Sender, class _Env = stdexec::no_env>
template <class _Sender, class _Env = __no_env>
STDEXEC_STD_DEPRECATED inline constexpr bool sends_stopped =
stdexec::sends_stopped<_Sender, _Env>;

Expand Down Expand Up @@ -295,7 +299,7 @@ namespace std {
// [exec.utils.mkcmplsigs]
template < //
class _Sender, //
class _Env = stdexec::no_env,
class _Env = __no_env,
class _Sigs = stdexec::completion_signatures<>, //
template <class...> class _SetValue = stdexec::__compl_sigs::__default_set_value, //
template <class> class _SetError = stdexec::__compl_sigs::__default_set_error, //
Expand Down
Loading

0 comments on commit 61b79c8

Please sign in to comment.