From b00bf672cbbd9ff1ec013a52ddfd59fdf82f8144 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Fri, 24 Jul 2026 14:51:57 +0100 Subject: Avoid unwraps in generated Rust code --- examples/10-transient-0/output/rust/src/gen/data/transient_0.rs | 8 ++++---- examples/10-transient-0/output/rust/src/gen/transient_0.rs | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'examples/10-transient-0') diff --git a/examples/10-transient-0/output/rust/src/gen/data/transient_0.rs b/examples/10-transient-0/output/rust/src/gen/data/transient_0.rs index 2ce685d..2caeb3a 100644 --- a/examples/10-transient-0/output/rust/src/gen/data/transient_0.rs +++ b/examples/10-transient-0/output/rust/src/gen/data/transient_0.rs @@ -74,13 +74,13 @@ pub fn decode_inner_struct(reader: &mut impl std::io::Read) -> ::std::io::Result pub fn encode_struct_with_list(value: &crate::data::StructWithList, writer: &mut impl std::io::Write) -> ::std::io::Result::<()> { { - crate::transient_0::encode_int_64(&(((&value.a).len()).try_into()).unwrap(), writer)?; + crate::transient_0::encode_int_64(&(((&value.a).len()).try_into()).map_err(|error| ::std::io::Error::new(::std::io::ErrorKind::InvalidData, error))?, writer)?; for element in &value.a { crate::transient_0::encode_int_64(element, writer)?; }; }; { - crate::transient_0::encode_int_64(&(((&value.b).len()).try_into()).unwrap(), writer)?; + crate::transient_0::encode_int_64(&(((&value.b).len()).try_into()).map_err(|error| ::std::io::Error::new(::std::io::ErrorKind::InvalidData, error))?, writer)?; for element in &value.b { crate::data::transient_0::encode_inner_struct(element, writer)?; }; @@ -91,7 +91,7 @@ pub fn encode_struct_with_list(value: &crate::data::StructWithList, writer: &mut pub fn decode_struct_with_list(reader: &mut impl std::io::Read) -> ::std::io::Result:: { let a = { let len = crate::transient_0::decode_int_64(reader)?; - let mut elements = ::std::vec::Vec::with_capacity((len.try_into()).unwrap()); + let mut elements = ::std::vec::Vec::with_capacity((len.try_into()).map_err(|error| ::std::io::Error::new(::std::io::ErrorKind::InvalidData, error))?); for _ in 0..len { elements.push(crate::transient_0::decode_int_64(reader)?); }; @@ -99,7 +99,7 @@ pub fn decode_struct_with_list(reader: &mut impl std::io::Read) -> ::std::io::Re }; let b = { let len = crate::transient_0::decode_int_64(reader)?; - let mut elements = ::std::vec::Vec::with_capacity((len.try_into()).unwrap()); + let mut elements = ::std::vec::Vec::with_capacity((len.try_into()).map_err(|error| ::std::io::Error::new(::std::io::ErrorKind::InvalidData, error))?); for _ in 0..len { elements.push(crate::data::transient_0::decode_inner_struct(reader)?); }; diff --git a/examples/10-transient-0/output/rust/src/gen/transient_0.rs b/examples/10-transient-0/output/rust/src/gen/transient_0.rs index e57324a..560fe51 100644 --- a/examples/10-transient-0/output/rust/src/gen/transient_0.rs +++ b/examples/10-transient-0/output/rust/src/gen/transient_0.rs @@ -54,7 +54,7 @@ pub fn decode_int_64(reader: &mut impl std::io::Read) -> ::std::io::Result::<::c } pub fn encode_string(value: &::std::string::String, writer: &mut impl std::io::Write) -> ::std::io::Result::<()> { - crate::transient_0::encode_int_64(&((value.len()).try_into()).unwrap(), writer)?; + crate::transient_0::encode_int_64(&((value.len()).try_into()).map_err(|error| ::std::io::Error::new(::std::io::ErrorKind::InvalidData, error))?, writer)?; writer.write_all(value.as_bytes())?; ::std::io::Result::Ok(()) } @@ -62,7 +62,7 @@ pub fn encode_string(value: &::std::string::String, writer: &mut impl std::io::W pub fn decode_string(reader: &mut impl std::io::Read) -> ::std::io::Result::<::std::string::String> { let len = crate::transient_0::decode_int_64(reader)?; let bytes = { - let mut bytes = vec![0u8; (len.try_into()).unwrap()]; + let mut bytes = vec![0u8; (len.try_into()).map_err(|error| ::std::io::Error::new(::std::io::ErrorKind::InvalidData, error))?]; reader.read_exact(&mut bytes)?; bytes }; -- cgit v1.2.3