`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
94 lines
4.2 KiB
Rust
94 lines
4.2 KiB
Rust
//! Independent check of "DIFFICULTY is a dialog: GP_DIALOG entries 2/3".
|
|
//!
|
|
//! The Decoder identified `DLG_SELECT_DIFFICULTY` as `GP_DIALOG.pak` entries 2/3
|
|
//! by TWO arguments, one of them compound — corrected from "three routes", which
|
|
//! was taking credit for the exclusion scan. The image leg names no entry, and
|
|
//! the disc and oracle legs are one argument, since the capture is compared
|
|
//! against the disc's rows. One of them is button count and geometry. That half is
|
|
//! readable from the disc with this port's own reader, so it is checked here
|
|
//! rather than taken on their word — the same form as re-deriving `ptbtn11`'s
|
|
//! row order from my export when they offered it.
|
|
//!
|
|
//! ⚠️ What this CANNOT check is their binding claim, and they flagged it first:
|
|
//! entries 2/3 are identified by button count and geometry, **not** by a binding
|
|
//! from the `DLG_` name to a pak entry. Another four-button dialog with the same
|
|
//! rows would be indistinguishable by this evidence. Reproducing the geometry
|
|
//! confirms the geometry; it does not name the screen.
|
|
use sylpheed_formats::{pak, ratc, ui_layout};
|
|
|
|
fn main() {
|
|
let root = std::env::var("SYLPHEED_DISC").unwrap_or_else(|_| "/disc".into());
|
|
// 🔴 WIDENED 2026-08-31 to every pak, to check the Decoder's rival search
|
|
// independently. They report zero four-button builds within 6 px of
|
|
// 259/329/399/469 anywhere on the disc, which turns "another dialog with
|
|
// these rows would be indistinguishable" from a standing reach into a
|
|
// bounded one. A disc-wide negative is exactly the claim worth re-running
|
|
// with a different reader, because its whole content is an absence.
|
|
const WANT: [i32; 4] = [259, 329, 399, 469];
|
|
const TOL: i32 = 6;
|
|
let mut paks: Vec<_> = std::fs::read_dir(format!("{root}/dat"))
|
|
.expect("dat/")
|
|
.flatten()
|
|
.map(|e| e.path())
|
|
.filter(|p| p.extension().and_then(|s| s.to_str()) == Some("pak"))
|
|
.collect();
|
|
paks.sort();
|
|
let (mut hits, mut scanned) = (0usize, 0usize);
|
|
for path in &paks {
|
|
let Ok(ar) = pak::PakArchive::open(path) else {
|
|
continue;
|
|
};
|
|
let arch = path.file_name().unwrap().to_string_lossy().to_string();
|
|
for (i, e) in ar.entries().iter().enumerate() {
|
|
let Ok(by) = ar.read(e) else { continue };
|
|
if !ratc::is_ratc(&by) {
|
|
continue;
|
|
}
|
|
let Some(b) = ui_layout::parse_build(&by) else {
|
|
continue;
|
|
};
|
|
scanned += 1;
|
|
// Any button-shaped record, not just `pcbtn`: a rival need not share the
|
|
// naming convention, and restricting by name would answer a narrower
|
|
// question than the one asked.
|
|
let mut rows: Vec<(String, i32)> = b
|
|
.elements
|
|
.iter()
|
|
.filter(|el| el.name.contains("btn"))
|
|
.filter_map(|el| el.rest().map(|r| (el.name.clone(), r.y)))
|
|
.collect();
|
|
if rows.is_empty() {
|
|
continue;
|
|
}
|
|
rows.sort_by(|a, b| a.1.cmp(&b.1));
|
|
let ys: Vec<i32> = rows.iter().map(|r| r.1).collect();
|
|
let gaps: Vec<i32> = ys.windows(2).map(|w| w[1] - w[0]).collect();
|
|
if rows.len() == 4
|
|
&& ys
|
|
.iter()
|
|
.zip(WANT.iter())
|
|
.all(|(a, b)| (a - b).abs() <= TOL)
|
|
{
|
|
hits += 1;
|
|
println!(
|
|
" {arch} entry {i:>2} {} record(s): {}",
|
|
rows.len(),
|
|
rows.iter()
|
|
.map(|r| r.0.as_str())
|
|
.collect::<Vec<_>>()
|
|
.join(" ")
|
|
);
|
|
println!(" rows {ys:?} gaps {gaps:?}");
|
|
}
|
|
}
|
|
}
|
|
println!(
|
|
"\n {scanned} build(s) scanned across {} pak(s); {hits} match the",
|
|
paks.len()
|
|
);
|
|
println!(" DIFFICULTY row signature within +/-{TOL} px.");
|
|
println!(" Expected: exactly 2 -- the EN/JP pair. More means a RIVAL exists and");
|
|
println!(" the geometric identification is not unique; fewer means this reader");
|
|
println!(" cannot see the incumbents and its zero would mean nothing.");
|
|
}
|