Wrap the lines the merge resolution left long

`cargo fmt --check` failed the desktop job, on three files and for one reason:
routing the mask handlers through the `Masking` global was done by substituting
the call prefix, which is a text edit rather than a Rust one. It left
`window.global::<Masking>().on_part_join_picked(...)` on a line that had been
short enough as `window.on_mask_part_join_picked(...)` and no longer was.

Formatting only. The whitespace-stripped source is identical in the two `ui/`
files; the third differs by the trailing commas rustfmt adds when it breaks a
call across lines.

The matrix moves with it, because the tags shift by a few lines and the check
compares line numbers.

core/dr-gpu/examples/sweep.rs

@@ -98,7 +98,17 @@ fn main() {
 
     // The reference frame: every parameter at its default. Written once so a
     // viewer can see what the sweep is departing from.
-    render_to(&mut adjust, &image, &graph, w, h, &out_dir, "neutral", 0, 0.0);
+    render_to(
+        &mut adjust,
+        &image,
+        &graph,
+        w,
+        h,
+        &out_dir,
+        "neutral",
+        0,
+        0.0,
+    );
 
     // Parameters held away from their default for the duration, as
     // `SWEEP_HOLD=shadow_strength=70,midtone_hue=210`.
@@ -172,7 +182,8 @@ fn render_to(
     // and the example never has to know which it was handed.
     let shader = graph.compose_for(ColourSpace::Srgb);
     let scale = graph.render_scale(image.size(), (w, h));
-    let detail = graph.compose_detail_for(scale.full_size(), scale.render_size(), ColourSpace::Srgb);
+    let detail =
+        graph.compose_detail_for(scale.full_size(), scale.render_size(), ColourSpace::Srgb);
     let key = graph.invalidation().through(Affects::Colour);
     adjust
         .render_detailed(image, &shader, w, h, None, &detail, key)

ui/dr-ui/src/lib.rs

@@ -818,10 +818,7 @@ pub(crate) fn sync_film(window: &AppWindow, session: &Rc<RefCell<Option<DevelopS
     // Whether the picker belongs in the group on screen. Asked of the session
     // rather than decided here: it is a fact about what the operation is
     // about, and the answer moves if the descriptor ever does.
-    let in_group = session
+    let in_group = session.borrow().as_ref().is_none_or(|s| s.film_in_group());
-        .borrow()
-        .as_ref()
-        .is_none_or(|s| s.film_in_group());
 
     let can_print = choices
         .get(selected)

ui/dr-ui/src/masks_ui.rs

@@ -828,7 +828,9 @@ pub(crate) fn wire(
     {
         let weak = window.as_weak();
         let session = session.clone();
-        window.global::<Masking>().on_brush_changed(move |radius, hardness, flow| {
+        window
+            .global::<Masking>()
+            .on_brush_changed(move |radius, hardness, flow| {
                 let Some(w) = weak.upgrade() else { return };
                 if let Some(s) = session.borrow_mut().as_mut() {
                     s.set_brush(radius, hardness, flow);
@@ -854,7 +856,9 @@ pub(crate) fn wire(
         let session = session.clone();
         let redraw = redraw.clone();
         let rows = rows.clone();
-        window.global::<Masking>().on_part_selected(move |_id, index| {
+        window
+            .global::<Masking>()
+            .on_part_selected(move |_id, index| {
                 let Some(w) = weak.upgrade() else { return };
                 if let Some(s) = session.borrow_mut().as_mut() {
                     s.set_active_part(index.max(0) as usize);
@@ -890,7 +894,9 @@ pub(crate) fn wire(
         let session = session.clone();
         let redraw = redraw.clone();
         let rows = rows.clone();
-        window.global::<Masking>().on_part_removed(move |id, index| {
+        window
+            .global::<Masking>()
+            .on_part_removed(move |id, index| {
                 let Some(w) = weak.upgrade() else { return };
                 if let Some(s) = session.borrow_mut().as_mut() {
                     s.remove_mask_part(&id, index.max(0) as usize);
@@ -904,7 +910,9 @@ pub(crate) fn wire(
         let weak = window.as_weak();
         let session = session.clone();
         let redraw = redraw.clone();
-        window.global::<Masking>().on_part_join_picked(move |id, index, join| {
+        window
+            .global::<Masking>()
+            .on_part_join_picked(move |id, index, join| {
                 let Some(w) = weak.upgrade() else { return };
                 if let Some(s) = session.borrow_mut().as_mut() {
                     s.set_mask_part_join(&id, index.max(0) as usize, join.max(0) as usize);