Skip to content

Commit 29f68ed

Browse files
committed
Auto merge of #3961 - RalfJung:event-release-clock-join, r=RalfJung
epoll event adding: no need to join, there's no old clock here
2 parents 6fee850 + 5177354 commit 29f68ed

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/shims/unix/linux/epoll.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@ fn check_and_update_one_event_interest<'tcx>(
626626
let mut event_instance = EpollEventInstance::new(flags, epoll_event_interest.data);
627627
// If we are tracking data races, remember the current clock so we can sync with it later.
628628
ecx.release_clock(|clock| {
629-
event_instance.clock.join(clock);
629+
event_instance.clock.clone_from(clock);
630630
});
631631
// Triggers the notification by inserting it to the ready list.
632632
ready_list.insert(epoll_key, event_instance);

0 commit comments

Comments
 (0)