From 8504b6fc6b3edf6413ce8e0be1d7aa7a841e886c Mon Sep 17 00:00:00 2001 From: yvt Date: Fri, 28 Apr 2023 01:23:49 +0900 Subject: [PATCH] fix(graphics-server): convert "never" types Fixes build failure due to a type mismatch between `Never` and `!` in `claim_main_thread`. --- services/graphics-server/src/backend/betrusted.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/graphics-server/src/backend/betrusted.rs b/services/graphics-server/src/backend/betrusted.rs index 67fe6078b..71bf79b11 100644 --- a/services/graphics-server/src/backend/betrusted.rs +++ b/services/graphics-server/src/backend/betrusted.rs @@ -17,7 +17,8 @@ pub enum Never {} #[inline] pub fn claim_main_thread(f: impl FnOnce(MainThreadToken) -> Never + Send + 'static) -> ! { // Just call the closure - this backend will work on any thread - f(MainThreadToken(())) + #[allow(unreachable_code)] // false positive + match f(MainThreadToken(())) {} } pub struct XousDisplay {