Fabian Hamm
ed54f95d54
`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
71 lines
2.6 KiB
Rust
71 lines
2.6 KiB
Rust
//! Why does an element's sprite fail to resolve? Dump the two name spaces.
|
|
//!
|
|
//! `parse_build` resolves an element to a sprite by looking its DECLARED name up
|
|
//! in (a) the `.rat` record table, then (b) the `T8aD` child table. `pteff05.t32`
|
|
//! is in neither -- the `T8aD` it wants is registered as `8AX` -- so it resolves
|
|
//! to None and `compose` drops it without recording it as missing. This prints
|
|
//! both spaces, so the link between the two can be CHECKED rather than assumed.
|
|
//!
|
|
//! cargo run -p sylpheed-formats --example name_resolution -- <pak> <entry>
|
|
use sylpheed_formats::{pak, ui_layout};
|
|
|
|
fn main() {
|
|
let path = std::env::args()
|
|
.nth(1)
|
|
.expect("usage: name_resolution <pak> [entry]");
|
|
let want: Option<usize> = std::env::args().nth(2).and_then(|s| s.parse().ok());
|
|
let ar = pak::PakArchive::open(&path).expect("open pak");
|
|
let entries: Vec<_> = ar.entries().to_vec();
|
|
for (i, e) in entries.iter().enumerate() {
|
|
if want.is_some_and(|w| w != i) {
|
|
continue;
|
|
}
|
|
let Ok(bytes) = ar.read(e) else { continue };
|
|
let Some(build) = ui_layout::parse_build(&bytes) else {
|
|
continue;
|
|
};
|
|
let unresolved: Vec<&ui_layout::Element> = build
|
|
.elements
|
|
.iter()
|
|
.filter(|el| el.sprite.is_none() && el.kind & 0x10 == 0)
|
|
.collect();
|
|
let claimed: std::collections::HashSet<&str> = build
|
|
.elements
|
|
.iter()
|
|
.filter_map(|e| e.sprite.as_deref())
|
|
.collect();
|
|
let unclaimed: Vec<&String> = build
|
|
.sprites
|
|
.keys()
|
|
.filter(|k| !claimed.contains(k.as_str()))
|
|
.collect();
|
|
if want.is_none() && unresolved.is_empty() && unclaimed.is_empty() {
|
|
continue;
|
|
}
|
|
let un: Vec<&str> = unresolved.iter().map(|e| e.name.as_str()).collect();
|
|
let uc: Vec<String> = unclaimed
|
|
.iter()
|
|
.map(|k| format!("{k}({} B)", build.sprites[*k].1))
|
|
.collect();
|
|
println!(
|
|
"entry {i:3} {:2} elements UNRESOLVED {:?} UNCLAIMED {:?}",
|
|
build.elements.len(),
|
|
un,
|
|
uc
|
|
);
|
|
if want.is_some() {
|
|
for el in &build.elements {
|
|
let mark = if el.sprite.is_none() && el.kind & 0x10 == 0 {
|
|
" <-- UNRESOLVED"
|
|
} else {
|
|
""
|
|
};
|
|
println!(
|
|
" [{:2}] kind {:#06x} {:28} -> {:?}{mark}",
|
|
el.index, el.kind, el.name, el.sprite
|
|
);
|
|
}
|
|
}
|
|
}
|
|
}
|