From bdd194ea7bd91f2feee7b675f2ce66fdbefc1240 Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 29 Mar 2022 16:25:33 +0800 Subject: [PATCH] retire rust issue 90195 work-around in PDDB --- services/pddb/src/api.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/services/pddb/src/api.rs b/services/pddb/src/api.rs index c5140e0e5..c3df8a0ae 100644 --- a/services/pddb/src/api.rs +++ b/services/pddb/src/api.rs @@ -175,9 +175,9 @@ pub struct PddbBasisRequest { #[derive(rkyv::Archive, rkyv::Serialize, rkyv::Deserialize)] pub struct PddbDictRequest { pub basis_specified: bool, - pub basis: xous_ipc::String::, // pending https://github.com/rust-lang/rust/issues/90195 - pub dict: xous_ipc::String::, // pending https://github.com/rust-lang/rust/issues/90195 - pub key: xous_ipc::String::, // pending https://github.com/rust-lang/rust/issues/90195 + pub basis: xous_ipc::String::, + pub dict: xous_ipc::String::, + pub key: xous_ipc::String::, pub index: u32, pub token: [u32; 4], pub code: PddbRequestCode, @@ -187,9 +187,9 @@ pub struct PddbDictRequest { #[derive(rkyv::Archive, rkyv::Serialize, rkyv::Deserialize)] pub struct PddbKeyRequest { pub basis_specified: bool, - pub basis: xous_ipc::String::, // pending https://github.com/rust-lang/rust/issues/90195 - pub dict: xous_ipc::String::, // pending https://github.com/rust-lang/rust/issues/90195 - pub key: xous_ipc::String::, // pending https://github.com/rust-lang/rust/issues/90195 + pub basis: xous_ipc::String::, + pub dict: xous_ipc::String::, + pub key: xous_ipc::String::, pub token: Option, pub create_dict: bool, pub create_key: bool, @@ -272,8 +272,8 @@ pub struct PddbKeyAttrIpc { pub len: u64, pub reserved: u64, pub age: u64, - pub dict: xous_ipc::String::, // pending https://github.com/rust-lang/rust/issues/90195 - pub basis: xous_ipc::String::, // pending https://github.com/rust-lang/rust/issues/90195 + pub dict: xous_ipc::String::, + pub basis: xous_ipc::String::, pub flags: u32, pub index: u32, pub token: ApiToken,