Skip to content

Commit 80896b3

Browse files
DarksonnThomasdezeeuw
authored andcommitted
fix hermit
reregister is used by sourcefd, which is always available under os-ext, so selectors should always provide reregister when os-ext is enabled even if cfg(unix) fails
1 parent ffcb8e6 commit 80896b3

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/sys/unix/selector/epoll.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ impl Selector {
8282
syscall!(epoll_ctl(ep, libc::EPOLL_CTL_ADD, fd, &mut event)).map(|_| ())
8383
}
8484

85-
cfg_io_source! {
85+
cfg_any_os_ext! {
8686
pub fn reregister(&self, fd: RawFd, token: Token, interests: Interest) -> io::Result<()> {
8787
let mut event = libc::epoll_event {
8888
events: interests_to_epoll(interests),

src/sys/unix/selector/kqueue.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ impl Selector {
165165
kevent_register(self.kq.as_raw_fd(), changes, &[libc::EPIPE as i64])
166166
}
167167

168-
cfg_io_source! {
168+
cfg_any_os_ext! {
169169
pub fn reregister(&self, fd: RawFd, token: Token, interests: Interest) -> io::Result<()> {
170170
let flags = libc::EV_CLEAR | libc::EV_RECEIPT;
171171
let write_flags = if interests.is_writable() {

src/sys/unix/selector/poll.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ impl Selector {
6161
self.state.register_internal(fd, token, interests)
6262
}
6363

64-
cfg_io_source! {
64+
cfg_any_os_ext! {
6565
pub fn reregister(&self, fd: RawFd, token: Token, interests: Interest) -> io::Result<()> {
6666
self.state.reregister(fd, token, interests)
6767
}
@@ -356,7 +356,7 @@ impl SelectorState {
356356
})
357357
}
358358

359-
cfg_io_source! {
359+
cfg_any_os_ext! {
360360
pub fn reregister(&self, fd: RawFd, token: Token, interests: Interest) -> io::Result<()> {
361361
self.modify_fds(|fds| {
362362
let data = fds.fd_data.get_mut(&fd).ok_or(io::ErrorKind::NotFound)?;

0 commit comments

Comments
 (0)