Apply rustfmt to entire workspace

Runs cargo fmt --all; all 573 tests still passing, clippy still clean.
No logic changes — formatting only.

Co-Authored-By: Claude Sonnet 4.6 <[email protected]>
This commit is contained in:
osobh
2026-04-04 20:31:33 -05:00
co-authored by Claude Sonnet 4.6
parent 3d524e2d63
commit 1c107fe58a
69 changed files with 2790 additions and 1325 deletions
+37 -32
View File
@@ -5,7 +5,9 @@
//! creating real HDF5 files in memory and on disk as needed.
use clawhdf5::{File, FileBuilder};
use clawsync_hdf5::{DatasetManifest, PatchKind, apply_patches, apply_patches_to_bytes, diff_manifests};
use clawsync_hdf5::{
DatasetManifest, PatchKind, apply_patches, apply_patches_to_bytes, diff_manifests,
};
use tempfile::NamedTempFile;
// ─────────────────────────────────────────────────────────────────────────────
@@ -37,7 +39,10 @@ fn write_temp_h5(bytes: &[u8]) -> (NamedTempFile, std::path::PathBuf) {
/// A dataset present in source but absent from target is added after patching.
#[test]
fn patch_adds_new_dataset() {
let src = h5_bytes(&[("temperature", &[20.0, 21.5, 22.0]), ("humidity", &[55.0, 57.0])]);
let src = h5_bytes(&[
("temperature", &[20.0, 21.5, 22.0]),
("humidity", &[55.0, 57.0]),
]);
let tgt = h5_bytes(&[("temperature", &[20.0, 21.5, 22.0])]);
let old_m = DatasetManifest::from_bytes(&tgt).unwrap();
@@ -51,7 +56,8 @@ fn patch_adds_new_dataset() {
let result_m = DatasetManifest::from_bytes(&patched).unwrap();
// The new dataset must be present with the correct hash.
let result_entry = result_m.get("/humidity")
let result_entry = result_m
.get("/humidity")
.expect("humidity should exist after patching");
let src_entry = new_m.get("/humidity").unwrap();
assert_eq!(result_entry.blake3, src_entry.blake3);
@@ -107,13 +113,22 @@ fn patch_removes_dataset() {
let diff = diff_manifests(&old_m, &new_m);
assert_eq!(diff.of_kind(&PatchKind::Removed).count(), 1);
assert_eq!(diff.of_kind(&PatchKind::Removed).next().unwrap().path, "/current");
assert_eq!(
diff.of_kind(&PatchKind::Removed).next().unwrap().path,
"/current"
);
let (patched, _) = apply_patches_to_bytes(&diff.patches, &src, &tgt).unwrap();
let result_m = DatasetManifest::from_bytes(&patched).unwrap();
assert!(result_m.get("/current").is_none(), "current should have been removed");
assert!(result_m.get("/voltage").is_some(), "voltage should be retained");
assert!(
result_m.get("/current").is_none(),
"current should have been removed"
);
assert!(
result_m.get("/voltage").is_some(),
"voltage should be retained"
);
}
// ─────────────────────────────────────────────────────────────────────────────
@@ -148,13 +163,13 @@ fn patch_noop_when_identical() {
fn patch_multiple_changes() {
// source: "kept" (same), "updated" (changed), "added" (new)
let src = h5_bytes(&[
("kept", &[1.0, 2.0]),
("kept", &[1.0, 2.0]),
("updated", &[99.0, 100.0]),
("added", &[7.0, 8.0, 9.0]),
("added", &[7.0, 8.0, 9.0]),
]);
// target: "kept" (same), "updated" (old values), "removed" (extra)
let tgt = h5_bytes(&[
("kept", &[1.0, 2.0]),
("kept", &[1.0, 2.0]),
("updated", &[0.0, 0.0]),
("removed", &[42.0]),
]);
@@ -163,9 +178,9 @@ fn patch_multiple_changes() {
let new_m = DatasetManifest::from_bytes(&src).unwrap();
let diff = diff_manifests(&old_m, &new_m);
assert_eq!(diff.of_kind(&PatchKind::Added).count(), 1);
assert_eq!(diff.of_kind(&PatchKind::Added).count(), 1);
assert_eq!(diff.of_kind(&PatchKind::Modified).count(), 1);
assert_eq!(diff.of_kind(&PatchKind::Removed).count(), 1);
assert_eq!(diff.of_kind(&PatchKind::Removed).count(), 1);
let (patched, _) = apply_patches_to_bytes(&diff.patches, &src, &tgt).unwrap();
let result_m = DatasetManifest::from_bytes(&patched).unwrap();
@@ -194,26 +209,18 @@ fn patch_multiple_changes() {
#[test]
fn stats_counts_correct() {
// source: "a" (modified), "c" (unchanged), "d" (new)
let src = h5_bytes(&[
("a", &[9.0, 9.0]),
("c", &[3.0]),
("d", &[4.0, 5.0]),
]);
let src = h5_bytes(&[("a", &[9.0, 9.0]), ("c", &[3.0]), ("d", &[4.0, 5.0])]);
// target: "a" (old values), "b" (to be removed), "c" (same as source)
let tgt = h5_bytes(&[
("a", &[1.0, 2.0]),
("b", &[0.0]),
("c", &[3.0]),
]);
let tgt = h5_bytes(&[("a", &[1.0, 2.0]), ("b", &[0.0]), ("c", &[3.0])]);
let old_m = DatasetManifest::from_bytes(&tgt).unwrap();
let new_m = DatasetManifest::from_bytes(&src).unwrap();
let diff = diff_manifests(&old_m, &new_m);
let (_, stats) = apply_patches_to_bytes(&diff.patches, &src, &tgt).unwrap();
assert_eq!(stats.datasets_added, 1, "d was added");
assert_eq!(stats.datasets_added, 1, "d was added");
assert_eq!(stats.datasets_modified, 1, "a was modified");
assert_eq!(stats.datasets_removed, 1, "b was removed");
assert_eq!(stats.datasets_removed, 1, "b was removed");
assert_eq!(stats.datasets_unchanged, 1, "c was unchanged");
// bytes_written must be positive (added + modified + unchanged datasets).
assert!(stats.bytes_written > 0);
@@ -227,13 +234,8 @@ fn stats_counts_correct() {
/// manifest read back from disk matches the source manifest.
#[test]
fn apply_patches_file_path_api() {
let src_bytes = h5_bytes(&[
("chan_x", &[1.1, 2.2, 3.3]),
("chan_y", &[4.4, 5.5]),
]);
let tgt_bytes = h5_bytes(&[
("chan_x", &[0.0, 0.0, 0.0]),
]);
let src_bytes = h5_bytes(&[("chan_x", &[1.1, 2.2, 3.3]), ("chan_y", &[4.4, 5.5])]);
let tgt_bytes = h5_bytes(&[("chan_x", &[0.0, 0.0, 0.0])]);
// Write both files to disk using NamedTempFile.
let (_src_guard, src_path) = write_temp_h5(&src_bytes);
@@ -248,8 +250,11 @@ fn apply_patches_file_path_api() {
// Use the file-path API (the one under test).
let stats = apply_patches(&diff.patches, &src_path, &tgt_path).unwrap();
assert!(stats.datasets_added >= 1, "chan_y should have been added");
assert!(stats.datasets_modified >= 1, "chan_x should have been modified");
assert!(stats.datasets_added >= 1, "chan_y should have been added");
assert!(
stats.datasets_modified >= 1,
"chan_x should have been modified"
);
// Read the patched file back from disk and verify it matches source.
let result_m = DatasetManifest::from_path(&tgt_path).unwrap();