Cleanup import statements

Mio once started with the order of std, external crates, than crate
internal imports. At some points this order was not enforce properly and
we ended up with a mix imports statements.

This commit orders everything following imports from std, external
crates, then crate internal (the `group_imports="StdExternalCrate"`
rustfmt option).

This has no functional change.

examples/tcp_listenfd_server.rs

@@ -4,13 +4,14 @@
 // cargo +nightly build --target wasm32-wasi  --example tcp_listenfd_server --features="os-poll net"
 // wasmtime run --tcplisten 127.0.0.1:9000 --env 'LISTEN_FDS=1' target/wasm32-wasi/debug/examples/tcp_listenfd_server.wasm
 
-use mio::event::Event;
-use mio::net::{TcpListener, TcpStream};
-use mio::{Events, Interest, Poll, Registry, Token};
 use std::collections::HashMap;
 use std::io::{self, Read, Write};
 use std::str::from_utf8;
 
+use mio::event::Event;
+use mio::net::{TcpListener, TcpStream};
+use mio::{Events, Interest, Poll, Registry, Token};
+
 // Setup some tokens to allow us to identify which event is for which socket.
 const SERVER: Token = Token(0);
 

examples/tcp_server.rs

@@ -1,12 +1,13 @@
 // You can run this example from the root of the mio repo:
 // cargo run --example tcp_server --features="os-poll net"
-use mio::event::Event;
-use mio::net::{TcpListener, TcpStream};
-use mio::{Events, Interest, Poll, Registry, Token};
 use std::collections::HashMap;
 use std::io::{self, Read, Write};
 use std::str::from_utf8;
 
+use mio::event::Event;
+use mio::net::{TcpListener, TcpStream};
+use mio::{Events, Interest, Poll, Registry, Token};
+
 // Setup some tokens to allow us to identify which event is for which socket.
 const SERVER: Token = Token(0);
 

examples/udp_server.rs

@@ -1,8 +1,9 @@
 // You can run this example from the root of the mio repo:
 // cargo run --example udp_server --features="os-poll net"
+use std::io;
+
 use log::warn;
 use mio::{Events, Interest, Poll, Token};
-use std::io;
 
 // A token to allow us to identify which event is for the `UdpSocket`.
 const UDP_SOCKET: Token = Token(0);

src/event/event.rs

@@ -1,7 +1,7 @@
-use crate::{sys, Token};
-
 use std::fmt;
 
+use crate::{sys, Token};
+
 /// A readiness event.
 ///
 /// `Event` is a readiness state paired with a [`Token`]. It is returned by

src/event/events.rs

@@ -1,8 +1,8 @@
+use std::fmt;
+
 use crate::event::Event;
 use crate::sys;
 
-use std::fmt;
-
 /// A collection of readiness events.
 ///
 /// `Events` is passed as an argument to [`Poll::poll`] and will be used to

src/event/mod.rs

@@ -5,6 +5,6 @@ mod event;
 mod events;
 mod source;
 
-pub use self::event::Event;
-pub use self::events::{Events, Iter};
-pub use self::source::Source;
+pub use event::Event;
+pub use events::{Events, Iter};
+pub use source::Source;

src/event/source.rs

@@ -1,7 +1,7 @@
-use crate::{Interest, Registry, Token};
-
 use std::io;
 
+use crate::{Interest, Registry, Token};
+
 /// An event source that may be registered with [`Registry`].
 ///
 /// Types that implement `event::Source` can be registered with

src/net/mod.rs

@@ -26,14 +26,14 @@
 //! give is to always call receive with a large enough buffer.
 
 mod tcp;
-pub use self::tcp::{TcpListener, TcpStream};
+pub use tcp::{TcpListener, TcpStream};
 
 #[cfg(not(target_os = "wasi"))]
 mod udp;
 #[cfg(not(target_os = "wasi"))]
-pub use self::udp::UdpSocket;
+pub use udp::UdpSocket;
 
 #[cfg(unix)]
 mod uds;
 #[cfg(unix)]
-pub use self::uds::{SocketAddr, UnixDatagram, UnixListener, UnixStream};
+pub use uds::{SocketAddr, UnixDatagram, UnixListener, UnixStream};

src/net/tcp/mod.rs

@@ -1,5 +1,5 @@
 mod listener;
-pub use self::listener::TcpListener;
+pub use listener::TcpListener;
 
 mod stream;
-pub use self::stream::TcpStream;
+pub use stream::TcpStream;

src/net/uds/mod.rs

@@ -1,10 +1,9 @@
 mod datagram;
-pub use self::datagram::UnixDatagram;
+pub use datagram::UnixDatagram;
 
 mod listener;
