Merge remote-tracking branch 'origin/main' into derive-syntax

Author: Liam-DeVoe

.claude/CLAUDE.md

@@ -91,7 +91,7 @@ For enums, it also creates `<Enum><Variant>Generator` for each data variant. Imp
 
 ### Testing Conventions
 
-- Place tests in `tests/` as integration tests, not as inline `#[cfg(test)] mod tests` in source files.
+- All tests go in `tests/`, never inline in source files. Tests that don't need access to private functions go directly in `tests/` as integration tests. Tests that need access to private functions go in `tests/embedded/`, mirroring the `src/` directory structure (e.g. `src/protocol/packet.rs` → `tests/embedded/protocol/packet_tests.rs`). Embedded tests are included as child modules of their source file via `#[cfg(test)] #[path = "..."] mod tests;`, which gives them access to private items through `use super::*`. This keeps test code out of source files while preserving access to internals that Rust would otherwise forbid.
 - When a test needs a throwaway generator, prefer `generators::booleans()` as the simplest option (unless the test needs a larger value space).
 - In test code, prefer `.unwrap()` over `.expect("static message")`. A static expect message rarely adds information beyond what the panic already provides (error type + source location). Only use `.expect()` when the message includes a formatted value that aids debugging (e.g., `.expect(&format!("failed to open {}", path))`).
 

.github/coverage-ratchet.json

@@ -1,3 +1,3 @@
 {
-  "nocov": 533
+  "nocov": 529
 }

justfile

@@ -49,7 +49,7 @@ check-coverage:
 
 check-conformance:
     cargo build --release --manifest-path tests/conformance/rust/Cargo.toml
-    uv run --with hegel-core --with pytest --with hypothesis \
+    uv run --with 'hegel-core==0.3.0' --with pytest --with hypothesis \
         pytest tests/conformance/test_conformance.py
 
 # these aliases are provided as ux improvements for local developers. CI should use the longer

src/cbor_utils.rs

@@ -94,52 +94,5 @@ pub fn cbor_serialize<T: serde::Serialize>(value: &T) -> Value {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_cbor_map_macro() {
-        let m = cbor_map! {
-            "type" => "integer",
-            "min_value" => 0
-        };
-        assert_eq!(as_text(map_get(&m, "type").unwrap()), Some("integer"));
-        assert_eq!(as_u64(map_get(&m, "min_value").unwrap()), Some(0));
-    }
-
-    #[test]
-    fn test_cbor_array_macro() {
-        let a = cbor_array![Value::from("a"), Value::from("b")];
-        if let Value::Array(items) = &a {
-            assert_eq!(items.len(), 2);
-        } else {
-            panic!("expected array"); // nocov
-        }
-    }
-
-    #[test]
-    fn test_map_insert() {
-        let mut m = cbor_map! { "a" => 1 };
-        map_insert(&mut m, "b", 2);
-        assert_eq!(as_u64(map_get(&m, "b").unwrap()), Some(2));
-
-        map_insert(&mut m, "a", 10);
-        assert_eq!(as_u64(map_get(&m, "a").unwrap()), Some(10));
-    }
-
-    #[test]
-    fn test_as_bool() {
-        assert_eq!(as_bool(&Value::Bool(true)), Some(true));
-        assert_eq!(as_bool(&Value::Bool(false)), Some(false));
-        assert_eq!(as_bool(&Value::from(42)), None);
-    }
-
-    #[test]
-    fn test_cbor_serialize() {
-        let v = cbor_serialize(&42i32);
-        assert_eq!(as_u64(&v), Some(42));
-
-        let v = cbor_serialize(&"hello");
-        assert_eq!(as_text(&v), Some("hello"));
-    }
-}
+#[path = "../tests/embedded/cbor_utils_tests.rs"]
+mod tests;

src/generators/value.rs

