From e15b5ab42cbac6a372845d718283b82c62addc4a Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Wed, 9 Aug 2023 10:05:48 -0700 Subject: [PATCH] fix error set for libxev cross-platform --- src/renderer/Thread.zig | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/renderer/Thread.zig b/src/renderer/Thread.zig index 866cdf34c..e198a8c19 100644 --- a/src/renderer/Thread.zig +++ b/src/renderer/Thread.zig @@ -369,12 +369,19 @@ fn cursorCancelCallback( _: *xev.Completion, r: xev.Timer.CancelError!void, ) xev.CallbackAction { - _ = r catch |err| switch (err) { + // This makes it easier to work across platforms where different platforms + // support different sets of errors, so we just unify it. + const CancelError = xev.Timer.CancelError || error{ + Canceled, + Unexpected, + }; + + _ = r catch |err| switch (@as(CancelError, @errSetCast(err))) { error.Canceled => {}, - // else => { - // log.warn("error in cursor cancel callback err={}", .{err}); - // unreachable; - // }, + else => { + log.warn("error in cursor cancel callback err={}", .{err}); + unreachable; + }, }; return .disarm;