From d3bcd0d41c712bfc4b4f0f9e7b5dd470e00c04a2 Mon Sep 17 00:00:00 2001 From: Able Date: Wed, 19 Jan 2022 13:52:26 -0600 Subject: [PATCH] >>:( --- Cargo.toml | 14 ++++++++------ src/lib.rs | 11 ++++++----- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index e3fa76e..d7e2db6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,14 +6,16 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html -[dependencies.bincode] -git = "https://github.com/bincode-org/bincode.git" -default-features = false -features = ["serde_no_std", "derive"] - - [dependencies.serde] version = "*" default-features = false features = ["derive", "alloc"] + +[dependencies.rkyv] +version = "0.7.29" +default-features = false +features = ["size_64"] + + + diff --git a/src/lib.rs b/src/lib.rs index c6edb4b..75f1b64 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -3,9 +3,10 @@ extern crate alloc; use alloc::vec::Vec; -use bincode::{Decode, Encode}; -#[derive(Encode, Decode, PartialEq, Debug)] +use rkyv::{Archive, Deserialize, Serialize}; + +#[derive(Archive, Deserialize, Serialize, PartialEq, Debug)] pub struct WindowOption { // funct: WindowFunction, symbol: char, @@ -14,13 +15,13 @@ pub struct WindowOption { pub type WindowBar = Vec; pub type WindowID = u64; -#[derive(Encode, Decode, PartialEq, Debug)] +#[derive(Archive, Deserialize, Serialize, PartialEq, Debug)] pub struct Window { // bar: WindowBar, } // TODO: Seperate out this versioning into ableos-ver -#[derive(Encode, Decode, PartialEq, Debug)] +#[derive(Archive, Deserialize, Serialize, PartialEq, Debug)] pub struct Version { pub major: u8, pub minor: u8, @@ -29,7 +30,7 @@ pub struct Version { pub type WindowFunction = fn() -> (); -#[derive(Encode, Decode, PartialEq, Debug)] +#[derive(Archive, Deserialize, Serialize, PartialEq, Debug)] pub enum Protocol { Version(Version),