`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
106 lines
4.2 KiB
Rust
106 lines
4.2 KiB
Rust
//! Which container should the next runtime capture aim at?
|
|
//!
|
|
//! The 2026-08-13 stage-05 capture showed that a mission keeps several containers
|
|
//! resident and that its OWN `Stage_SNN.xpr` is among them (the f101 ACROPOLIS was
|
|
//! drawn from `Stage_S05.xpr`), so a capture can be aimed by choosing the mission.
|
|
//! This ranks the targets: for every XBG7 resource on the disc it records the
|
|
//! containers where it decodes and the ones where it does not, then reports
|
|
//!
|
|
//! * resources that decode **nowhere** — the real gaps, where a capture is the
|
|
//! only ground truth left;
|
|
//! * per container, how many of those it holds (fly that mission);
|
|
//! * resources that miss in one container but decode in another — a defect worth
|
|
//! fixing, but the geometry is already recoverable, so a capture is not needed.
|
|
//!
|
|
//! Usage: miss_targets <resource3d_dir>
|
|
use std::collections::{BTreeMap, BTreeSet};
|
|
use sylpheed_formats::mesh::{xbg7_resource_names, Xbg7Model};
|
|
|
|
fn main() {
|
|
let dir = std::env::args().nth(1).expect("resource3d dir");
|
|
let mut files: Vec<_> = std::fs::read_dir(&dir)
|
|
.unwrap()
|
|
.flatten()
|
|
.map(|e| e.path())
|
|
.filter(|p| p.extension().and_then(|s| s.to_str()) == Some("xpr"))
|
|
.collect();
|
|
files.sort();
|
|
|
|
// resource -> (containers where it decodes, containers where it misses)
|
|
let mut ok: BTreeMap<String, BTreeSet<String>> = BTreeMap::new();
|
|
let mut miss: BTreeMap<String, BTreeSet<String>> = BTreeMap::new();
|
|
for f in &files {
|
|
let Ok(bytes) = std::fs::read(f) else {
|
|
continue;
|
|
};
|
|
let where_ = f.file_name().unwrap().to_string_lossy().to_string();
|
|
let declared: BTreeSet<String> = xbg7_resource_names(&bytes).into_iter().collect();
|
|
if declared.is_empty() {
|
|
continue;
|
|
}
|
|
let decoded: BTreeSet<String> = Xbg7Model::stage_models(&bytes)
|
|
.into_iter()
|
|
.map(|m| m.name)
|
|
.collect();
|
|
for n in &declared {
|
|
if decoded.contains(n) {
|
|
ok.entry(n.clone()).or_default().insert(where_.clone());
|
|
} else {
|
|
miss.entry(n.clone()).or_default().insert(where_.clone());
|
|
}
|
|
}
|
|
}
|
|
|
|
let never: BTreeMap<&String, &BTreeSet<String>> =
|
|
miss.iter().filter(|(n, _)| !ok.contains_key(*n)).collect();
|
|
let recoverable: Vec<&String> = miss.keys().filter(|n| ok.contains_key(*n)).collect();
|
|
|
|
println!("resources that decode NOWHERE: {}", never.len());
|
|
println!(
|
|
"resources that miss somewhere but decode elsewhere: {}\n",
|
|
recoverable.len()
|
|
);
|
|
|
|
// Rank containers by how many never-decoding resources they hold.
|
|
let mut per_container: BTreeMap<&String, Vec<&String>> = BTreeMap::new();
|
|
for (n, wheres) in &never {
|
|
for w in wheres.iter() {
|
|
per_container.entry(w).or_default().push(n);
|
|
}
|
|
}
|
|
let mut ranked: Vec<_> = per_container.iter().collect();
|
|
ranked.sort_by_key(|(_, v)| std::cmp::Reverse(v.len()));
|
|
println!("container never-decoding resources it holds");
|
|
for (w, v) in ranked.iter().take(14) {
|
|
let sample: Vec<&str> = v.iter().take(6).map(|s| s.as_str()).collect();
|
|
println!("{:<26} {:>3} {}", w, v.len(), sample.join(", "));
|
|
}
|
|
|
|
// Exclusives: a never-decoding resource that only ONE container holds is only
|
|
// reachable through whatever loads that container.
|
|
let excl: Vec<(&&String, &&BTreeSet<String>)> =
|
|
never.iter().filter(|(_, w)| w.len() == 1).collect();
|
|
println!(
|
|
"\nof the never-decoding, {} live in exactly one container",
|
|
excl.len()
|
|
);
|
|
let mut by_one: BTreeMap<&String, Vec<&String>> = BTreeMap::new();
|
|
for (n, w) in &excl {
|
|
by_one.entry(w.iter().next().unwrap()).or_default().push(n);
|
|
}
|
|
let mut b: Vec<_> = by_one.iter().collect();
|
|
b.sort_by_key(|(_, v)| std::cmp::Reverse(v.len()));
|
|
for (w, v) in b.iter().take(10) {
|
|
println!(
|
|
" {:<24} {:>3} {}",
|
|
w,
|
|
v.len(),
|
|
v.iter()
|
|
.take(5)
|
|
.map(|s| s.as_str())
|
|
.collect::<Vec<_>>()
|
|
.join(", ")
|
|
);
|
|
}
|
|
}
|