Rust 1.85: Use async closure syntax.

Note: This causes type inference failures, requiring us to specify the
closures’ parameter types explicitly. I gather from reading issue
<rust-lang/rust#127781> that this may be
rectified by using native `AsyncFnOnce` syntax,
but that currently cannot specify the `+ Send + 'static` bound without
also using `return_type_notation`, which cannot yet be used upon
`F: FnOnce()` bounds, as opposed to non-`Fn` trait bounds.

Author: kpreid

Cargo.lock

@@ -43,7 +43,7 @@ resolver = "2"
 # When changing any of these values, be sure to also update the non-workspace packages
 # as listed above, if applicable.
 edition = "2021"
-rust-version = "1.84"
+rust-version = "1.85"
 license = "MIT OR Apache-2.0"
 authors = ["Kevin Reid <[email protected]>"]
 # TODO: add homepage = "..." when we have one

Cargo.toml

@@ -9,7 +9,7 @@ use all_is_cubes::universe::Universe;
 use all_is_cubes::universe::UniverseStepInfo;
 use all_is_cubes::util::ErrorChain;
 use all_is_cubes_render::camera::Viewport;
-use all_is_cubes_ui::apps::ExitMainTask;
+use all_is_cubes_ui::apps::{ExitMainTask, MainTaskContext};
 
 use crate::Session;
 
@@ -145,25 +145,26 @@ impl<Ren, Win: crate::glue::Window> DesktopSession<Ren, Win> {
 
         // TODO: Also make a way to do this that isn't replacing the main task,
         // or that defines a way for the existing main task to coordinate.
-        self.session.set_main_task(move |mut ctx| async move {
-            // TODO: Offer confirmation before replacing the current universe.
-            // TODO: Then open a progress-bar UI page while we load.
-
-            match loader_task.await.unwrap() {
-                Ok(universe) => {
-                    ctx.set_universe(universe);
-                }
-                Err(e) => {
-                    ctx.show_modal_message(arcstr::format!(
-                        "Failed to load file '{path}':\n{e}",
-                        path = path.display(),
-                        e = ErrorChain(&e),
-                    ));
+        self.session
+            .set_main_task(async move |mut ctx: MainTaskContext| {
+                // TODO: Offer confirmation before replacing the current universe.
+                // TODO: Then open a progress-bar UI page while we load.
+
+                match loader_task.await.unwrap() {
+                    Ok(universe) => {
+                        ctx.set_universe(universe);
+                    }
+                    Err(e) => {
+                        ctx.show_modal_message(arcstr::format!(
+                            "Failed to load file '{path}':\n{e}",
+                            path = path.display(),
+                            e = ErrorChain(&e),
+                        ));
+                    }
                 }
-            }
 
-            ExitMainTask
-        })
+                ExitMainTask
+            })
     }
 
     /// Set the “fixed” window title — the portion of the title not determined by the universe,

all-is-cubes-desktop/src/session.rs

@@ -88,7 +88,7 @@ pub fn inner_main<Ren: Renderer, Win: Window>(
         match *options {}
     }
 
-    dsession.session.set_main_task(|mut ctx| async move {
+    dsession.session.set_main_task(async move |mut ctx| {
         let universe_result: Result<Universe, anyhow::Error> = match universe_task_future.await {
             // nested Results because one is template failure and the other is tokio JoinHandle failure
             Ok(Ok(u)) => Ok(u),

all-is-cubes-desktop/src/startup.rs

@@ -43,7 +43,6 @@ tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
 tower-http = { version = "0.6.2", features = ["fs"] }
 
 [dev-dependencies]
-async_fn_traits = { workspace = true }
 # Note that with default features disabled, reqwest has no TLS/SSL support.
 # This is usable because we are only using it to talk to the local server.
 reqwest = { version = "0.12.2", default-features = false }

all-is-cubes-server/Cargo.toml

@@ -2,12 +2,11 @@
 
 use std::process::Stdio;
 
-use async_fn_traits::AsyncFnOnce1;
 use reqwest::header::HeaderValue;
 use reqwest::Url;
 use tokio::io::AsyncBufReadExt;
 
-async fn with_server<F: AsyncFnOnce1<Url, Output = ()>>(client_source: &'static str, f: F) {
+async fn with_server<F: AsyncFnOnce(Url)>(client_source: &'static str, f: F) {
     let mut server = tokio::process::Command::new(env!("CARGO_BIN_EXE_aic-server"))
         .arg("--client-source")
         .arg(client_source)

all-is-cubes-server/tests/http.rs

@@ -1390,7 +1390,7 @@ mod tests {
         let mut cameras = session.create_cameras(listen::constant(Viewport::ARBITRARY));
         session.set_main_task({
             let noticed_step = noticed_step.clone();
-            move |mut ctx| async move {
+            async move |mut ctx: MainTaskContext| {
                 eprintln!("main task: waiting for new universe");
                 let new_universe = recv.await.unwrap();
                 ctx.set_universe(new_universe);

all-is-cubes-ui/src/apps/session.rs

@@ -6,7 +6,7 @@ name = "all-is-cubes-wasm"
 version = "0.9.0"
 authors = ["Kevin Reid <[email protected]>"]
 edition = "2021"
-rust-version = "1.84"
+rust-version = "1.85"
 description = "Web client for the recursive voxel game All is Cubes."
 # TODO: add homepage = "..." when we have one
 repository = "https://github.com/kpreid/all-is-cubes"

all-is-cubes-wasm/Cargo.toml

@@ -29,7 +29,7 @@ async fn main() -> test_renderers::HarnessResult {
         RendererId::Wgpu,
         test_renderers::SuiteId::Renderers,
         test_renderers::test_cases::all_tests,
-        move |label| async move { get_factory(label).await.unwrap() },
+        async move |label| get_factory(label).await.unwrap(),
         parallelism,
     )
     .await