Skip to content

Commit 60a86ea

Browse files
jastaThomasdezeeuw
authored andcommitted
poll: Fix MSRV by not using std::os::fd
1 parent fc4be69 commit 60a86ea

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

src/sys/unix/selector/poll.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ use crate::sys::unix::waker::WakerInternal;
88
use crate::{Interest, Token};
99
use std::collections::HashMap;
1010
use std::fmt::{Debug, Formatter};
11-
use std::os::fd::AsRawFd;
12-
use std::os::unix::io::RawFd;
11+
use std::os::unix::io::{AsRawFd, RawFd};
1312
use std::sync::atomic::AtomicBool;
1413
use std::sync::atomic::{AtomicUsize, Ordering};
1514
use std::sync::{Arc, Condvar, Mutex};

src/sys/unix/waker.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ mod fdbased {
2929
use crate::sys::Selector;
3030
use crate::{Interest, Token};
3131
use std::io;
32-
use std::os::fd::AsRawFd;
32+
use std::os::unix::io::AsRawFd;
3333

3434
#[derive(Debug)]
3535
pub struct Waker {
@@ -71,8 +71,7 @@ pub use self::fdbased::Waker;
7171
mod eventfd {
7272
use std::fs::File;
7373
use std::io::{self, Read, Write};
74-
use std::os::fd::{AsRawFd, RawFd};
75-
use std::os::unix::io::FromRawFd;
74+
use std::os::unix::io::{AsRawFd, FromRawFd, RawFd};
7675

7776
/// Waker backed by `eventfd`.
7877
///
@@ -202,8 +201,7 @@ pub use self::kqueue::Waker;
202201
mod pipe {
203202
use std::fs::File;
204203
use std::io::{self, Read, Write};
205-
use std::os::fd::{AsRawFd, RawFd};
206-
use std::os::unix::io::FromRawFd;
204+
use std::os::unix::io::{AsRawFd, FromRawFd, RawFd};
207205

208206
/// Waker backed by a unix pipe.
209207
///

0 commit comments

Comments
 (0)