From ee616643a4134d18c712ce065b6e0b1832853296 Mon Sep 17 00:00:00 2001
From: Jason White <jasonwhite@meta.com>
Date: Fri, 18 Nov 2022 12:36:51 -0800
Subject: [PATCH] Remove need for async_closure unstable feature

Summary: Removes usage of the `async_closure` unstable feature. This brings us one step closer to removing all usage of unstable nightly features, which will allow publishing a crate on https://crates.io.

Reviewed By: rrnewton

Differential Revision: D41387688

fbshipit-source-id: 136c5c8d19876e732d18dca195e87e3bc2ab7661
---
 reverie-ptrace/src/gdbstub/session.rs | 12 ++++++------
 reverie-ptrace/src/lib.rs             |  1 -
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/reverie-ptrace/src/gdbstub/session.rs b/reverie-ptrace/src/gdbstub/session.rs
index 1faee91..3366f5f 100644
--- a/reverie-ptrace/src/gdbstub/session.rs
+++ b/reverie-ptrace/src/gdbstub/session.rs
@@ -719,7 +719,7 @@ impl Session {
 
     /// Set a breakpoint. must have an active inferior.
     async fn set_breakpoint(&self, bkpt: Breakpoint) -> Result<(), Error> {
-        self.with_current_inferior(async move |inferior| {
+        self.with_current_inferior(move |inferior| async move {
             let request_tx = inferior
                 .request_tx
                 .as_ref()
@@ -744,7 +744,7 @@ impl Session {
     }
 
     async fn remove_breakpoint(&self, bkpt: Breakpoint) -> Result<(), Error> {
-        self.with_current_inferior(async move |inferior| {
+        self.with_current_inferior(move |inferior| async move {
             let request_tx = inferior
                 .request_tx
                 .as_ref()
@@ -770,7 +770,7 @@ impl Session {
     }
 
     async fn read_inferior_memory(&self, addr: u64, size: usize) -> Result<Vec<u8>, Error> {
-        self.with_current_inferior(async move |inferior| {
+        self.with_current_inferior(move |inferior| async move {
             let request_tx = inferior
                 .request_tx
                 .as_ref()
@@ -794,7 +794,7 @@ impl Session {
         data: Vec<u8>,
     ) -> Result<(), Error> {
         let data = data.clone();
-        self.with_current_inferior(async move |inferior| {
+        self.with_current_inferior(move |inferior| async move {
             let request_tx = inferior
                 .request_tx
                 .as_ref()
@@ -812,7 +812,7 @@ impl Session {
     }
 
     async fn read_registers(&self) -> Result<CoreRegs, Error> {
-        self.with_current_inferior(async move |inferior| {
+        self.with_current_inferior(move |inferior| async move {
             let request_tx = inferior
                 .request_tx
                 .as_ref()
@@ -830,7 +830,7 @@ impl Session {
     }
 
     async fn write_registers(&self, regs: Vec<u8>) -> Result<(), Error> {
-        self.with_current_inferior(async move |inferior| {
+        self.with_current_inferior(move |inferior| async move {
             let regs = regs.as_slice();
             let request_tx = inferior
                 .request_tx
diff --git a/reverie-ptrace/src/lib.rs b/reverie-ptrace/src/lib.rs
index c9843a0..9b57155 100644
--- a/reverie-ptrace/src/lib.rs
+++ b/reverie-ptrace/src/lib.rs
@@ -28,7 +28,6 @@
 //!
 #![deny(missing_docs)]
 #![deny(rustdoc::broken_intra_doc_links)]
-#![feature(async_closure)]
 #![feature(internal_output_capture)]
 #![feature(never_type)]
 #![feature(map_first_last)]