Remove FastCWaker

h33p · Jul 29, 2024 · c6866cb · c6866cb
1 parent 95a9849
commit c6866cb
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 282 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cglue-gen/src/ext/core/future.rs b/cglue-gen/src/ext/core/future.rs
@@ -17,7 +17,7 @@ pub fn get_impl(parent_path: &Path, out: &mut Vec<(Path, TokenStream)>) {
                 #[custom_impl(
                     // Types within the C interface other than self and additional wrappers.
                     {
-                        cx: &#crate_path::task::FastCWaker,
+                        cx: &#crate_path::task::CWaker,
                         out: &mut ::core::mem::MaybeUninit<Self::Output>,
                     },
                     // Unwrapped return type
@@ -26,7 +26,7 @@ pub fn get_impl(parent_path: &Path, out: &mut Vec<(Path, TokenStream)>) {
                     {
                         let mut out_v = ::core::mem::MaybeUninit::uninit();
                         let out = &mut out_v;
-                        let cx = #crate_path::task::FastCWaker::from(cx.waker());
+                        let cx = #crate_path::task::CWaker::from(cx.waker());
                         let cx = &cx;
                     },
                     // This is the body of C impl minus the automatic wrapping.

diff --git a/cglue-gen/src/ext/futures/sink.rs b/cglue-gen/src/ext/futures/sink.rs
@@ -17,7 +17,7 @@ pub fn get_impl(parent_path: &Path, out: &mut Vec<(Path, TokenStream)>) {
                 #[custom_impl(
                     // Types within the C interface other than self and additional wrappers.
                     {
-                        cx: &#crate_path::task::FastCWaker,
+                        cx: &#crate_path::task::CWaker,
                         out: &mut ::core::mem::MaybeUninit<Self::Error>,
                     },
                     // Unwrapped return type
@@ -26,7 +26,7 @@ pub fn get_impl(parent_path: &Path, out: &mut Vec<(Path, TokenStream)>) {
                     {
                         let mut out_v = ::core::mem::MaybeUninit::uninit();
                         let out = &mut out_v;
-                        let cx = #crate_path::task::FastCWaker::from(cx.waker());
+                        let cx = #crate_path::task::CWaker::from(cx.waker());
                         let cx = &cx;
                     },
                     // This is the body of C impl minus the automatic wrapping.
@@ -93,7 +93,7 @@ pub fn get_impl(parent_path: &Path, out: &mut Vec<(Path, TokenStream)>) {
                 #[custom_impl(
                     // Types within the C interface other than self and additional wrappers.
                     {
-                        cx: &#crate_path::task::FastCWaker,
+                        cx: &#crate_path::task::CWaker,
                         out: &mut ::core::mem::MaybeUninit<Self::Error>,
                     },
                     // Unwrapped return type
@@ -102,7 +102,7 @@ pub fn get_impl(parent_path: &Path, out: &mut Vec<(Path, TokenStream)>) {
                     {
                         let mut out_v = ::core::mem::MaybeUninit::uninit();
                         let out = &mut out_v;
-                        let cx = #crate_path::task::FastCWaker::from(cx.waker());
+                        let cx = #crate_path::task::CWaker::from(cx.waker());
                         let cx = &cx;
                     },
                     // This is the body of C impl minus the automatic wrapping.
@@ -135,7 +135,7 @@ pub fn get_impl(parent_path: &Path, out: &mut Vec<(Path, TokenStream)>) {
                 #[custom_impl(
                     // Types within the C interface other than self and additional wrappers.
                     {
-                        cx: &#crate_path::task::FastCWaker,
+                        cx: &#crate_path::task::CWaker,
                         out: &mut ::core::mem::MaybeUninit<Self::Error>,
                     },
                     // Unwrapped return type
@@ -144,7 +144,7 @@ pub fn get_impl(parent_path: &Path, out: &mut Vec<(Path, TokenStream)>) {
                     {
                         let mut out_v = ::core::mem::MaybeUninit::uninit();
                         let out = &mut out_v;
-                        let cx = #crate_path::task::FastCWaker::from(cx.waker());
+                        let cx = #crate_path::task::CWaker::from(cx.waker());
                         let cx = &cx;
                     },
                     // This is the body of C impl minus the automatic wrapping.

diff --git a/cglue-gen/src/ext/futures/stream.rs b/cglue-gen/src/ext/futures/stream.rs
@@ -17,7 +17,7 @@ pub fn get_impl(parent_path: &Path, out: &mut Vec<(Path, TokenStream)>) {
                 #[custom_impl(
                     // Types within the C interface other than self and additional wrappers.
                     {
-                        cx: &#crate_path::task::FastCWaker,
+                        cx: &#crate_path::task::CWaker,
                         out: &mut ::core::mem::MaybeUninit<Self::Item>,
                     },
                     // Unwrapped return type
@@ -26,7 +26,7 @@ pub fn get_impl(parent_path: &Path, out: &mut Vec<(Path, TokenStream)>) {
                     {
                         let mut out_v = ::core::mem::MaybeUninit::uninit();
                         let out = &mut out_v;
-                        let cx = #crate_path::task::FastCWaker::from(cx.waker());
+                        let cx = #crate_path::task::CWaker::from(cx.waker());
                         let cx = &cx;
                     },
                     // This is the body of C impl minus the automatic wrapping.

diff --git a/cglue/Cargo.toml b/cglue/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cglue"
-version = "0.3.1"
+version = "0.3.2"
 authors = ["Aurimas Blažulionis <[email protected]>"]
 edition = "2018"
 description = "FFI safe abstractions for making plugins and C-compatible libraries"