@@ -249,117 +249,5 @@ pub fn from_hegel_value<T: de::DeserializeOwned>(value: HegelValue) -> Result<T,
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_deserialize_f64() {
-        let v = HegelValue::Number(42.5);
-        let result: f64 = from_hegel_value(v).unwrap();
-        assert_eq!(result, 42.5);
-    }
-
-    #[test]
-    fn test_deserialize_nan() {
-        let v = HegelValue::Number(f64::NAN);
-        let result: f64 = from_hegel_value(v).unwrap();
-        assert!(result.is_nan());
-    }
-
-    #[test]
-    fn test_deserialize_infinity() {
-        let v = HegelValue::Number(f64::INFINITY);
-        let result: f64 = from_hegel_value(v).unwrap();
-        assert!(result.is_infinite() && result.is_sign_positive());
-    }
-
-    #[test]
-    fn test_deserialize_neg_infinity() {
-        let v = HegelValue::Number(f64::NEG_INFINITY);
-        let result: f64 = from_hegel_value(v).unwrap();
-        assert!(result.is_infinite() && result.is_sign_negative());
-    }
-
-    #[test]
-    fn test_deserialize_vec_f64() {
-        let v = HegelValue::Array(vec![
-            HegelValue::Number(1.0),
-            HegelValue::Number(f64::NAN),
-            HegelValue::Number(f64::INFINITY),
-        ]);
-        let result: Vec<f64> = from_hegel_value(v).unwrap();
-        assert_eq!(result.len(), 3);
-        assert_eq!(result[0], 1.0);
-        assert!(result[1].is_nan());
-        assert!(result[2].is_infinite());
-    }
-
-    #[test]
-    fn test_from_ciborium_nan() {
-        let cbor = ciborium::Value::Float(f64::NAN);
-        let hegel = HegelValue::from(cbor);
-        if let HegelValue::Number(n) = hegel {
-            assert!(n.is_nan());
-        } else {
-            panic!("expected Number"); // nocov
-        }
-    }
-
-    #[test]
-    fn test_from_ciborium_infinity() {
-        let cbor = ciborium::Value::Float(f64::INFINITY);
-        let hegel = HegelValue::from(cbor);
-        let result: f64 = from_hegel_value(hegel).unwrap();
-        assert!(result.is_infinite() && result.is_sign_positive());
-    }
-
-    #[test]
-    fn test_from_ciborium_neg_infinity() {
-        let cbor = ciborium::Value::Float(f64::NEG_INFINITY);
-        let hegel = HegelValue::from(cbor);
-        let result: f64 = from_hegel_value(hegel).unwrap();
-        assert!(result.is_infinite() && result.is_sign_negative());
-    }
-
-    #[test]
-    fn test_from_ciborium_big_integer() {
-        // Value larger than 2^53
-        let cbor = ciborium::Value::Integer(9223372036854776833u64.into());
-        let hegel = HegelValue::from(cbor);
-        let result: u64 = from_hegel_value(hegel).unwrap();
-        assert_eq!(result, 9223372036854776833u64);
-    }
-
-    #[test]
-    fn test_from_ciborium_array_with_nan() {
-        let cbor = ciborium::Value::Array(vec![
-            ciborium::Value::Float(1.0),
-            ciborium::Value::Float(f64::NAN),
-            ciborium::Value::Float(f64::INFINITY),
-            ciborium::Value::Float(f64::NEG_INFINITY),
-        ]);
-        let hegel = HegelValue::from(cbor);
-        let result: Vec<f64> = from_hegel_value(hegel).unwrap();
-        assert_eq!(result[0], 1.0);
-        assert!(result[1].is_nan());
-        assert!(result[2].is_infinite() && result[2].is_sign_positive());
-        assert!(result[3].is_infinite() && result[3].is_sign_negative());
-    }
-
-    #[test]
-    fn test_deserialize_struct() {
-        #[derive(serde::Deserialize, Debug)]
-        struct TestStruct {
-            value: f64,
-            name: String,
-        }
-
-        let v = HegelValue::Object(HashMap::from([
-            ("value".to_string(), HegelValue::Number(f64::NAN)),
-            ("name".to_string(), HegelValue::String("test".to_string())),
-        ]));
-        let result: TestStruct = from_hegel_value(v).unwrap();
-        assert!(result.value.is_nan());
-        assert_eq!(result.name, "test");
-    }
-}
+#[path = "../../tests/embedded/generators/value_tests.rs"]
+mod tests;

src/protocol/connection.rs

