[omdb] switch to async closures (#7814)

sunshowers · web-flow · commit 0b616db92d95 · 2025-03-18T12:21:42.000-07:00
Similar to #7810.
diff --git a/dev-tools/omdb/src/bin/omdb/db.rs b/dev-tools/omdb/src/bin/omdb/db.rs
@@ -2657,7 +2657,7 @@ async fn cmd_db_volume_lock_holder(
     let maybe_volume_repair_record = datastore
         .pool_connection_for_tests()
         .await?
-        .transaction_async(|conn| async move {
+        .transaction_async(async move |conn| {
             use db::schema::volume_repair::dsl;
 
             conn.batch_execute_async(ALLOW_FULL_TABLE_SCAN_SQL).await?;
@@ -2802,7 +2802,7 @@ async fn cmd_db_region_used_by(
         datastore
             .pool_connection_for_tests()
             .await?
-            .transaction_async(|conn| async move {
+            .transaction_async(async move |conn| {
                 use db::schema::disk::dsl;
 
                 conn.batch_execute_async(ALLOW_FULL_TABLE_SCAN_SQL).await?;
@@ -2829,7 +2829,7 @@ async fn cmd_db_region_used_by(
         datastore
             .pool_connection_for_tests()
             .await?
-            .transaction_async(|conn| async move {
+            .transaction_async(async move |conn| {
                 use db::schema::snapshot::dsl;
 
                 conn.batch_execute_async(ALLOW_FULL_TABLE_SCAN_SQL).await?;
@@ -2860,7 +2860,7 @@ async fn cmd_db_region_used_by(
         datastore
             .pool_connection_for_tests()
             .await?
-            .transaction_async(|conn| async move {
+            .transaction_async(async move |conn| {
                 use db::schema::image::dsl;
 
                 conn.batch_execute_async(ALLOW_FULL_TABLE_SCAN_SQL).await?;
@@ -5019,7 +5019,7 @@ async fn cmd_db_validate_volume_references(
         let region_snapshots: Vec<RegionSnapshot> = datastore
             .pool_connection_for_tests()
             .await?
-            .transaction_async(|conn| async move {
+            .transaction_async(async move |conn| {
                 // Selecting all region snapshots requires a full table scan
                 conn.batch_execute_async(ALLOW_FULL_TABLE_SCAN_SQL).await?;
 
@@ -5053,7 +5053,7 @@ async fn cmd_db_validate_volume_references(
             let matching_volumes = datastore
                 .pool_connection_for_tests()
                 .await?
-                .transaction_async(|conn| async move {
+                .transaction_async(async move |conn| {
                     // Selecting all volumes based on the data column requires a
                     // full table scan
                     conn.batch_execute_async(ALLOW_FULL_TABLE_SCAN_SQL).await?;
@@ -5159,7 +5159,7 @@ async fn cmd_db_validate_regions(
     let datasets_and_regions: Vec<(CrucibleDataset, Region)> = datastore
         .pool_connection_for_tests()
         .await?
-        .transaction_async(|conn| async move {
+        .transaction_async(async move |conn| {
             // Selecting all datasets and regions requires a full table scan
             conn.batch_execute_async(ALLOW_FULL_TABLE_SCAN_SQL).await?;
 
@@ -5294,7 +5294,7 @@ async fn cmd_db_validate_regions(
     let datasets: Vec<CrucibleDataset> = datastore
         .pool_connection_for_tests()
         .await?
-        .transaction_async(|conn| async move {
+        .transaction_async(async move |conn| {
             // Selecting all datasets and regions requires a full table scan
             conn.batch_execute_async(ALLOW_FULL_TABLE_SCAN_SQL).await?;
 
@@ -5418,7 +5418,7 @@ async fn cmd_db_validate_region_snapshots(
             datastore
                 .pool_connection_for_tests()
                 .await?
-                .transaction_async(|conn| async move {
+                .transaction_async(async move |conn| {
                     // Selecting all datasets and region snapshots requires a
                     // full table scan
                     conn.batch_execute_async(ALLOW_FULL_TABLE_SCAN_SQL).await?;
@@ -5614,7 +5614,7 @@ async fn cmd_db_validate_region_snapshots(
         let datasets_and_regions: Vec<(CrucibleDataset, Region)> = datastore
             .pool_connection_for_tests()
             .await?
-            .transaction_async(|conn| async move {
+            .transaction_async(async move |conn| {
                 // Selecting all datasets and regions requires a full table scan
                 conn.batch_execute_async(ALLOW_FULL_TABLE_SCAN_SQL).await?;
 
@@ -6908,7 +6908,7 @@ async fn cmd_db_vmm_list(
     let vmms = datastore
         .pool_connection_for_tests()
         .await?
-        .transaction_async(|conn| async move {
+        .transaction_async(async move |conn| {
             // If we are including deleted VMMs, we can no longer use indices on
             // the VMM table, which do not index deleted VMMs. Thus, we must
             // allow a full-table scan in that case.
diff --git a/dev-tools/omdb/src/bin/omdb/main.rs b/dev-tools/omdb/src/bin/omdb/main.rs
@@ -203,7 +203,7 @@ impl Omdb {
         }
 
         let mut socket_stream = futures::stream::iter(addrs)
-            .map(|sockaddr_v6| async move {
+            .map(async move |sockaddr_v6| {
                 (sockaddr_v6, try_connect(sockaddr_v6).await)
             })
             .buffer_unordered(3);
diff --git a/dev-tools/omdb/src/bin/omdb/mgs.rs b/dev-tools/omdb/src/bin/omdb/mgs.rs
@@ -147,7 +147,7 @@ async fn cmd_mgs_inventory(
                 None
             }
         }))
-        .then(|sp_id| async move {
+        .then(async move |sp_id| {
             c.sp_get(sp_id.type_, sp_id.slot)
                 .await
                 .with_context(|| format!("fetching info about SP {:?}", sp_id))
diff --git a/dev-tools/omdb/src/bin/omdb/nexus.rs b/dev-tools/omdb/src/bin/omdb/nexus.rs
@@ -2643,7 +2643,7 @@ async fn cmd_nexus_blueprints_target_set(
     // if `args.diff` is true, or later if `args.enabled` is "inherit" (or
     // both).
     let current_target = OnceCell::new();
-    let get_current_target = || async {
+    let get_current_target = async || {
         current_target
             .get_or_try_init(|| client.blueprint_target_view())
             .await
diff --git a/dev-tools/omdb/src/bin/omdb/reconfigurator.rs b/dev-tools/omdb/src/bin/omdb/reconfigurator.rs
@@ -80,8 +80,10 @@ impl ReconfiguratorArgs {
         log: &Logger,
     ) -> anyhow::Result<()> {
         self.db_url_opts
-            .with_datastore(omdb, log, |opctx, datastore| async move {
-                match &self.command {
+            .with_datastore(
+                omdb,
+                log,
+                async move |opctx, datastore| match &self.command {
                     ReconfiguratorCommands::Export(export_args) => {
                         let _state = cmd_reconfigurator_export(
                             &opctx,
@@ -109,8 +111,8 @@ impl ReconfiguratorArgs {
                         )
                         .await
                     }
-                }
-            })
+                },
+            )
             .await
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ impl Omdb {`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`let mut socket_stream = futures::stream::iter(addrs)`
`206`		`- .map(\|sockaddr_v6\| async move {`
	`206`	`+ .map(async move \|sockaddr_v6\| {`
`207`	`207`	`(sockaddr_v6, try_connect(sockaddr_v6).await)`
`208`	`208`	`})`
`209`	`209`	`.buffer_unordered(3);`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ async fn cmd_mgs_inventory(`
`147`	`147`	`None`
`148`	`148`	`}`
`149`	`149`	`}))`
`150`		`- .then(\|sp_id\| async move {`
	`150`	`+ .then(async move \|sp_id\| {`
`151`	`151`	`c.sp_get(sp_id.type_, sp_id.slot)`
`152`	`152`	`.await`
`153`	`153`	`.with_context(\|\| format!("fetching info about SP {:?}", sp_id))`
Original file line number	Diff line number	Diff line change
`@@ -80,8 +80,10 @@ impl ReconfiguratorArgs {`
`80`	`80`	`log: &Logger,`
`81`	`81`	`) -> anyhow::Result<()> {`
`82`	`82`	`self.db_url_opts`
`83`		`- .with_datastore(omdb, log, \|opctx, datastore\| async move {`
`84`		`- match &self.command {`
	`83`	`+ .with_datastore(`
	`84`	`+ omdb,`
	`85`	`+ log,`
	`86`	`+ async move \|opctx, datastore\| match &self.command {`
`85`	`87`	`ReconfiguratorCommands::Export(export_args) => {`
`86`	`88`	`let _state = cmd_reconfigurator_export(`
`87`	`89`	`&opctx,`
`@@ -109,8 +111,8 @@ impl ReconfiguratorArgs {`
`109`	`111`	`)`
`110`	`112`	`.await`
`111`	`113`	`}`
`112`		`- }`
`113`		`- })`
	`114`	`+ },`
	`115`	`+ )`
`114`	`116`	`.await`
`115`	`117`	`}`
`116`	`118`	`}`