Author SHA1 Message Date
Omar Sobh bb44edcf90 refactor: clippy fixes (assign_op, type_complexity, unnecessary max)
Resolve -D warnings under Rust 1.95 clippy:

- simd_cdc.rs: use compound assignment in unit test; document and
  scope-allow too_many_arguments on the SIMD inner-loop helper
  (each parameter is a distinct cursor/limit on the hot path).
- merkle.rs: drop `(usize).max(0)` which is always \u22650.
- benches: factor `fn(usize) -> Vec<u8>` into a `DataGen` type alias
  to satisfy clippy::type_complexity.

No behavioral changes; all workspace tests pass.
2026-05-19 15:09:06 -07:00
5 changed files with 10 additions and 97 deletions
+2 -1
View File
@@ -73,7 +73,8 @@ fn bench_compress(data: &[u8], codec: Codec) -> usize {
fn bench_tdt_compress(c: &mut Criterion) {
let sizes = [4096usize, 65536];
let datasets: &[(&str, fn(usize) -> Vec<u8>, usize)] = &[
type DataGen = fn(usize) -> Vec<u8>;
let datasets: &[(&str, DataGen, usize)] = &[
("f32_smooth", make_f32_smooth, 4),
("f32_random", make_f32_random, 4),
("int32_random", make_int32_random, 4),
+1 -1
View File
@@ -540,7 +540,7 @@ mod tests {
let all_entries: Vec<(u64, [u8; 32])> = (0..total as u64)
.map(|r| (r, rev_hash(r)))
.collect();
let keep_count = ((total as f64 * keep_frac) as usize).max(0);
let keep_count = (total as f64 * keep_frac) as usize;
let remote_entries = &all_entries[..keep_count];
let local = RevisionMerkleTree::build(&all_entries);
+3 -1
View File
@@ -58,8 +58,10 @@ fn cold_data(n: usize) -> Vec<u8> {
// Benchmark
// ─────────────────────────────────────────────────────────────────────────────
type DataGen = fn(usize) -> Vec<u8>;
fn bench_cdc(c: &mut Criterion) {
let datasets: &[(&str, fn(usize) -> Vec<u8>)] = &[
let datasets: &[(&str, DataGen)] = &[
("random", random_data),
("float", float_data),
("cold_only", cold_data),
+4 -1
View File
@@ -151,6 +151,9 @@ pub fn chunk_scalar(data: &[u8], min: usize, avg: usize, max: usize) -> Vec<Chun
/// Scalar processing for a single 16-byte (or shorter) slice, folding the
/// updated hash back out. Used by both SIMD paths when a hot byte is detected.
#[inline(always)]
// Hot SIMD inner-loop helper: each arg is a distinct cursor/limit; bundling
// into a struct would add per-call overhead in the chunker fast path.
#[allow(clippy::too_many_arguments)]
fn scalar_window(
data: &[u8],
window: &[u8],
@@ -542,7 +545,7 @@ mod tests {
let original = chunk_data_simd(&data);
// Flip a hot byte in the middle to force a different boundary
let mid = 150_000;
data[mid] = data[mid] & 0x3F; // ensure it's a hot byte (< 64)
data[mid] &= 0x3F; // ensure it's a hot byte (< 64)
data[mid] ^= 0x11;
let mutated = chunk_data_simd(&data);
assert_ne!(original, mutated, "mutation should change chunk boundaries");
@@ -1,93 +0,0 @@
//! Unit-level coverage for `SyncPeer` and pipe halves over the mmap backend.
//!
//! These tests exercise variants that don't require socket setup, lifting
//! `clawsync-transport/src/peer.rs` coverage off the floor. TCP/QUIC variants
//! are already covered by `e2e_sync.rs` and `e2e_quic_sync.rs`.
use clawsync_transport::{
MmapChannel, MmapReceiver, MmapSender, PipeReadHalf, PipeWriteHalf, SyncMessage, SyncPeer,
};
use tempfile::tempdir;
const RING: usize = 64 * 1024;
fn build_mmap_pair() -> (MmapSender, MmapReceiver, tempfile::TempDir) {
let dir = tempdir().expect("tempdir");
let path = dir.path().join("ch.mmap");
let _ = MmapChannel::create(&path, RING).expect("create channel");
let tx = MmapSender::open(&path).expect("open sender");
let rx = MmapReceiver::open(&path).expect("open receiver");
(tx, rx, dir)
}
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
async fn mmap_peer_send_recv_roundtrip() {
let (send_ch, recv_ch, _dir) = build_mmap_pair();
let mut peer = SyncPeer::Mmap { send_ch, recv_ch };
peer.send(&SyncMessage::Ack { revision: 7 })
.await
.expect("send");
match peer.recv().await.expect("recv") {
SyncMessage::Ack { revision } => assert_eq!(revision, 7),
other => panic!("unexpected message: {other:?}"),
}
}
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
async fn mmap_peer_shutdown_is_noop_ok() {
let (send_ch, recv_ch, _dir) = build_mmap_pair();
let peer = SyncPeer::Mmap { send_ch, recv_ch };
peer.shutdown().await.expect("mmap shutdown is Ok(())");
}
#[test]
fn mmap_peer_quic_helpers_return_none() {
let dir = tempdir().unwrap();
let path = dir.path().join("ch.mmap");
let _ = MmapChannel::create(&path, RING).unwrap();
let peer = SyncPeer::Mmap {
send_ch: MmapSender::open(&path).unwrap(),
recv_ch: MmapReceiver::open(&path).unwrap(),
};
assert!(peer.as_stream_peer().is_none());
assert!(peer.quic_conn_clone().is_none());
// close_quic is a no-op for non-QUIC peers — it must not panic.
peer.close_quic();
}
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
async fn mmap_peer_into_pipe_halves_roundtrip() {
let (send_ch, recv_ch, _dir) = build_mmap_pair();
let peer = SyncPeer::Mmap { send_ch, recv_ch };
let (mut read_half, mut write_half) = peer.into_pipe_halves();
assert!(matches!(read_half, PipeReadHalf::Mmap(_)));
assert!(matches!(write_half, PipeWriteHalf::Mmap(_)));
write_half
.send(&SyncMessage::Ack { revision: 42 })
.await
.expect("pipe send");
match read_half.recv().await.expect("pipe recv") {
SyncMessage::Ack { revision } => assert_eq!(revision, 42),
other => panic!("unexpected: {other:?}"),
}
}
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
async fn mmap_pipe_write_half_shutdown_is_ok() {
let (send_ch, recv_ch, _dir) = build_mmap_pair();
let (_r, w) = SyncPeer::Mmap { send_ch, recv_ch }.into_pipe_halves();
w.shutdown().await.expect("mmap pipe shutdown");
}
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
async fn mmap_pipe_write_half_shutdown_push_is_ok() {
let (send_ch, recv_ch, _dir) = build_mmap_pair();
let (_r, w) = SyncPeer::Mmap { send_ch, recv_ch }.into_pipe_halves();
// For non-QUIC transports, shutdown_push() delegates to shutdown().
w.shutdown_push().await.expect("mmap pipe shutdown_push");
}