fabi/Sylpheed
1
0
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects Releases Wiki Activity

style: rustfmt sweep — 774 hunks across 154 files → 0 (#12) #18

Merged
fabi merged 1 commits from chore/rustfmt-sweep into main 2026-09-08 20:09:53 +00:00
Conversation 0 Commits 1 Files Changed 154 +5660 -2106
fabi commented 2026-09-08 18:07:26 +00:00
Owner
Copy Link

cargo fmt --all -- --check has failed on every run in this repository's history,
identically on main and on every branch. This is #12.

Mechanical: cargo fmt --all and nothing else. 154 files, all .rs, no other
extension touched, 774 hunks → 0. cargo check --workspace exits 0 afterwards.

The ordering was the real question, and the warning was too pessimistic

HANDOFF-2026-09-06 §7 says this is the expensive fix — that a whole-tree reformat
before #7 and #8 return "would put a conflict in every file of 861 commits and make the
reviews those items exist to enable unreadable."

That had been reasoned, not measured. Measured here, by three-way merging a rustfmt'd
main against both unmerged branches file by file:
file/branch pairs tested 32
merges clean 28
merges conflicting 4 — 8 hunks total 
sylpheed-cli/src/main.rs        1 hunk
sylpheed-export/src/check.rs    1
sylpheed-export/src/screen.rs   4
sylpheed-export/src/video.rs    2

All four are against auto/frame-blend-draw-path; auto/port-p6-audio does not
conflict anywhere.

§7's underlying numbers reproduce exactly — 154 dirty files, 133 that cannot collide,
21 that can, the collision set carrying 147 of 774 hunks (19%). What it did not
say is that most of those 21 still merge cleanly, because rustfmt's edits and the
branches' edits rarely land on the same lines.

So the cost of sweeping now is 4 files and 8 hunks against one branch, versus a check
that stays red indefinitely.

Scope

Deliberately not folded into #17. 154 reformatted files would make that PR
unreviewable, which is the same reason its tokio change was split out.

One thing this PR itself is the test of

Formatted with rustfmt 1.8.0-stable (rustc 1.90.0, this desktop). The runner is
rustc 1.98.1. §7 established that 1.8.0 and 1.9.0 both report 774 on this tree, so
they agree on what is dirty — but that is not proof that output from one satisfies the
other's --check. If the Formatting job goes green here, that inference is confirmed by
measurement. If it does not, the fix is to re-run cargo fmt on the runner's toolchain,
and the disagreement is worth recording.

Closes #12

`cargo fmt --all -- --check` has failed on every run in this repository's history, identically on `main` and on every branch. This is **#12**. Mechanical: `cargo fmt --all` and nothing else. **154 files, all `.rs`**, no other extension touched, `774 hunks → 0`. `cargo check --workspace` exits 0 afterwards. ## The ordering was the real question, and the warning was too pessimistic `HANDOFF-2026-09-06` §7 says this is the expensive fix — that a whole-tree reformat before #7 and #8 return *"would put a conflict in every file of 861 commits and make the reviews those items exist to enable unreadable."* That had been **reasoned, not measured**. Measured here, by three-way merging a rustfmt'd `main` against both unmerged branches file by file: | | | |---|---| | file/branch pairs tested | 32 | | merges **clean** | **28** | | merges conflicting | **4** — 8 hunks total | ``` sylpheed-cli/src/main.rs 1 hunk sylpheed-export/src/check.rs 1 sylpheed-export/src/screen.rs 4 sylpheed-export/src/video.rs 2 ``` All four are against `auto/frame-blend-draw-path`; **`auto/port-p6-audio` does not conflict anywhere.** §7's underlying numbers reproduce exactly — 154 dirty files, **133 that cannot collide**, **21 that can**, the collision set carrying **147 of 774 hunks (19%)**. What it did not say is that most of those 21 still merge cleanly, because rustfmt's edits and the branches' edits rarely land on the same lines. So the cost of sweeping now is **4 files and 8 hunks against one branch**, versus a check that stays red indefinitely. ## Scope Deliberately **not** folded into #17. 154 reformatted files would make that PR unreviewable, which is the same reason its `tokio` change was split out. ## One thing this PR itself is the test of Formatted with **rustfmt 1.8.0-stable** (rustc 1.90.0, this desktop). The runner is **rustc 1.98.1**. §7 established that 1.8.0 and 1.9.0 both report *774* on this tree, so they agree on what is dirty — but that is not proof that output from one satisfies the other's `--check`. If the Formatting job goes green here, that inference is confirmed by measurement. If it does not, the fix is to re-run `cargo fmt` on the runner's toolchain, and the disagreement is worth recording. Closes #12
fabi added 1 commit 2026-09-08 18:07:26 +00:00
style: rustfmt sweep -- 774 hunks across 154 files -> 0
Some checks failed
CI / Native — linux (pull_request) Successful in 32m7s
Details
CI / WASM — Web (pull_request) Failing after 8m3s
Details
CI / Formatting (pull_request) Successful in 50s
Details
c4c914ff59 
`cargo fmt --all -- --check` has failed on every run in this repository's
history, identically on `main` and on every branch. This is #12.

Mechanical: `cargo fmt --all`, nothing else. 154 files, all `.rs`, no other
extension touched. `cargo check --workspace` exits 0 afterwards, so nothing
changed semantically.

ON THE ORDERING, WHICH WAS THE REAL QUESTION.

HANDOFF-2026-09-06 section 7 warns this is the expensive fix: a whole-tree
reformat before #7 and #8 return "would put a conflict in every file of 861
commits and make the reviews those items exist to enable unreadable".

That is measurably too pessimistic, and it had been reasoned rather than
tested. Measured here by three-way merging a rustfmt'd `main` against both
unmerged branches, file by file:

  file/branch pairs tested   32
  merges CLEAN               28
  merges CONFLICTING          4   (8 conflict hunks total)

    sylpheed-cli/src/main.rs      1 hunk
    sylpheed-export/src/check.rs  1
    sylpheed-export/src/screen.rs 4
    sylpheed-export/src/video.rs  2

All four are against `auto/frame-blend-draw-path` only;
`auto/port-p6-audio` does not conflict anywhere. The earlier framing --
154 dirty files, 133 that cannot collide, 21 that can, the collision set
carrying 147 of 774 hunks (19%) -- reproduces exactly. What it did not say
is that most of the 21 still merge cleanly, because rustfmt's edits and the
branches' edits rarely land on the same lines.

So the cost of sweeping now is 4 files and 8 hunks for one branch, against
a check that is otherwise red forever. Deliberately NOT folded into the
WASM PR: 154 reformatted files would make that one unreviewable.

Closes #12
fabi merged commit ff984e0350 into main 2026-09-08 20:09:53 +00:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
agent/decoder
Owned by the Decoder (disc to meaning; runs the emulator)
 agent/port
Owned by the Port (disc to playable; no RE)
 kind/ask
One agent asking the other for something it cannot answer in role
 kind/bundle
A bundle the human defined; agents decompose it into items
 kind/defect
Found by a play-test or a check
 kind/item
One unit of work, small enough to finish in a single session
 state/approved
Human approved the shape; an agent may start
 state/blocked
Waiting on another item; use the Depends-On field, not prose
 state/in-progress
An agent is working it now
 state/needs-human
Done as far as an agent can tell -- a person must look. The body says what to look at
 state/proposed
Agent proposed this item; awaiting the human's approval to start
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
sylph-decoder sylph-pi sylph-port fabi
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: fabi/Sylpheed#18
Delete Branch "chore/rustfmt-sweep"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?