Skip to content

refactor: port to capy's io_result tuple alias #339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sgerbino merged 1 commit into from
Aug 17, 2026
Merged

refactor: port to capy's io_result tuple alias #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/boost/corosio/delay.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ class delay_awaitable
}

/// Return empty on expiry, `error::canceled` if stop won.
capy::io_result<> await_resume() noexcept
[[nodiscard]] capy::io_result<> await_resume() noexcept
{
if(canceled_)
return {capy::error::canceled};
Expand Down Expand Up @@ -312,7 +312,7 @@ class clock_delay_awaitable
}

/// Return empty on deadline, `error::canceled` if stop won.
capy::io_result<> await_resume() noexcept
[[nodiscard]] capy::io_result<> await_resume() noexcept
{
if(canceled_)
return {capy::error::canceled};
Expand Down
4 changes: 2 additions & 2 deletions include/boost/corosio/detail/op_base.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class bytes_op_base
return token_.stop_requested();
}

capy::io_result<std::size_t> await_resume() const noexcept
[[nodiscard]] capy::io_result<std::size_t> await_resume() const noexcept
{
if (token_.stop_requested())
return {make_error_code(std::errc::operation_canceled), 0};
Expand Down Expand Up @@ -90,7 +90,7 @@ class void_op_base
return token_.stop_requested();
}

capy::io_result<> await_resume() const noexcept
[[nodiscard]] capy::io_result<> await_resume() const noexcept
{
if (token_.stop_requested())
return {make_error_code(std::errc::operation_canceled)};
Expand Down
4 changes: 2 additions & 2 deletions include/boost/corosio/detail/timeout_awaitable.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,10 +238,10 @@ struct timeout_awaitable
// landing in the same window as the deadline firing is
// reported as a timeout.
if (fired && !parent &&
r.ec == capy::cond::canceled)
std::get<0>(r) == capy::cond::canceled)
{
std::remove_cvref_t<decltype(r)> t{};
t.ec = make_error_code(capy::error::timeout);
std::get<0>(t) = make_error_code(capy::error::timeout);
return t;
}
return r;
Expand Down
2 changes: 1 addition & 1 deletion include/boost/corosio/detail/timer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@ struct wait_awaitable
// Cancellation surfaces through w_.ec_: the stop_token path in
// wait() completes the waiter with error::canceled written to
// it, so there is no separate token to consult here.
capy::io_result<> await_resume() const noexcept
[[nodiscard]] capy::io_result<> await_resume() const noexcept
{
return {w_.ec_};
}
Expand Down
2 changes: 1 addition & 1 deletion include/boost/corosio/io/io_signal_set.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class BOOST_COROSIO_DECL io_signal_set : public io_object
return token_.stop_requested();
}

capy::io_result<int> await_resume() const noexcept
[[nodiscard]] capy::io_result<int> await_resume() const noexcept
{
if (token_.stop_requested())
return {capy::error::canceled, 0};
Expand Down
4 changes: 2 additions & 2 deletions include/boost/corosio/local_stream_acceptor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ class BOOST_COROSIO_DECL local_stream_acceptor : public io_object
return token_.stop_requested();
}

