feat: update deps

pcwalton · Nov 25, 2024 · d756ff7 · d756ff7
1 parent ac98030
commit d756ff7
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 43 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cxx-async/Cargo.toml b/cxx-async/Cargo.toml
@@ -18,7 +18,6 @@ crate-type = ["lib"]
 [dependencies]
 async-recursion = "1"
 once_cell = "1"
-pin-utils = "0.1"
 
 # CXX related dependencies
 cxx = { version = "1", features = ["c++20"] }

diff --git a/cxx-async/src/lib.rs b/cxx-async/src/lib.rs
@@ -188,9 +188,6 @@ const SEND_RESULT_FINISHED: u32 = 2;
 
 pub use cxx_async_macro::bridge;
 
-#[doc(hidden)]
-pub use pin_utils::unsafe_pinned;
-
 // Replacements for macros that panic that are guaranteed to cause an abort, so that we don't unwind
 // across C++ frames.
 

diff --git a/examples/cppcoro/Cargo.toml b/examples/cppcoro/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Patrick Walton <pcwalton@mimiga.net>"]
 edition = "2018"
 
 [dependencies]
-async-recursion = "0.3"
+async-recursion = "1"
 once_cell = "1"
 
 # CXX related dependencies

diff --git a/examples/cppcoro/build.rs b/examples/cppcoro/build.rs
@@ -11,6 +11,7 @@ fn main() {
 
     cxx_build::bridge("src/main.rs")
         .file("src/cppcoro_example.cpp")
+        .flag("-std=c++20")
         .flag_if_supported("-Wall")
         .include("include")
         .include("../common/include")

diff --git a/examples/cppcoro/src/main.rs b/examples/cppcoro/src/main.rs
@@ -12,6 +12,7 @@ use futures::{StreamExt, TryStreamExt};
 use once_cell::sync::Lazy;
 use std::future::Future;
 use std::ops::Range;
+use std::pin::Pin;
 
 #[cxx::bridge]
 mod ffi {

diff --git a/examples/folly/Cargo.toml b/examples/folly/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Patrick Walton <pcwalton@mimiga.net>"]
 edition = "2018"
 
 [dependencies]
-async-recursion = "0.3"
+async-recursion = "1"
 once_cell = "1"
 
 # CXX related dependencies

diff --git a/examples/folly/src/main.rs b/examples/folly/src/main.rs
@@ -12,6 +12,7 @@ use futures::{StreamExt, TryStreamExt};
 use once_cell::sync::Lazy;
 use std::future::Future;
 use std::ops::Range;
+use std::pin::Pin;
 
 #[cxx::bridge]
 mod ffi {

diff --git a/macro/Cargo.toml b/macro/Cargo.toml
@@ -14,4 +14,4 @@ proc-macro = true
 [dependencies]
 proc-macro2 = "1"
 quote = "1"
-syn = { version = "1", features = ["full"] }
+syn = { version = "2" }
diff --git a/macro/src/lib.rs b/macro/src/lib.rs
@@ -120,8 +120,9 @@ fn bridge_future(pieces: AstPieces) -> TokenStream {
             //    method.
             // 3. The struct isn't `repr(packed)`. We define the struct and don't have this
             //    attribute.
-            ::cxx_async::unsafe_pinned!(future: ::cxx_async::private::BoxFuture<'static,
-                ::cxx_async::CxxAsyncResult<#output>>);
+            fn future(self: Pin<&mut Self>) -> Pin<&mut ::cxx_async::private::BoxFuture<'static, ::cxx_async::CxxAsyncResult<#output>>> {
+                unsafe { self.map_unchecked_mut(|s| &mut s.future) }
+            }
 
             #[doc(hidden)]
             fn assert_field_is_unpin() {
@@ -272,8 +273,9 @@ fn bridge_stream(pieces: AstPieces) -> TokenStream {
             //    method.
             // 3. The struct isn't `repr(packed)`. We define the struct and don't have this
             //    attribute.
-            ::cxx_async::unsafe_pinned!(stream: ::cxx_async::private::BoxStream<'static,
-                ::cxx_async::CxxAsyncResult<#item>>);
+            fn stream(self: Pin<&mut Self>) -> Pin<&mut ::cxx_async::private::BoxStream<'static, ::cxx_async::CxxAsyncResult<#item>>> {
+                unsafe { self.map_unchecked_mut(|s| &mut s.stream) }
+            }
 
             #[doc(hidden)]
             fn assert_field_is_unpin() {