From 0fbca1cd4d0d227b79083e8cb0d3b505b454b4b2 Mon Sep 17 00:00:00 2001 From: bunnie Date: Sun, 22 Sep 2024 14:24:59 +0800 Subject: [PATCH] cleanup a typecast ambiguity due to new API Rust can't tell how to cast some u32_le into u32/usize automatically due to confusion with the num_derive trait, so we have to explicitly specify a chain of typecasts to clean up the conflict with the new rkyv --- services/keyboard/src/main.rs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/services/keyboard/src/main.rs b/services/keyboard/src/main.rs index c777bd487..9cfc00a26 100644 --- a/services/keyboard/src/main.rs +++ b/services/keyboard/src/main.rs @@ -845,7 +845,9 @@ fn main() -> ! { match xns.request_connection_blocking(kr.server_name.as_str()) { Ok(cid) => { listener_conn = Some(cid); - listener_op = Some(kr.listener_op_id as usize); + listener_op = Some(>::from(>::from( + kr.listener_op_id.into(), + ) as usize)); } Err(e) => { log::error!("couldn't connect to listener: {:?}", e); @@ -860,7 +862,7 @@ fn main() -> ! { match xns.request_connection_blocking(kr.server_name.as_str()) { Ok(cid) => { raw_listener_conn = Some(cid); - raw_listener_op = Some(kr.listener_op_id as u32); + raw_listener_op = Some(>::from(kr.listener_op_id.into())); } Err(e) => { log::error!("couldn't connect to listener: {:?}", e); @@ -876,7 +878,10 @@ fn main() -> ! { match xns.request_connection_blocking(kr.server_name.as_str()) { Ok(cid) => { observer_conn = Some(cid); - observer_op = Some(kr.listener_op_id as usize); + observer_op = Some(>::from(>::from( + kr.listener_op_id.into(), + ) + as usize)); } Err(e) => { log::error!("couldn't connect to observer: {:?}", e);