From 87c7335afc95dd98132030b77d031a96d29d5747 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Tue, 18 Aug 2020 17:01:28 +0800 Subject: [PATCH] xous: don't panic when non-Ok is returned by send_message Sometimes the queue is full, in which case something other than Ok is returned. Don't panic when this happens. Signed-off-by: Sean Cross --- xous-rs/src/syscall.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xous-rs/src/syscall.rs b/xous-rs/src/syscall.rs index 3a6f8b1b4..84ae9f89c 100644 --- a/xous-rs/src/syscall.rs +++ b/xous-rs/src/syscall.rs @@ -823,13 +823,13 @@ pub fn receive_message(server: SID) -> core::result::Result core::result::Result<(), Error> { - let result = - rsyscall(SysCall::SendMessage(connection, message)).expect("couldn't send message"); - if let Result::Ok = result { + let result = rsyscall(SysCall::SendMessage(connection, message)); + if let Ok(Result::Ok) = result { Ok(()) - } else if let Result::Error(e) = result { + } else if let Err(e) = result { Err(e) } else { panic!("Unexpected return value: {:?}", result);