Skip to content

Commit 2f5a5c5

Browse files
committed
Fix CI error
1 parent cf6e67f commit 2f5a5c5

6 files changed

Lines changed: 22 additions & 19 deletions

File tree

include/beman/execution/detail/common.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
try { \
2323
(expr); \
2424
} catch (...) { \
25-
if constexpr (!noexcept((expr))) { \
25+
if constexpr (!noexcept((expr))) { \
2626
::beman::execution::set_error(::std::move((rcvr)), ::std::current_exception()); \
2727
} \
2828
} \

include/beman/execution/detail/dependent_sender.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@
33

44
#ifndef INCLUDED_BEMAN_EXECUTION_DETAIL_DEPENDENT_SENDER
55
#define INCLUDED_BEMAN_EXECUTION_DETAIL_DEPENDENT_SENDER
6-
#include "completion_signatures_for.hpp"
76

7+
#include <beman/execution/detail/common.hpp>
88
#ifdef BEMAN_HAS_IMPORT_STD
99
import std;
1010
#else
1111
#include <concepts>
1212
#endif
13-
#include <beman/execution/detail/common.hpp>
1413
#ifdef BEMAN_HAS_MODULES
1514
import beman.execution.detail.get_completion_signatures;
1615
import beman.execution.detail.sender;

include/beman/execution/detail/into_variant.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ struct into_variant_t : ::beman::execution::sender_adaptor_closure<into_variant_
9191
static consteval auto get() {
9292
using variant_type = ::beman::execution::value_types_of_t<Child, Env>;
9393
using value_types = ::std::conditional_t<
94-
::std::same_as<variant_type, ::beman::execution::detail::empty_variant>,
95-
::beman::execution::completion_signatures<>,
96-
::beman::execution::completion_signatures<::beman::execution::set_value_t(variant_type)>>;
94+
::std::same_as<variant_type, ::beman::execution::detail::empty_variant>,
95+
::beman::execution::completion_signatures<>,
96+
::beman::execution::completion_signatures<::beman::execution::set_value_t(variant_type)>>;
9797

9898
using error_types = ::beman::execution::error_types_of_t<Child, Env, make_error_types>;
9999
using stopped_types =

include/beman/execution/detail/read_env.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ struct read_env_t {
5555
using set_value_type = ::beman::execution::set_value_t(
5656
decltype(::std::declval<Query>()(::std::as_const(::std::declval<::std::add_lvalue_reference_t<Env>>()))));
5757
using set_error_type = ::beman::execution::set_error_t(::std::exception_ptr);
58-
using type = ::std::conditional_t<noexcept(::std::declval<Query>()(::std::declval<const Env&>())),
59-
::beman::execution::completion_signatures<set_value_type>,
60-
::beman::execution::completion_signatures<set_value_type, set_error_type>>;
58+
using type = ::std::conditional_t<noexcept(::std::declval<Query>()(::std::declval<const Env&>())),
59+
::beman::execution::completion_signatures<set_value_type>,
60+
::beman::execution::completion_signatures<set_value_type, set_error_type>>;
6161
};
6262

6363
public:

include/beman/execution/detail/when_all.hpp

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,16 @@ concept valid_when_all_sender = ::beman::execution::dependent_sender<Sender> ||
114114
::std::tuple,
115115
::beman::execution::detail::type_list>> == 1u;
116116

117+
inline constexpr auto make_when_all_env = [](const ::beman::execution::inplace_stop_source& stop_src,
118+
const auto& env) noexcept {
119+
return ::beman::execution::detail::join_env(
120+
::beman::execution::detail::make_env(::beman::execution::get_stop_token, stop_src.get_token()), env);
121+
};
122+
123+
template <typename Env>
124+
using when_all_env =
125+
decltype(make_when_all_env(::std::declval<::beman::execution::inplace_stop_source>(), ::std::declval<Env>()));
126+
117127
struct when_all_t {
118128
template <::beman::execution::sender... Sender>
119129
requires(0u != sizeof...(Sender)) && (... && beman::execution::detail::valid_when_all_sender<Sender>) &&
@@ -164,15 +174,6 @@ struct when_all_t {
164174
}
165175

166176
struct impls_for : ::beman::execution::detail::default_impls {
167-
static constexpr auto make_when_all_env = [](const ::beman::execution::inplace_stop_source& stop_src,
168-
const auto& env) noexcept {
169-
return ::beman::execution::detail::join_env(
170-
::beman::execution::detail::make_env(::beman::execution::get_stop_token, stop_src.get_token()), env);
171-
};
172-
template <typename Env>
173-
using when_all_env =
174-
decltype(make_when_all_env(std::declval<::beman::execution::inplace_stop_source>(), std::declval<Env>()));
175-
176177
struct get_attrs_impl {
177178
auto operator()(auto&&, auto&&... sender) const {
178179
using common_t =

tests/beman/execution/exec-snd-expos.test.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1146,7 +1146,10 @@ auto test_basic_sender() -> void {
11461146
static_assert(
11471147
std::same_as<basic_sender_tag::sender,
11481148
decltype(test_std::transform_sender(test_std::default_domain{}, basic_sender{}, local_env{}))>);
1149-
static_assert(test_std::sender_in<basic_sender>);
1149+
static_assert(test_std::dependent_sender<sender0>);
1150+
// According to https://eel.is/c++draft/exec#adapt.general-3.5, basic_sender shall be a dependent-sender
1151+
static_assert(test_std::dependent_sender<basic_sender>);
1152+
static_assert(test_std::sender_in<basic_sender, local_env>);
11501153
#if 0
11511154
//-dk:TODO restore completion_sigatures_for test
11521155
static_assert(std::same_as<

0 commit comments

Comments
 (0)