Commitc383f24

authored

Merge pull request#791 from NVIDIA/mandate-noexcept-start

static_assert in start() when customization is not nothrow

2 parentsbb9b899 +7995c3c commitc383f24Copy full SHA for c383f24

File tree

+19

-15

lines changed

+19

-15

lines changed

Lines changed: 9 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1219,7 +1219,8 @@ namespace stdexec {`
`1219`	`1219`	`structstart_t {`
`1220`	`1220`	`template<class_Op>`
`1221`	`1221`	`requires tag_invocable<start_t, _Op&>`
`1222`		`-voidoperator()(_Op& __op)constnoexcept(nothrow_tag_invocable<start_t, _Op&>) {`
	`1222`	`+voidoperator()(_Op& __op)constnoexcept {`
	`1223`	`+static_assert(nothrow_tag_invocable<start_t, _Op&>);`
`1223`	`1224`	`(void)tag_invoke(start_t{}, __op);`
`1224`	`1225`	`}`
`1225`	`1226`	`};`
`@@ -1230,10 +1231,13 @@ namespace stdexec {`
`1230`	`1231`
`1231`	`1232`	`/////////////////////////////////////////////////////////////////////////////`
`1232`	`1233`	`// [execution.op_state]`
`1233`		`-template<class_O>`
`1234`		`-conceptoperation_state = destructible<_O> && std::is_object_v<_O> &&requires(_O& __o) {`
`1235`		`- {start(__o) }noexcept;`
`1236`		`- };`
	`1234`	`+template<class_Op>`
	`1235`	`+conceptoperation_state =//`
	`1236`	`+ destructible<_Op> &&//`
	`1237`	`+ std::is_object_v<_Op> &&//`
	`1238`	`+requires(_Op& __op) {//`
	`1239`	`+start(__op);`
	`1240`	`+ };`
`1237`	`1241`
`1238`	`1242`	`#if !_STD_NO_COROUTINES_`
`1239`	`1243`	`/////////////////////////////////////////////////////////////////////////////`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,11 +35,11 @@ struct op_noexcept {`
`35`	`35`	`}`
`36`	`36`	`};`
`37`	`37`
`38`		`-TEST_CASE(`
`39`		`-"type with start CPO that throws is not an operation_state",`
`40`		`-"[concepts][operation_state]") {`
`41`		`-REQUIRE(!ex::operation_state<op_except>);`
`42`		`-}`
	`38`	`+//TEST_CASE(`
	`39`	`+// "type with start CPO that throws is not an operation_state",`
	`40`	`+// "[concepts][operation_state]") {`
	`41`	`+// REQUIRE(!ex::operation_state<op_except>);`
	`42`	`+//}`
`43`	`43`
`44`	`44`	`TEST_CASE("type with start CPO noexcept is an operation_state","[concepts][operation_state]") {`
`45`	`45`	`REQUIRE(ex::operation_state<op_noexcept>);`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,39 +23,39 @@ namespace ex = stdexec;`
`23`	`23`	`structmy_oper : immovable {`
`24`	`24`	`bool started_{false};`
`25`	`25`
`26`		`-friendvoidtag_invoke(ex::start_t, my_oper& self) {`
	`26`	`+friendvoidtag_invoke(ex::start_t, my_oper& self)noexcept{`
`27`	`27`	`self.started_ =true;`
`28`	`28`	`}`
`29`	`29`	`};`
`30`	`30`
`31`	`31`	`structop_value/: immovable/ {// Intentionally movable!`
`32`	`32`	`bool* started_;`
`33`	`33`
`34`		`-friendvoidtag_invoke(ex::start_t, op_value self) {`
	`34`	`+friendvoidtag_invoke(ex::start_t, op_value self)noexcept{`
`35`	`35`	`*self.started_ =true;`
`36`	`36`	`}`
`37`	`37`	`};`
`38`	`38`
`39`	`39`	`structop_rvalref : immovable {`
`40`	`40`	`bool* started_;`
`41`	`41`
`42`		`-friendvoidtag_invoke(ex::start_t, op_rvalref&& self) {`
	`42`	`+friendvoidtag_invoke(ex::start_t, op_rvalref&& self)noexcept{`
`43`	`43`	`*self.started_ =true;`
`44`	`44`	`}`
`45`	`45`	`};`
`46`	`46`
`47`	`47`	`structop_ref : immovable {`
`48`	`48`	`bool* started_;`
`49`	`49`
`50`		`-friendvoidtag_invoke(ex::start_t, op_ref& self) {`
	`50`	`+friendvoidtag_invoke(ex::start_t, op_ref& self)noexcept{`
`51`	`51`	`*self.started_ =true;`
`52`	`52`	`}`
`53`	`53`	`};`
`54`	`54`
`55`	`55`	`structop_cref : immovable {`
`56`	`56`	`bool* started_;`
`57`	`57`
`58`		`-friendvoidtag_invoke(ex::start_t,const op_cref& self) {`
	`58`	`+friendvoidtag_invoke(ex::start_t,const op_cref& self)noexcept{`
`59`	`59`	`*self.started_ =true;`
`60`	`60`	`}`
`61`	`61`	`};`

Comments

(0)