Align desktop initializer arguments with builders

examples/message_list/desktop.rs

@@ -6,7 +6,5 @@ mod app;
 
 fn main() {
     let attributes = WindowAttributes::default().with_inner_size(LogicalSize::new(420.0, 900.0));
-    DesktopApp::<DesktopUiState>::run_with_attributes(attributes, |ui_state, rsc| {
+    DesktopApp::<DesktopUiState>::run_with_attributes(attributes, app::build);
-        app::build(rsc, ui_state)
-    });
 }

examples/minimal/desktop.rs

@@ -4,5 +4,5 @@ use iris::prelude::*;
 mod app;
 
 fn main() {
-    DesktopApp::<DesktopUiState>::run_with(|ui_state, rsc| app::build(rsc, ui_state));
+    DesktopApp::<DesktopUiState>::run_with(app::build);
 }

examples/task/desktop.rs

@@ -4,5 +4,5 @@ use iris::prelude::*;
 mod app;
 
 fn main() {
-    DesktopApp::<DesktopUiState>::run_with(|ui_state, rsc| app::build(rsc, ui_state));
+    DesktopApp::<DesktopUiState>::run_with(app::build);
 }

examples/view/desktop.rs

@@ -4,5 +4,5 @@ use iris::prelude::*;
 mod app;
 
 fn main() {
-    DesktopApp::<DesktopUiState>::run_with(|ui_state, rsc| app::build(rsc, ui_state));
+    DesktopApp::<DesktopUiState>::run_with(app::build);
 }

readme.md

@@ -33,21 +33,23 @@ loader glue. An application with no state beyond the UI state receives
 ```rust
 use iris::prelude::*;
 
+fn build<Rsc: UiRsc>(rsc: &mut Rsc, ui_state: &mut impl HasRoot<Rsc>) {
+    rect(PaintId::RED).set_root(rsc, ui_state);
+}
+
 #[iris::app_init]
 fn create(
     ui_state: &mut AndroidUiState,
     rsc: &mut StdRsc<AndroidUiState>,
 ) {
-    rect(PaintId::RED).set_root(rsc, ui_state);
+    build(rsc, ui_state);
 }
 ```
 
 Desktop has the corresponding initializer form:
 
 ```rust
-DesktopApp::<DesktopUiState>::run_with(|ui_state, rsc| {
+DesktopApp::<DesktopUiState>::run_with(build);
-    rect(PaintId::RED).set_root(rsc, ui_state);
-});
 ```
 
 Background work updates either host through the same task context. An update

src/desktop/mod.rs

@@ -156,17 +156,17 @@ impl<State: DesktopAppState> DesktopApp<State> {
 
 impl DesktopApp<DesktopUiState> {
     /// Runs an application whose only state is Iris's desktop UI state.
-    pub fn run_with(init: impl FnOnce(&mut DesktopUiState, &mut StdRsc<DesktopUiState>) + 'static) {
+    pub fn run_with(init: impl FnOnce(&mut StdRsc<DesktopUiState>, &mut DesktopUiState) + 'static) {
         Self::run_with_attributes(DesktopUiState::window_attributes(), init);
     }
 
     pub fn run_with_attributes(
         attributes: WindowAttributes,
-        init: impl FnOnce(&mut DesktopUiState, &mut StdRsc<DesktopUiState>) + 'static,
+        init: impl FnOnce(&mut StdRsc<DesktopUiState>, &mut DesktopUiState) + 'static,
     ) {
         App::<Self>::run_with(move |event_loop, proxy| {
             Self::new_with(event_loop, proxy, attributes, move |mut ui_state, rsc| {
-                init(&mut ui_state, rsc);
+                init(rsc, &mut ui_state);
                 ui_state
             })
         });