-pub use self::listener::UnixListener;
+pub use listener::UnixListener;
 
 mod stream;
-pub use self::stream::UnixStream;
-
 pub use crate::sys::SocketAddr;
+pub use stream::UnixStream;

src/sys/mod.rs

@@ -55,34 +55,34 @@ cfg_os_poll! {
 cfg_os_poll! {
     mod unix;
     #[allow(unused_imports)]
-    pub use self::unix::*;
+    pub use unix::*;
 }
 
 #[cfg(windows)]
 cfg_os_poll! {
     mod windows;
-    pub use self::windows::*;
+    pub use windows::*;
 }
 
 #[cfg(target_os = "wasi")]
 cfg_os_poll! {
     mod wasi;
-    pub(crate) use self::wasi::*;
+    pub(crate) use wasi::*;
 }
 
 cfg_not_os_poll! {
     mod shell;
-    pub(crate) use self::shell::*;
+    pub(crate) use shell::*;
 
     #[cfg(unix)]
     cfg_any_os_ext! {
         mod unix;
         #[cfg(feature = "os-ext")]
-        pub use self::unix::SourceFd;
+        pub use unix::SourceFd;
     }
 
     #[cfg(unix)]
     cfg_net! {
-        pub use self::unix::SocketAddr;
+        pub use unix::SocketAddr;
     }
 }

src/sys/shell/mod.rs

@@ -5,12 +5,12 @@ macro_rules! os_required {
 }
 
 mod selector;
-pub(crate) use self::selector::{event, Event, Events, Selector};
+pub(crate) use selector::{event, Event, Events, Selector};
 
 #[cfg(not(target_os = "wasi"))]
 mod waker;
 #[cfg(not(target_os = "wasi"))]
-pub(crate) use self::waker::Waker;
+pub(crate) use waker::Waker;
 
 cfg_net! {
     pub(crate) mod tcp;

src/sys/shell/selector.rs

@@ -76,9 +76,10 @@ impl AsRawFd for Selector {
 
 #[allow(clippy::trivially_copy_pass_by_ref)]
 pub mod event {
+    use std::fmt;
+
     use crate::sys::Event;
     use crate::Token;
-    use std::fmt;
 
     pub fn token(_: &Event) -> Token {
         os_required!();

src/sys/shell/uds.rs

@@ -1,9 +1,10 @@
 pub(crate) mod datagram {
-    use crate::net::SocketAddr;
     use std::io;
     use std::os::unix::net;
     use std::path::Path;
 
+    use crate::net::SocketAddr;
+
     pub(crate) fn bind(_: &Path) -> io::Result<net::UnixDatagram> {
         os_required!()
     }
@@ -33,11 +34,12 @@ pub(crate) mod datagram {
 }
 
 pub(crate) mod listener {
-    use crate::net::{SocketAddr, UnixStream};
     use std::io;
     use std::os::unix::net;
     use std::path::Path;
 
+    use crate::net::{SocketAddr, UnixStream};
+
     pub(crate) fn bind(_: &Path) -> io::Result<net::UnixListener> {
         os_required!()
     }
@@ -56,11 +58,12 @@ pub(crate) mod listener {
 }
 
 pub(crate) mod stream {
-    use crate::net::SocketAddr;
     use std::io;
     use std::os::unix::net;
     use std::path::Path;
 
+    use crate::net::SocketAddr;
+
     pub(crate) fn connect(_: &Path) -> io::Result<net::UnixStream> {
         os_required!()
     }

src/sys/shell/waker.rs

@@ -1,6 +1,7 @@
+use std::io;
+
 use crate::sys::Selector;
 use crate::Token;
-use std::io;
 
 #[derive(Debug)]
 pub struct Waker {}

src/sys/unix/mod.rs

@@ -16,22 +16,22 @@ macro_rules! syscall {
 
 cfg_os_poll! {
     mod selector;
-    pub(crate) use self::selector::{event, Event, Events, Selector};
+    pub(crate) use selector::{event, Event, Events, Selector};
 
     mod sourcefd;
     #[cfg(feature = "os-ext")]
-    pub use self::sourcefd::SourceFd;
+    pub use sourcefd::SourceFd;
 
     mod waker;
-    pub(crate) use self::waker::Waker;
+    pub(crate) use waker::Waker;
 
     cfg_net! {
         mod net;
 
         pub(crate) mod tcp;
         pub(crate) mod udp;
         pub(crate) mod uds;
-        pub use self::uds::SocketAddr;
+        pub use uds::SocketAddr;
     }
 
     cfg_io_source! {
@@ -40,6 +40,7 @@ cfg_os_poll! {
         mod stateless_io_source {
             use std::io;
             use std::os::fd::RawFd;
+
             use crate::Registry;
             use crate::Token;
             use crate::Interest;
@@ -90,10 +91,10 @@ cfg_os_poll! {
         }
 
         #[cfg(not(any(mio_unsupported_force_poll_poll, target_os = "solaris",target_os = "vita")))]
-        pub(crate) use self::stateless_io_source::IoSourceState;
+        pub(crate) use stateless_io_source::IoSourceState;
 
         #[cfg(any(mio_unsupported_force_poll_poll, target_os = "solaris", target_os = "vita"))]
-        pub(crate) use self::selector::IoSourceState;
+        pub(crate) use selector::IoSourceState;
     }
 
     #[cfg(any(
@@ -116,12 +117,12 @@ cfg_os_poll! {
 cfg_not_os_poll! {
     cfg_net! {
         mod uds;
-        pub use self::uds::SocketAddr;
+        pub use uds::SocketAddr;
     }
 
     cfg_any_os_ext! {
         mod sourcefd;
         #[cfg(feature = "os-ext")]
-        pub use self::sourcefd::SourceFd;
+        pub use sourcefd::SourceFd;
     }
 }

src/sys/unix/selector/kqueue.rs

@@ -1,4 +1,3 @@
-use crate::{Interest, Token};
 use std::mem::{self, MaybeUninit};
 use std::ops::{Deref, DerefMut};
 use std::os::fd::{AsRawFd, FromRawFd, OwnedFd, RawFd};
@@ -7,6 +6,8 @@ use std::sync::atomic::{AtomicUsize, Ordering};
 use std::time::Duration;
 use std::{cmp, io, ptr, slice};
 
+use crate::{Interest, Token};
+
 /// Unique id for use as `SelectorId`.
 #[cfg(debug_assertions)]
 static NEXT_ID: AtomicUsize = AtomicUsize::new(1);
@@ -353,11 +354,10 @@ unsafe impl Sync for Events {}
 pub mod event {
     use std::fmt;
 
+    use super::{Filter, Flags};
     use crate::sys::Event;
     use crate::Token;
 
-    use super::{Filter, Flags};
-
     pub fn token(event: &Event) -> Token {
         Token(event.udata as usize)
     }

src/sys/unix/selector/mod.rs

@@ -18,7 +18,7 @@ mod epoll;
         target_os = "redox",
     )
 ))]
-pub(crate) use self::epoll::{event, Event, Events, Selector};
+pub(crate) use epoll::{event, Event, Events, Selector};
 
 #[cfg(any(
     mio_unsupported_force_poll_poll,
@@ -32,11 +32,11 @@ mod poll;
     target_os = "solaris",
     target_os = "vita"
 ))]
-pub(crate) use self::poll::{event, Event, Events, Selector};
+pub(crate) use poll::{event, Event, Events, Selector};
 
 cfg_io_source! {
     #[cfg(any(mio_unsupported_force_poll_poll, target_os = "solaris", target_os = "vita"))]
-    pub(crate) use self::poll::IoSourceState;
+    pub(crate) use poll::IoSourceState;
 }
 
 #[cfg(all(
@@ -67,4 +67,4 @@ mod kqueue;
         target_os = "watchos",
     ),
 ))]
-pub(crate) use self::kqueue::{event, Event, Events, Selector};
+pub(crate) use kqueue::{event, Event, Events, Selector};

src/sys/unix/selector/poll.rs

@@ -3,17 +3,17 @@
 // Permission to use this code has been granted by original author:
 // https://github.com/tokio-rs/mio/pull/1602#issuecomment-1218441031
 
-use crate::sys::unix::waker::WakerInternal;
-use crate::{Interest, Token};
 use std::collections::HashMap;
 use std::fmt::{Debug, Formatter};
 use std::os::fd::{AsRawFd, RawFd};
-use std::sync::atomic::AtomicBool;
-use std::sync::atomic::{AtomicUsize, Ordering};
+use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
 use std::sync::{Arc, Condvar, Mutex};
 use std::time::Duration;
 use std::{cmp, fmt, io};
 
+use crate::sys::unix::waker::WakerInternal;
+use crate::{Interest, Token};
+
 /// Unique id for use as `SelectorId`.
 #[cfg(debug_assertions)]
 static NEXT_ID: AtomicUsize = AtomicUsize::new(1);
@@ -540,10 +540,11 @@ pub struct Event {
 pub type Events = Vec<Event>;
 
 pub mod event {
+    use std::fmt;
+
     use crate::sys::unix::selector::poll::POLLRDHUP;
     use crate::sys::Event;
     use crate::Token;
-    use std::fmt;
 
     pub fn token(event: &Event) -> Token {
         event.token