From 37328f8b80273b5bd4b4522f5f1d027109ef54a0 Mon Sep 17 00:00:00 2001 From: tiif Date: Sun, 13 Oct 2024 23:51:31 +0800 Subject: [PATCH] Fix rebase error --- src/shims/unix/linux/eventfd.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shims/unix/linux/eventfd.rs b/src/shims/unix/linux/eventfd.rs index 94d60e8777..805ef70453 100644 --- a/src/shims/unix/linux/eventfd.rs +++ b/src/shims/unix/linux/eventfd.rs @@ -299,9 +299,9 @@ fn blocking_eventfd_write_callback<'tcx>( let eventfd = eventfd_ref.downcast::().unwrap(); // Future `read` calls will synchronize with this write, so update the FD clock. - if let Some(clock) = &ecx.release_clock() { + ecx.release_clock(|clock| { eventfd.clock.borrow_mut().join(clock); - } + }); // In the happy case, the new_count is checked before executing this callback. // In the case where the counter previously overflows or has the value u64::MAX,