@@ -120,28 +120,5 @@ impl Connection {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-    use std::os::unix::net::UnixStream;
-
-    /// Verify that when the reader stream closes (simulating server crash),
-    /// streams unblock promptly instead of hanging forever.
-    #[test]
-    fn test_stream_unblocks_on_reader_close() {
-        // Create a connection whose reader returns EOF immediately.
-        // This simulates the server process dying.
-        let (_, write_end) = UnixStream::pair().unwrap();
-        let conn = Connection::new(Box::new(std::io::empty()), Box::new(write_end));
-
-        // Wait for the background reader to detect EOF
-        while !conn.server_has_exited() {
-            std::thread::yield_now();
-        }
-
-        // Stream created AFTER server exit must still unblock, not hang.
-        let mut stream = conn.new_stream();
-
-        let result = stream.receive_request();
-        assert!(result.is_err());
-    }
-}
+#[path = "../../tests/embedded/protocol/connection_tests.rs"]
+mod tests;

src/protocol/packet.rs

@@ -112,98 +112,5 @@ pub fn read_packet<R: Read + ?Sized>(reader: &mut R) -> std::io::Result<Packet>
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-    use std::os::unix::net::UnixStream;
-
-    use ciborium::Value;
-
-    #[test]
-    fn test_packet_roundtrip() {
-        let (mut client, mut server) = UnixStream::pair().unwrap();
-
-        let packet = Packet {
-            stream: 1,
-            message_id: 42,
-            is_reply: false,
-            payload: b"hello world".to_vec(),
-        };
-        write_packet(&mut client, &packet).unwrap();
-
-        let received = read_packet(&mut server).unwrap();
-        assert_eq!(received.stream, 1);
-        assert_eq!(received.message_id, 42);
-        assert!(!received.is_reply);
-        assert_eq!(received.payload, b"hello world");
-    }
-
-    #[test]
-    fn test_reply_packet() {
-        let (mut client, mut server) = UnixStream::pair().unwrap();
-
-        let packet = Packet {
-            stream: 2,
-            message_id: 100,
-            is_reply: true,
-            payload: b"response".to_vec(),
-        };
-        write_packet(&mut client, &packet).unwrap();
-
-        let received = read_packet(&mut server).unwrap();
-        assert_eq!(received.stream, 2);
-        assert_eq!(received.message_id, 100);
-        assert!(received.is_reply);
-        assert_eq!(received.payload, b"response");
-    }
-
-    #[test]
-    fn test_cbor_value_roundtrip() {
-        use crate::cbor_utils::cbor_map;
-        // Test that ciborium::Value roundtrips through CBOR
-        let value = cbor_map! {
-            "type" => "integer",
-            "min_value" => 0,
-            "max_value" => 100
-        };
-
-        // Serialize to CBOR bytes
-        let mut cbor_bytes = Vec::new();
-        ciborium::into_writer(&value, &mut cbor_bytes).unwrap();
-
-        // Deserialize back
-        let back: Value = ciborium::from_reader(&cbor_bytes[..]).unwrap();
-
-        assert_eq!(value, back);
-    }
-
-    #[test]
-    fn test_cbor_nan_preserved() {
-        let value = Value::Float(f64::NAN);
-        let mut bytes = Vec::new();
-        ciborium::into_writer(&value, &mut bytes).unwrap();
-        let back: Value = ciborium::from_reader(&bytes[..]).unwrap();
-        if let Value::Float(f) = back {
-            assert!(f.is_nan());
-        } else {
-            panic!("expected Float"); // nocov
-        }
-    }
-
-    #[test]
-    fn test_cbor_infinity_preserved() {
-        let value = Value::Float(f64::INFINITY);
-        let mut bytes = Vec::new();
-        ciborium::into_writer(&value, &mut bytes).unwrap();
-        let back: Value = ciborium::from_reader(&bytes[..]).unwrap();
-        assert_eq!(back, Value::Float(f64::INFINITY));
-    }
-
-    #[test]
-    fn test_cbor_neg_infinity_preserved() {
-        let value = Value::Float(f64::NEG_INFINITY);
-        let mut bytes = Vec::new();
-        ciborium::into_writer(&value, &mut bytes).unwrap();
-        let back: Value = ciborium::from_reader(&bytes[..]).unwrap();
-        assert_eq!(back, Value::Float(f64::NEG_INFINITY));
-    }
-}
+#[path = "../../tests/embedded/protocol/packet_tests.rs"]
+mod tests;