Sync capy changes

Author: ashtum

include/boost/http/bcrypt.hpp

@@ -41,16 +41,15 @@
 #include <boost/system/error_code.hpp>
 #include <boost/system/is_error_code_enum.hpp>
 
-#include <boost/capy/coro.hpp>
 #include <boost/capy/task.hpp>
 #include <boost/capy/ex/executor_ref.hpp>
+#include <boost/capy/ex/io_env.hpp>
 #include <boost/capy/ex/run_async.hpp>
 #include <boost/capy/ex/system_context.hpp>
 
 #include <cstddef>
 #include <cstring>
 #include <exception>
-#include <stop_token>
 #include <string>
 #include <system_error>
 
@@ -532,24 +531,24 @@ struct hash_async_op
     }
 
     void await_suspend(
-        capy::coro cont,
-        capy::executor_ref caller_ex,
-        std::stop_token)
+        std::coroutine_handle<void> cont,
+        capy::io_env const* env)
     {
+        auto caller_ex = env->executor;
         auto& pool = capy::get_system_context();
         auto sys_ex = pool.get_executor();
         capy::run_async(sys_ex,
             [this, cont, caller_ex]
             (result r) mutable
             {
                 result_ = r;
-                caller_ex.dispatch(cont);
+                caller_ex.dispatch(cont).resume();
             },
             [this, cont, caller_ex]
             (std::exception_ptr ep) mutable
             {
                 ep_ = ep;
-                caller_ex.dispatch(cont);
+                caller_ex.dispatch(cont).resume();
             }
         )(hash_task(password_, rounds_, ver_));
     }
@@ -575,24 +574,24 @@ struct compare_async_op
     }
 
     void await_suspend(
-        capy::coro cont,
-        capy::executor_ref caller_ex,
-        std::stop_token)
+        std::coroutine_handle<void> cont,
+        capy::io_env const* env)
     {
+        auto caller_ex = env->executor;
         auto& pool = capy::get_system_context();
         auto sys_ex = pool.get_executor();
         capy::run_async(sys_ex,
             [this, cont, caller_ex]
             (bool ok) mutable
             {
                 result_ = ok;
-                caller_ex.dispatch(cont);
+                caller_ex.dispatch(cont).resume();
             },
             [this, cont, caller_ex]
             (std::exception_ptr ep) mutable
             {
                 ep_ = ep;
-                caller_ex.dispatch(cont);
+                caller_ex.dispatch(cont).resume();
             }
         )(compare_task(password_, hash_str_));
     }

test/unit/bcrypt.cpp

@@ -9,7 +9,6 @@
 
 #include <boost/http/bcrypt.hpp>
 
-#include <boost/capy/coro.hpp>
 #include <boost/capy/ex/execution_context.hpp>
 #include <boost/capy/ex/run_async.hpp>
 #include <boost/capy/ex/system_context.hpp>
@@ -51,12 +50,12 @@ struct test_executor
     void on_work_started() const noexcept {}
     void on_work_finished() const noexcept {}
 
-    void dispatch(capy::coro h) const
+    std::coroutine_handle<> dispatch(std::coroutine_handle<void> h) const
     {
-        h.resume();
+        return h;
     }
 
-    void post(capy::coro h) const
+    void post(std::coroutine_handle<void> h) const
     {
         h.resume();
     }

test/unit/json/json_sink.cpp

@@ -13,7 +13,6 @@
 #include <boost/capy/buffers.hpp>
 #include <boost/capy/buffers/make_buffer.hpp>
 #include <boost/capy/concept/write_sink.hpp>
-#include <boost/capy/coro.hpp>
 #include <boost/capy/ex/execution_context.hpp>
 #include <boost/capy/ex/run_async.hpp>
 #include <boost/capy/io_result.hpp>
@@ -68,14 +67,14 @@ struct test_executor
     void on_work_started() const noexcept {}
     void on_work_finished() const noexcept {}
 
-    void dispatch(capy::coro h) const
+    std::coroutine_handle<> dispatch(std::coroutine_handle<void> h) const
     {
         if(dispatch_count_)
             ++(*dispatch_count_);
-        h.resume();
+        return h;
     }
 
-    void post(capy::coro h) const
+    void post(std::coroutine_handle<void> h) const
     {
         h.resume();
     }