From af35f6e118b37d85349ab04626af198cd183f723 Mon Sep 17 00:00:00 2001 From: bunnie Date: Sun, 22 Sep 2024 15:13:46 +0800 Subject: [PATCH] more cleanup of copy trait --- services/ime-frontend/src/main.rs | 7 ++----- services/modals/src/api.rs | 16 ++++++++-------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/services/ime-frontend/src/main.rs b/services/ime-frontend/src/main.rs index f8f5abbd1..3ccd17394 100644 --- a/services/ime-frontend/src/main.rs +++ b/services/ime-frontend/src/main.rs @@ -708,7 +708,7 @@ impl InputTracker { .get_prediction(i as u32, api_token) .expect("couldn't query prediction engine") { - Some(String::from(prediction.as_str().unwrap_or("UTF-8 Error"))) + Some(String::from(prediction.as_str())) } else { None }; @@ -874,10 +874,7 @@ fn main() -> ! { token.expect("didn't get the disconnect token!"), )); } - _ => error!( - "can't find predictive engine {}, retaining existing one.", - s.as_str() - ), + _ => error!("can't find predictive engine {}, retaining existing one.", s.as_str()), } } log::debug!("predictor: {:?}, api_token: {:?}", tracker.get_predictor(), api_token); diff --git a/services/modals/src/api.rs b/services/modals/src/api.rs index 645bc272b..47c20f1a4 100644 --- a/services/modals/src/api.rs +++ b/services/modals/src/api.rs @@ -4,7 +4,7 @@ use gam::Tile; pub(crate) const SERVER_NAME_MODALS: &str = "_Modal Dialog Server_"; -#[derive(Debug, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Copy, Clone)] +#[derive(Debug, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Clone)] pub struct Validation { pub text: TextEntryPayload, pub opcode: u32, @@ -15,18 +15,18 @@ pub(crate) enum ValidationOp { Quit, } -#[derive(Debug, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Copy, Clone)] +#[derive(Debug, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Clone)] pub struct ManagedPromptWithFixedResponse { pub token: [u32; 4], pub prompt: String, } -#[derive(Debug, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Copy, Clone)] +#[derive(Debug, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Clone)] pub struct ManagedListItem { pub token: [u32; 4], pub item: ItemName, } -#[derive(Debug, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Copy, Clone)] +#[derive(Debug, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Clone)] pub struct ManagedPromptWithTextResponse { pub token: [u32; 4], pub prompt: String, @@ -36,7 +36,7 @@ pub struct ManagedPromptWithTextResponse { pub growable: bool, } -#[derive(Debug, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Copy, Clone)] +#[derive(Debug, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Clone)] pub struct ManagedNotification { pub token: [u32; 4], pub message: String, @@ -44,7 +44,7 @@ pub struct ManagedNotification { pub qrtext: Option, } -#[derive(Debug, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Copy, Clone)] +#[derive(Debug, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Clone)] pub struct ManagedBip39 { pub token: [u32; 4], pub bip39_data: [u8; 32], @@ -59,7 +59,7 @@ pub struct ManagedImage { pub tiles: [Option; 6], } -#[derive(Debug, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Copy, Clone)] +#[derive(Debug, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Clone)] pub struct ManagedProgress { pub token: [u32; 4], pub title: String, @@ -80,7 +80,7 @@ pub struct ManagedProgress { /// This isn't a terribly useful notification -- it's basically read-only, no interactivity, /// but you can animate the text. Mainly used for testing routines. Might be modifiable /// into something more useful with a bit of thought, but for now, MVP. -#[derive(Debug, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Copy, Clone)] +#[derive(Debug, rkyv::Archive, rkyv::Serialize, rkyv::Deserialize, Clone)] pub struct DynamicNotification { pub token: [u32; 4], pub title: Option,