Skip to content

Commit

Permalink
update mio crate to 1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jkarneges committed Jun 18, 2024
1 parent 87075c9 commit 55c061d
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 11 deletions.
15 changes: 8 additions & 7 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jsonwebtoken = "8"
libc = "0.2"
log = "0.4"
miniz_oxide = "0.6"
mio = { version = "0.8", features = ["os-poll", "os-ext", "net"] }
mio = { version = "1", features = ["os-poll", "os-ext", "net"] }
openssl = "0.10"
paste = "1.0"
rustls = "0.21"
Expand Down
2 changes: 1 addition & 1 deletion src/core/net.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ pub fn set_socket_opts(stream: &mut TcpStream) {
#[derive(Debug)]
pub enum SocketAddr {
Ip(std::net::SocketAddr),
Unix(mio::net::SocketAddr),
Unix(std::os::unix::net::SocketAddr),
}

impl fmt::Display for SocketAddr {
Expand Down
4 changes: 2 additions & 2 deletions src/future.rs
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,7 @@ impl AsyncUnixListener {
Ok(Self::new(listener))
}

pub fn local_addr(&self) -> Result<mio::net::SocketAddr, io::Error> {
pub fn local_addr(&self) -> Result<std::os::unix::net::SocketAddr, io::Error> {
self.evented.io().local_addr()
}

Expand Down Expand Up @@ -1623,7 +1623,7 @@ pub struct UnixAcceptFuture<'a> {
}

impl Future for UnixAcceptFuture<'_> {
type Output = Result<(UnixStream, mio::net::SocketAddr), io::Error>;
type Output = Result<(UnixStream, std::os::unix::net::SocketAddr), io::Error>;

fn poll(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<Self::Output> {
let f = &mut *self;
Expand Down

0 comments on commit 55c061d

Please sign in to comment.