mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-16 08:38:26 +00:00
cleanup API
make Identity the serializer, so we don't have to pass it around everywhere.
This commit is contained in:
parent
4236ba4511
commit
c259d5566d
4 changed files with 51 additions and 38 deletions
60
Cargo.lock
generated
60
Cargo.lock
generated
|
|
@ -44,7 +44,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
checksum = "ae0784134ba9375416d469ec31e7c5f9fa94405049cf08c5ce5b4698be673e0d"
|
||||
dependencies = [
|
||||
"aead",
|
||||
"aes 0.8.3",
|
||||
"aes 0.8.4",
|
||||
"cipher",
|
||||
"ctr",
|
||||
"polyval",
|
||||
|
|
@ -58,7 +58,7 @@ version = "0.2.1"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "69fa2b352dcefb5f7f3a5fb840e02665d311d878955380515e4fd50095dd3d8c"
|
||||
dependencies = [
|
||||
"aes 0.8.3",
|
||||
"aes 0.8.4",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -160,7 +160,7 @@ dependencies = [
|
|||
"argh_shared",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.48",
|
||||
"syn 2.0.77",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -1199,7 +1199,7 @@ source = "git+https://github.com/betrusted-io/curve25519-dalek.git?branch=main#7
|
|||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.48",
|
||||
"syn 2.0.77",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -1269,7 +1269,7 @@ dependencies = [
|
|||
"ident_case",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.48",
|
||||
"syn 2.0.77",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -1291,7 +1291,7 @@ checksum = "1d1545d67a2149e1d93b7e5c7752dce5a7426eb5d1357ddcfd89336b94444f77"
|
|||
dependencies = [
|
||||
"darling_core 0.20.5",
|
||||
"quote",
|
||||
"syn 2.0.48",
|
||||
"syn 2.0.77",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -1326,7 +1326,7 @@ dependencies = [
|
|||
"proc-macro-error",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.48",
|
||||
"syn 2.0.77",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -1391,7 +1391,7 @@ checksum = "5fe87ce4529967e0ba1dcf8450bab64d97dfd5010a6256187ffe2e43e6f0e049"
|
|||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.48",
|
||||
"syn 2.0.77",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -1411,7 +1411,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611"
|
|||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.48",
|
||||
"syn 2.0.77",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -1469,7 +1469,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
|
|||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.48",
|
||||
"syn 2.0.77",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -1723,7 +1723,7 @@ dependencies = [
|
|||
"once_cell",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.48",
|
||||
"syn 2.0.77",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -1744,7 +1744,7 @@ dependencies = [
|
|||
"darling 0.20.5",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.48",
|
||||
"syn 2.0.77",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -1936,7 +1936,7 @@ checksum = "b0fa992f1656e1707946bbba340ad244f0814009ef8c0118eb7b658395f19a2e"
|
|||
dependencies = [
|
||||
"frunk_proc_macro_helpers",
|
||||
"quote",
|
||||
"syn 2.0.48",
|
||||
"syn 2.0.77",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -1948,7 +1948,7 @@ dependencies = [
|
|||
"frunk_core",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.48",
|
||||
"syn 2.0.77",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -2022,7 +2022,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
|
|||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.48",
|
||||
"syn 2.0.77",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -3225,7 +3225,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
|
|||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.48",
|
||||
"syn 2.0.77",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -3315,7 +3315,7 @@ checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6"
|
|||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.48",
|
||||
"syn 2.0.77",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -3831,9 +3831,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
|
|||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.78"
|
||||
version = "1.0.86"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
|
||||
checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
|
@ -4053,7 +4053,7 @@ checksum = "8b86292cf41ccfc96c5de7165c1c53d5b4ac540c5bab9d1857acbe9eba5f1a0b"
|
|||
dependencies = [
|
||||
"proc-macro-hack",
|
||||
"quote",
|
||||
"syn 2.0.48",
|
||||
"syn 2.0.77",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -4505,7 +4505,7 @@ checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
|
|||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.48",
|
||||
"syn 2.0.77",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -4527,7 +4527,7 @@ checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
|
|||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.48",
|
||||
"syn 2.0.77",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -4934,9 +4934,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.48"
|
||||
version = "2.0.77"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
|
||||
checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
@ -5048,7 +5048,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
|
|||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.48",
|
||||
"syn 2.0.77",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -5230,7 +5230,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
|
|||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.48",
|
||||
"syn 2.0.77",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -5823,7 +5823,7 @@ dependencies = [
|
|||
"once_cell",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.48",
|
||||
"syn 2.0.77",
|
||||
"wasm-bindgen-shared",
|
||||
]
|
||||
|
||||
|
|
@ -5857,7 +5857,7 @@ checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66"
|
|||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.48",
|
||||
"syn 2.0.77",
|
||||
"wasm-bindgen-backend",
|
||||
"wasm-bindgen-shared",
|
||||
]
|
||||
|
|
@ -5890,7 +5890,7 @@ checksum = "a5211b7550606857312bba1d978a8ec75692eae187becc5e680444fffc5e6f89"
|
|||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.48",
|
||||
"syn 2.0.77",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -6583,7 +6583,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
|
|||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.48",
|
||||
"syn 2.0.77",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ pub fn send_message(connection: CID, mut message: Message) -> core::result::Resu
|
|||
br: Point { x: 420, y: 69 },
|
||||
style: DrawStyle { fill_color: None, stroke_color: Some(PixelColor::Dark), stroke_width: 3 },
|
||||
});
|
||||
buffer.replace::<Identity, _>(tv).unwrap();
|
||||
buffer.replace(tv).unwrap();
|
||||
let ret = Result::MemoryReturned(body.offset, body.valid);
|
||||
println!("returning with {:?}", ret);
|
||||
Ok(ret)
|
||||
|
|
@ -102,7 +102,7 @@ impl<'buf> Buffer<'buf> {
|
|||
}
|
||||
}
|
||||
|
||||
pub fn into_buf<F, T>(src: &T) -> Self
|
||||
fn into_buf_inner<F, T>(src: &T) -> Self
|
||||
where
|
||||
F: for<'a, 'b> SerializeWith<T, Serializer<'a, 'b>>,
|
||||
{
|
||||
|
|
@ -145,8 +145,13 @@ impl<'buf> Buffer<'buf> {
|
|||
xous_buf
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
pub fn replace<F, T>(&mut self, src: T) -> core::result::Result<(), &'static str>
|
||||
pub fn into_buf<T>(src: &T) -> Self
|
||||
where
|
||||
T: for<'b, 'a> rkyv::Serialize<rkyv::rancor::Strategy<rkyv::ser::Serializer<rkyv::ser::writer::Buffer<'b>, rkyv::ser::allocator::SubAllocator<'a>, ()>, rkyv::rancor::Panic>> {
|
||||
Buffer::into_buf_inner::<Identity, T>(src)
|
||||
}
|
||||
|
||||
fn replace_inner<F, T>(&mut self, src: T) -> core::result::Result<(), &'static str>
|
||||
where
|
||||
F: for<'a, 'b> SerializeWith<T, Serializer<'a, 'b>>,
|
||||
{
|
||||
|
|
@ -205,6 +210,14 @@ impl<'buf> Buffer<'buf> {
|
|||
Ok(())
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
pub fn replace<T>(&mut self, src: T) -> core::result::Result<(), &'static str>
|
||||
where
|
||||
T: for<'b, 'a> rkyv::Serialize<rkyv::rancor::Strategy<rkyv::ser::Serializer<rkyv::ser::writer::Buffer<'b>, rkyv::ser::allocator::SubAllocator<'a>, ()>, rkyv::rancor::Panic>>
|
||||
{
|
||||
self.replace_inner::<Identity, T>(src)
|
||||
}
|
||||
|
||||
pub fn to_original<T, U, E>(&self) -> core::result::Result<T, E>
|
||||
where
|
||||
T: rkyv::Archive<Archived = U>,
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ mod buffer;
|
|||
use buffer::*;
|
||||
|
||||
mod testcases;
|
||||
use rkyv::{deserialize, rancor::Error, with::Identity, Archive, Deserialize, Serialize};
|
||||
use rkyv::{deserialize, rancor::Error, Archive, Deserialize, Serialize};
|
||||
use testcases::*;
|
||||
|
||||
// A test structure with rkyv derives
|
||||
|
|
@ -32,7 +32,7 @@ fn main() {
|
|||
string2: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.".to_string(),
|
||||
};
|
||||
|
||||
let buf = Buffer::into_buf::<Identity, Test>(&value); // AsBox
|
||||
let buf = Buffer::into_buf(&value); // AsBox
|
||||
|
||||
let f = buf.as_flat::<Test, _>().unwrap();
|
||||
println!("f: {:?}", f);
|
||||
|
|
@ -70,7 +70,7 @@ fn main() {
|
|||
tv.text.push_str(&value.string2);
|
||||
println!("Tv bounds computed before: {:?}", tv.bounds_computed);
|
||||
|
||||
let mut tv_buf = Buffer::into_buf::<Identity, _>(&tv);
|
||||
let mut tv_buf = Buffer::into_buf(&tv);
|
||||
match tv_buf.lend_mut(1, 1) {
|
||||
Ok(r) => {
|
||||
println!("Returned {:?}", r);
|
||||
|
|
|
|||
|
|
@ -202,7 +202,7 @@ pub enum Opcode {
|
|||
}
|
||||
|
||||
pub fn draw_textview(conn: xous::CID, tv: &mut TextView) -> Result<(), xous::Error> {
|
||||
let mut buf = crate::Buffer::into_buf::<rkyv::with::Identity, TextView>(tv);
|
||||
let mut buf = crate::Buffer::into_buf(tv);
|
||||
buf.lend_mut(conn, Opcode::DrawTextView.to_u32().unwrap()).or(Err(xous::Error::InternalError))?;
|
||||
|
||||
let tvr = buf.to_original::<TextView, _, rkyv::rancor::Error>().unwrap();
|
||||
|
|
|
|||
Loading…
Reference in a new issue