Replace use of unsafe with pin_project (#711)

mitsuhiko · Jan 23, 2025 · f778d29 · f778d29
1 parent 949ac94
commit f778d29
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/insta/Cargo.toml b/insta/Cargo.toml
@@ -63,6 +63,7 @@ once_cell = "1.20.2"
 # Not yet supported in our MSRV of 1.60.0
 # clap = { workspace=true, optional = true }
 clap = { version = "4.1", features = ["derive", "env"], optional = true }
+pin-project = "1"
 
 [dev-dependencies]
 rustc_version = "0.4.0"

diff --git a/insta/src/settings.rs b/insta/src/settings.rs
@@ -523,14 +523,15 @@ impl Settings {
     /// # }
     /// ```
     pub fn bind_async<F: Future<Output = T>, T>(&self, future: F) -> impl Future<Output = T> {
-        struct BindingFuture<F>(Arc<ActualSettings>, F);
+        #[pin_project::pin_project]
+        struct BindingFuture<F>(Arc<ActualSettings>, #[pin] F);
 
         impl<F: Future> Future for BindingFuture<F> {
             type Output = F::Output;
 
             fn poll(self: Pin<&mut Self>, cx: &mut Context) -> Poll<Self::Output> {
                 let inner = self.0.clone();
-                let future = unsafe { self.map_unchecked_mut(|s| &mut s.1) };
+                let future = self.project().1;
                 CURRENT_SETTINGS.with(|x| {
                     let old = {
                         let mut current = x.borrow_mut();