Wrap the lines the merge resolution left long
Benchmarks / CPU and I/O (per commit) (push) Successful in 2m59s
Benchmarks / Frame budget (on demand) (push) Skipped
Build and test / Desktop (Linux) (push) Failing after 33m34s
Build and test / Layer separation (push) Successful in 55s
Traceability / Requirement traces (push) Successful in 42s
🐳 Android image / Build and push (push) Successful in 3s
Build and test / android-image (push) Successful in 3s
Build and test / Android (aarch64) (push) Successful in 23m43s

`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.
This commit is contained in:
2026-09-08 08:57:32 +02:00
parent d920716a2b
commit 404fea47a8
4 changed files with 89 additions and 73 deletions
+1 -4
View File
@@ -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
.borrow()
.as_ref()
.is_none_or(|s| s.film_in_group());
let in_group = session.borrow().as_ref().is_none_or(|s| s.film_in_group());
let can_print = choices
.get(selected)