capy::io_result<local_stream_socket> await_resume() const noexcept
[[nodiscard]] capy::io_result<local_stream_socket> await_resume() const noexcept
{
if (token_.stop_requested())
return {make_error_code(std::errc::operation_canceled),
Expand Down Expand Up @@ -154,7 +154,7 @@ class BOOST_COROSIO_DECL local_stream_acceptor : public io_object
return token_.stop_requested();
}

capy::io_result<> await_resume() const noexcept
[[nodiscard]] capy::io_result<> await_resume() const noexcept
{
if (token_.stop_requested())
return {make_error_code(std::errc::operation_canceled)};
Expand Down
12 changes: 6 additions & 6 deletions include/boost/corosio/native/native_local_datagram_socket.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ class native_local_datagram_socket : public local_datagram_socket
return token_.stop_requested();
}

capy::io_result<std::size_t> await_resume() const noexcept
[[nodiscard]] capy::io_result<std::size_t> await_resume() const noexcept
{
if (token_.stop_requested())
return {make_error_code(std::errc::operation_canceled), 0};
Expand Down Expand Up @@ -161,7 +161,7 @@ class native_local_datagram_socket : public local_datagram_socket
return token_.stop_requested();
}

capy::io_result<std::size_t> await_resume() const noexcept
[[nodiscard]] capy::io_result<std::size_t> await_resume() const noexcept
{
if (token_.stop_requested())
return {make_error_code(std::errc::operation_canceled), 0};
Expand Down Expand Up @@ -197,7 +197,7 @@ class native_local_datagram_socket : public local_datagram_socket
return token_.stop_requested();
}

capy::io_result<> await_resume() const noexcept
[[nodiscard]] capy::io_result<> await_resume() const noexcept
{
if (token_.stop_requested())
return {make_error_code(std::errc::operation_canceled)};
Expand Down Expand Up @@ -233,7 +233,7 @@ class native_local_datagram_socket : public local_datagram_socket
return token_.stop_requested();
}

capy::io_result<> await_resume() const noexcept
[[nodiscard]] capy::io_result<> await_resume() const noexcept
{
if (token_.stop_requested())
return {make_error_code(std::errc::operation_canceled)};
Expand Down Expand Up @@ -274,7 +274,7 @@ class native_local_datagram_socket : public local_datagram_socket
return token_.stop_requested();
}

capy::io_result<std::size_t> await_resume() const noexcept
[[nodiscard]] capy::io_result<std::size_t> await_resume() const noexcept
{
if (token_.stop_requested())
return {make_error_code(std::errc::operation_canceled), 0};
Expand Down Expand Up @@ -316,7 +316,7 @@ class native_local_datagram_socket : public local_datagram_socket
return token_.stop_requested();
}

capy::io_result<std::size_t> await_resume() const noexcept
[[nodiscard]] capy::io_result<std::size_t> await_resume() const noexcept
{
if (token_.stop_requested())
return {make_error_code(std::errc::operation_canceled), 0};
Expand Down
6 changes: 3 additions & 3 deletions include/boost/corosio/native/native_local_stream_acceptor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ class native_local_stream_acceptor : public local_stream_acceptor
return token_.stop_requested();
}

capy::io_result<> await_resume() const noexcept
[[nodiscard]] capy::io_result<> await_resume() const noexcept
{
if (token_.stop_requested())
return {make_error_code(std::errc::operation_canceled)};
Expand Down Expand Up @@ -131,7 +131,7 @@ class native_local_stream_acceptor : public local_stream_acceptor
return token_.stop_requested();
}

capy::io_result<> await_resume() const noexcept
[[nodiscard]] capy::io_result<> await_resume() const noexcept
{
if (token_.stop_requested())
return {make_error_code(std::errc::operation_canceled)};
Expand Down Expand Up @@ -167,7 +167,7 @@ class native_local_stream_acceptor : public local_stream_acceptor
return token_.stop_requested();
}

capy::io_result<native_local_stream_socket<Backend>>
[[nodiscard]] capy::io_result<native_local_stream_socket<Backend>>
await_resume() const noexcept
{
if (token_.stop_requested())
Expand Down
8 changes: 4 additions & 4 deletions include/boost/corosio/native/native_local_stream_socket.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class native_local_stream_socket : public local_stream_socket
return token_.stop_requested();
}

capy::io_result<std::size_t> await_resume() const noexcept
[[nodiscard]] capy::io_result<std::size_t> await_resume() const noexcept
{
if (token_.stop_requested())
return {make_error_code(std::errc::operation_canceled), 0};
Expand Down Expand Up @@ -143,7 +143,7 @@ class native_local_stream_socket : public local_stream_socket
return token_.stop_requested();
}

capy::io_result<std::size_t> await_resume() const noexcept
[[nodiscard]] capy::io_result<std::size_t> await_resume() const noexcept
{
if (token_.stop_requested())
return {make_error_code(std::errc::operation_canceled), 0};
Expand Down Expand Up @@ -178,7 +178,7 @@ class native_local_stream_socket : public local_stream_socket
return token_.stop_requested();
}

capy::io_result<> await_resume() const noexcept
[[nodiscard]] capy::io_result<> await_resume() const noexcept
{
if (token_.stop_requested())
return {make_error_code(std::errc::operation_canceled)};
Expand Down Expand Up @@ -214,7 +214,7 @@ class native_local_stream_socket : public local_stream_socket
return token_.stop_requested();
}

capy::io_result<> await_resume() const noexcept
[[nodiscard]] capy::io_result<> await_resume() const noexcept
{
if (token_.stop_requested())
return {make_error_code(std::errc::operation_canceled)};
Expand Down
4 changes: 2 additions & 2 deletions include/boost/corosio/native/native_random_access_file.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ class native_random_access_file : public random_access_file
return token_.stop_requested();
}

capy::io_result<std::size_t> await_resume() const noexcept
[[nodiscard]] capy::io_result<std::size_t> await_resume() const noexcept
{
if (token_.stop_requested())
return {make_error_code(std::errc::operation_canceled), 0};
Expand Down Expand Up @@ -152,7 +152,7 @@ class native_random_access_file : public random_access_file
return token_.stop_requested();
}

capy::io_result<std::size_t> await_resume() const noexcept
[[nodiscard]] capy::io_result<std::size_t> await_resume() const noexcept
{
if (token_.stop_requested())
return {make_error_code(std::errc::operation_canceled), 0};
Expand Down
4 changes: 2 additions & 2 deletions include/boost/corosio/native/native_resolver.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class native_resolver : public resolver
return token_.stop_requested();
}

capy::io_result<resolver_results> await_resume() const noexcept
[[nodiscard]] capy::io_result<resolver_results> await_resume() const noexcept
{
if (token_.stop_requested())
return {make_error_code(std::errc::operation_canceled), {}};
Expand Down Expand Up @@ -126,7 +126,7 @@ class native_resolver : public resolver
return token_.stop_requested();
}

capy::io_result<reverse_resolver_result> await_resume() const noexcept
[[nodiscard]] capy::io_result<reverse_resolver_result> await_resume() const noexcept
{
if (token_.stop_requested())
return {make_error_code(std::errc::operation_canceled), {}};
Expand Down
2 changes: 1 addition & 1 deletion include/boost/corosio/native/native_signal_set.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class native_signal_set : public signal_set
return token_.stop_requested();
}

capy::io_result<int> await_resume() const noexcept
[[nodiscard]] capy::io_result<int> await_resume() const noexcept
{
if (token_.stop_requested())
return {capy::error::canceled, 0};
Expand Down
4 changes: 2 additions & 2 deletions include/boost/corosio/native/native_stream_file.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ class native_stream_file : public stream_file
return token_.stop_requested();
}

capy::io_result<std::size_t> await_resume() const noexcept
[[nodiscard]] capy::io_result<std::size_t> await_resume() const noexcept
{
if (token_.stop_requested())
return {make_error_code(std::errc::operation_canceled), 0};
Expand Down Expand Up @@ -144,7 +144,7 @@ class native_stream_file : public stream_file
return token_.stop_requested();
}

capy::io_result<std::size_t> await_resume() const noexcept
[[nodiscard]] capy::io_result<std::size_t> await_resume() const noexcept
{
if (token_.stop_requested())
return {make_error_code(std::errc::operation_canceled), 0};
Expand Down
6 changes: 3 additions & 3 deletions include/boost/corosio/native/native_tcp_acceptor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ class native_tcp_acceptor : public tcp_acceptor
return token_.stop_requested();
}

capy::io_result<> await_resume() const noexcept
[[nodiscard]] capy::io_result<> await_resume() const noexcept
{
if (token_.stop_requested())
return {make_error_code(std::errc::operation_canceled)};
Expand Down Expand Up @@ -123,7 +123,7 @@ class native_tcp_acceptor : public tcp_acceptor
return token_.stop_requested();
}

capy::io_result<> await_resume() const noexcept
[[nodiscard]] capy::io_result<> await_resume() const noexcept
{
if (token_.stop_requested())
return {make_error_code(std::errc::operation_canceled)};
Expand Down Expand Up @@ -160,7 +160,7 @@ class native_tcp_acceptor : public tcp_acceptor
return token_.stop_requested();
}

capy::io_result<tcp_socket> await_resume() noexcept
[[nodiscard]] capy::io_result<tcp_socket> await_resume() noexcept
{
if (token_.stop_requested())
return {make_error_code(std::errc::operation_canceled),
Expand Down
8 changes: 4 additions & 4 deletions include/boost/corosio/native/native_tcp_socket.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ class native_tcp_socket : public tcp_socket
return token_.stop_requested();
}

capy::io_result<std::size_t> await_resume() const noexcept
[[nodiscard]] capy::io_result<std::size_t> await_resume() const noexcept
{
if (token_.stop_requested())
return {make_error_code(std::errc::operation_canceled), 0};
Expand Down Expand Up @@ -141,7 +141,7 @@ class native_tcp_socket : public tcp_socket
return token_.stop_requested();
}

capy::io_result<std::size_t> await_resume() const noexcept
[[nodiscard]] capy::io_result<std::size_t> await_resume() const noexcept
{
if (token_.stop_requested())
return {make_error_code(std::errc::operation_canceled), 0};
Expand Down Expand Up @@ -175,7 +175,7 @@ class native_tcp_socket : public tcp_socket
return token_.stop_requested();
}

capy::io_result<> await_resume() const noexcept
[[nodiscard]] capy::io_result<> await_resume() const noexcept
{
if (token_.stop_requested())
return {make_error_code(std::errc::operation_canceled)};
Expand Down Expand Up @@ -209,7 +209,7 @@ class native_tcp_socket : public tcp_socket
return token_.stop_requested();
}

capy::io_result<> await_resume() const noexcept
[[nodiscard]] capy::io_result<> await_resume() const noexcept
{
if (token_.stop_requested())
return {make_error_code(std::errc::operation_canceled)};
Expand Down
12 changes: 6 additions & 6 deletions include/boost/corosio/native/native_udp_socket.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ class native_udp_socket : public udp_socket
return token_.stop_requested();
}

capy::io_result<std::size_t> await_resume() const noexcept
[[nodiscard]] capy::io_result<std::size_t> await_resume() const noexcept
{
if (token_.stop_requested())
return {make_error_code(std::errc::operation_canceled), 0};
Expand Down Expand Up @@ -160,7 +160,7 @@ class native_udp_socket : public udp_socket
return token_.stop_requested();
}

capy::io_result<std::size_t> await_resume() const noexcept
[[nodiscard]] capy::io_result<std::size_t> await_resume() const noexcept
{
if (token_.stop_requested())
return {make_error_code(std::errc::operation_canceled), 0};
Expand Down Expand Up @@ -195,7 +195,7 @@ class native_udp_socket : public udp_socket
return token_.stop_requested();
}

capy::io_result<> await_resume() const noexcept
[[nodiscard]] capy::io_result<> await_resume() const noexcept
{
if (token_.stop_requested())
return {make_error_code(std::errc::operation_canceled)};
Expand Down Expand Up @@ -229,7 +229,7 @@ class native_udp_socket : public udp_socket
return token_.stop_requested();
}

capy::io_result<> await_resume() const noexcept
[[nodiscard]] capy::io_result<> await_resume() const noexcept
{
if (token_.stop_requested())
return {make_error_code(std::errc::operation_canceled)};
Expand Down Expand Up @@ -270,7 +270,7 @@ class native_udp_socket : public udp_socket
return token_.stop_requested();
}

capy::io_result<std::size_t> await_resume() const noexcept
[[nodiscard]] capy::io_result<std::size_t> await_resume() const noexcept
{
if (token_.stop_requested())
return {make_error_code(std::errc::operation_canceled), 0};
Expand Down Expand Up @@ -312,7 +312,7 @@ class native_udp_socket : public udp_socket
return token_.stop_requested();
}

capy::io_result<std::size_t> await_resume() const noexcept
[[nodiscard]] capy::io_result<std::size_t> await_resume() const noexcept
{
if (token_.stop_requested())
return {make_error_code(std::errc::operation_canceled), 0};
Expand Down
4 changes: 2 additions & 2 deletions include/boost/corosio/random_access_file.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ class BOOST_COROSIO_DECL random_access_file : public io_object
return false;
}

capy::io_result<std::size_t> await_resume() const noexcept
[[nodiscard]] capy::io_result<std::size_t> await_resume() const noexcept
{
return {ec_, bytes_};
}
Expand Down Expand Up @@ -204,7 +204,7 @@ class BOOST_COROSIO_DECL random_access_file : public io_object
return false;
}

capy::io_result<std::size_t> await_resume() const noexcept
[[nodiscard]] capy::io_result<std::size_t> await_resume() const noexcept
{
return {ec_, bytes_};
}
Expand Down
Loading
Loading