From 0ecfa80bac94e866b1ddf85f0c8031a85e57edf0 Mon Sep 17 00:00:00 2001 From: bunnie Date: Mon, 23 Sep 2024 22:01:02 +0800 Subject: [PATCH] change rkyv behavior in xous-ipc from panic to failure this allows for more graceful error handling in case of serialization failures --- xous-ipc/src/buffer.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/xous-ipc/src/buffer.rs b/xous-ipc/src/buffer.rs index 9e23cc91f..03e97026e 100644 --- a/xous-ipc/src/buffer.rs +++ b/xous-ipc/src/buffer.rs @@ -4,7 +4,7 @@ use std::marker::PhantomData; use rkyv::{ Archive, Deserialize, Place, Portable, Serialize, api::low::LowSerializer, - rancor::{Panic, Strategy}, + rancor::{Failure, Strategy}, ser::{Positional, allocator::SubAllocator, writer::Buffer as RkyvBuffer}, with::{ArchiveWith, Identity, SerializeWith}, }; @@ -23,7 +23,7 @@ pub struct Buffer<'buf> { } const PAGE_SIZE: usize = 0x1000; -type Serializer<'a, 'b> = LowSerializer, SubAllocator<'a>, Panic>; +type Serializer<'a, 'b> = LowSerializer, SubAllocator<'a>, Failure>; impl<'buf> Buffer<'buf> { #[allow(dead_code)] @@ -198,7 +198,7 @@ impl<'buf> Buffer<'buf> { fn serialize( &self, serializer: &mut Serializer<'a, 'b>, - ) -> core::result::Result { + ) -> core::result::Result { F::serialize_with(self.0, serializer) } } @@ -210,7 +210,7 @@ impl<'buf> Buffer<'buf> { let alloc = SubAllocator::new(&mut scratch); let serialized_buf = - rkyv::api::low::to_bytes_in_with_alloc::<_, _, Panic>(&wrap, writer, alloc).map_err(|_| ())?; + rkyv::api::low::to_bytes_in_with_alloc::<_, _, Failure>(&wrap, writer, alloc).map_err(|_| ())?; xous_buf.used = serialized_buf.pos(); Ok(xous_buf) } @@ -225,7 +225,7 @@ impl<'buf> Buffer<'buf> { rkyv::ser::allocator::SubAllocator<'a>, (), >, - rkyv::rancor::Panic, + rkyv::rancor::Failure, >, >, { @@ -257,7 +257,7 @@ impl<'buf> Buffer<'buf> { fn serialize( &self, serializer: &mut Serializer<'a, 'b>, - ) -> core::result::Result { + ) -> core::result::Result { F::serialize_with(self.0, serializer) } } @@ -269,7 +269,7 @@ impl<'buf> Buffer<'buf> { let alloc = SubAllocator::new(&mut scratch); let serialized_buf = - rkyv::api::low::to_bytes_in_with_alloc::<_, _, Panic>(&wrap, writer, alloc).unwrap(); + rkyv::api::low::to_bytes_in_with_alloc::<_, _, Failure>(&wrap, writer, alloc).unwrap(); self.used = serialized_buf.pos(); if let Some(ref mut msg) = self.memory_message.as_mut() { @@ -288,7 +288,7 @@ impl<'buf> Buffer<'buf> { rkyv::ser::allocator::SubAllocator<'a>, (), >, - rkyv::rancor::Panic, + rkyv::rancor::Failure, >, >, {