From 6b4c2931d7861c8e03b4341a057ba421c7e9b507 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sat, 25 Jul 2026 17:10:42 +0100 Subject: Rename StructWithShared to StructWithListOfShared --- .../src/test/java/org/zwobble/example/Transient0Tests.java | 10 +++++----- examples/11-transient-0/output/rust/src/gen/data.rs | 2 +- .../11-transient-0/output/rust/src/gen/data/transient_0.rs | 6 +++--- examples/11-transient-0/output/rust/src/lib.rs | 10 +++++----- examples/11-transient-0/src/data.hob | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/examples/11-transient-0/output/java/src/test/java/org/zwobble/example/Transient0Tests.java b/examples/11-transient-0/output/java/src/test/java/org/zwobble/example/Transient0Tests.java index a482612..abae7e0 100644 --- a/examples/11-transient-0/output/java/src/test/java/org/zwobble/example/Transient0Tests.java +++ b/examples/11-transient-0/output/java/src/test/java/org/zwobble/example/Transient0Tests.java @@ -19,8 +19,8 @@ import org.zwobble.example.types.data.StructWithEnum; import org.zwobble.example.types.data.StructWithInt32; import org.zwobble.example.types.data.StructWithInt64; import org.zwobble.example.types.data.StructWithList; +import org.zwobble.example.types.data.StructWithListOfShared; import org.zwobble.example.types.data.StructWithOption; -import org.zwobble.example.types.data.StructWithShared; import org.zwobble.example.types.data.StructWithString; import org.zwobble.example.types.data.StructWithStruct; import org.zwobble.example.types.data.StructWithSum; @@ -194,16 +194,16 @@ public class Transient0Tests { } @Test - public void structWithShared() throws IOException { + public void structWithListOfShared() throws IOException { var a = new StructWithInt32(10, 25); var b = new StructWithInt32(42, 47); - var value = new StructWithShared(List.of(a, a, b, a, b)); + var value = new StructWithListOfShared(List.of(a, a, b, a, b)); var decodedValue = assertRoundTripEncoding( value, - HobgoblinTransient0Data::encodeStructWithShared, - HobgoblinTransient0Data::decodeStructWithShared + HobgoblinTransient0Data::encodeStructWithListOfShared, + HobgoblinTransient0Data::decodeStructWithListOfShared ); Assertions.assertSame(decodedValue.inner().get(0), decodedValue.inner().get(1)); Assertions.assertSame(decodedValue.inner().get(0), decodedValue.inner().get(3)); diff --git a/examples/11-transient-0/output/rust/src/gen/data.rs b/examples/11-transient-0/output/rust/src/gen/data.rs index 75efcc8..d31f341 100644 --- a/examples/11-transient-0/output/rust/src/gen/data.rs +++ b/examples/11-transient-0/output/rust/src/gen/data.rs @@ -90,6 +90,6 @@ pub struct StructWithSum { } #[derive(Debug, PartialEq)] -pub struct StructWithShared { +pub struct StructWithListOfShared { pub inner: ::std::vec::Vec::<::std::sync::Arc::>, } diff --git a/examples/11-transient-0/output/rust/src/gen/data/transient_0.rs b/examples/11-transient-0/output/rust/src/gen/data/transient_0.rs index b2f78c2..442e723 100644 --- a/examples/11-transient-0/output/rust/src/gen/data/transient_0.rs +++ b/examples/11-transient-0/output/rust/src/gen/data/transient_0.rs @@ -222,7 +222,7 @@ pub fn decode_struct_with_sum(reader: &mut impl std::io::Read) -> ::std::io::Res std::io::Result::Ok(crate::data::StructWithSum { inner: inner, b: b }) } -pub fn encode_struct_with_shared(value: &crate::data::StructWithShared, writer: &mut impl std::io::Write) -> ::std::io::Result::<()> { +pub fn encode_struct_with_list_of_shared(value: &crate::data::StructWithListOfShared, writer: &mut impl std::io::Write) -> ::std::io::Result::<()> { { crate::transient_0::encode_int_64(&(((&value.inner).len()).try_into()).map_err(|error| ::std::io::Error::new(::std::io::ErrorKind::InvalidData, error))?, writer)?; for element in &value.inner { @@ -232,7 +232,7 @@ pub fn encode_struct_with_shared(value: &crate::data::StructWithShared, writer: ::std::io::Result::Ok(()) } -pub fn decode_struct_with_shared(reader: &mut impl std::io::Read) -> ::std::io::Result:: { +pub fn decode_struct_with_list_of_shared(reader: &mut impl std::io::Read) -> ::std::io::Result:: { let inner = { let len = crate::transient_0::decode_int_64(reader)?; let mut elements = ::std::vec::Vec::with_capacity((len.try_into()).map_err(|error| ::std::io::Error::new(::std::io::ErrorKind::InvalidData, error))?); @@ -241,5 +241,5 @@ pub fn decode_struct_with_shared(reader: &mut impl std::io::Read) -> ::std::io:: }; elements }; - std::io::Result::Ok(crate::data::StructWithShared { inner: inner }) + std::io::Result::Ok(crate::data::StructWithListOfShared { inner: inner }) } diff --git a/examples/11-transient-0/output/rust/src/lib.rs b/examples/11-transient-0/output/rust/src/lib.rs index 6675c4c..4b346a5 100644 --- a/examples/11-transient-0/output/rust/src/lib.rs +++ b/examples/11-transient-0/output/rust/src/lib.rs @@ -5,7 +5,7 @@ pub mod transient_0; mod test { use std::io::Cursor; use std::sync::Arc; - use super::data::{EnumWithVariants, StructWithBool, StructWithEnum, StructWithInt32, StructWithInt64, StructWithList, StructWithOption, StructWithShared, StructWithString, StructWithStruct, StructWithSum, SumWithVariants, VariantOne, VariantTwo }; + use super::data::{EnumWithVariants, StructWithBool, StructWithEnum, StructWithInt32, StructWithInt64, StructWithList, StructWithListOfShared, StructWithOption, StructWithString, StructWithStruct, StructWithSum, SumWithVariants, VariantOne, VariantTwo }; #[test] fn struct_with_bool() { @@ -170,8 +170,8 @@ mod test { } #[test] - fn struct_with_shared() { - let value = StructWithShared { + fn struct_with_list_of_shared() { + let value = StructWithListOfShared { inner: vec![ Arc::new(StructWithInt32 { a: 10, b: 25 }), ], @@ -179,8 +179,8 @@ mod test { assert_round_trip_encoding( value, - super::data::transient_0::encode_struct_with_shared, - super::data::transient_0::decode_struct_with_shared, + super::data::transient_0::encode_struct_with_list_of_shared, + super::data::transient_0::decode_struct_with_list_of_shared, ); } diff --git a/examples/11-transient-0/src/data.hob b/examples/11-transient-0/src/data.hob index ca1d7be..63ed8d3 100644 --- a/examples/11-transient-0/src/data.hob +++ b/examples/11-transient-0/src/data.hob @@ -62,6 +62,6 @@ struct StructWithSum { field b: Int32; } -struct StructWithShared { +struct StructWithListOfShared { field inner: List[Shared[StructWithInt32]]; } -- cgit v1.2.3