Merge some related import blocks

Smithay · Apr 25, 2024 · adafde1 · adafde1
1 parent 3fb6622
commit adafde1
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 27 deletions.
diff --git a/wayland-backend/src/client_api.rs b/wayland-backend/src/client_api.rs
@@ -1,8 +1,10 @@
 use std::{
     any::Any,
     fmt,
-    os::unix::io::{BorrowedFd, OwnedFd},
-    os::unix::{io::RawFd, net::UnixStream},
+    os::unix::{
+        io::{BorrowedFd, OwnedFd, RawFd},
+        net::UnixStream,
+    },
     sync::Arc,
 };
 

diff --git a/wayland-backend/src/debug.rs b/wayland-backend/src/debug.rs
@@ -2,7 +2,7 @@
 
 use std::{
     fmt::Display,
-    os::unix::prelude::AsRawFd,
+    os::unix::io::AsRawFd,
     time::{SystemTime, UNIX_EPOCH},
 };
 

diff --git a/wayland-backend/src/protocol.rs b/wayland-backend/src/protocol.rs
@@ -1,6 +1,6 @@
 //! Types and utilities for manipulating the Wayland protocol
 
-use std::{ffi::CString, os::unix::prelude::AsRawFd};
+use std::{ffi::CString, os::unix::io::AsRawFd};
 
 pub use wayland_sys::common::{wl_argument, wl_interface, wl_message};
 

diff --git a/wayland-backend/src/rs/client_impl/mod.rs b/wayland-backend/src/rs/client_impl/mod.rs
@@ -2,9 +2,8 @@
 
 use std::{
     fmt,
-    os::unix::io::{BorrowedFd, OwnedFd},
     os::unix::{
-        io::{AsRawFd, RawFd},
+        io::{AsRawFd, BorrowedFd, OwnedFd, RawFd},
         net::UnixStream,
     },
     sync::{Arc, Condvar, Mutex, MutexGuard, Weak},

diff --git a/wayland-backend/src/rs/server_impl/client.rs b/wayland-backend/src/rs/server_impl/client.rs
@@ -1,7 +1,9 @@
 use std::{
     ffi::CString,
-    os::unix::io::{AsFd, BorrowedFd, OwnedFd},
-    os::unix::{io::RawFd, net::UnixStream},
+    os::unix::{
+        io::{AsFd, BorrowedFd, OwnedFd, RawFd},
+        net::UnixStream,
+    },
     sync::Arc,
 };
 

diff --git a/wayland-backend/src/rs/server_impl/common_poll.rs b/wayland-backend/src/rs/server_impl/common_poll.rs
@@ -1,6 +1,5 @@
 use std::{
-    os::unix::io::AsRawFd,
-    os::unix::io::{BorrowedFd, OwnedFd},
+    os::unix::io::{AsRawFd, BorrowedFd, OwnedFd},
     sync::{Arc, Mutex},
 };
 

diff --git a/wayland-backend/src/rs/server_impl/handle.rs b/wayland-backend/src/rs/server_impl/handle.rs
@@ -1,7 +1,9 @@
 use std::{
     ffi::CString,
-    os::unix::io::OwnedFd,
-    os::unix::{io::RawFd, net::UnixStream},
+    os::unix::{
+        io::{OwnedFd, RawFd},
+        net::UnixStream,
+    },
     sync::{Arc, Mutex, Weak},
 };
 

diff --git a/wayland-backend/src/rs/socket.rs b/wayland-backend/src/rs/socket.rs
@@ -333,8 +333,7 @@ mod tests {
     use crate::protocol::{AllowNull, Argument, ArgumentType, Message};
 
     use std::ffi::CString;
-    use std::os::unix::io::BorrowedFd;
-    use std::os::unix::prelude::IntoRawFd;
+    use std::os::unix::io::IntoRawFd;
 
     use smallvec::smallvec;
 

diff --git a/wayland-backend/src/rs/wire.rs b/wayland-backend/src/rs/wire.rs
@@ -2,8 +2,7 @@
 
 use std::collections::VecDeque;
 use std::ffi::CStr;
-use std::os::unix::io::RawFd;
-use std::os::unix::io::{BorrowedFd, OwnedFd};
+use std::os::unix::io::{BorrowedFd, OwnedFd, RawFd};
 
 use crate::protocol::{Argument, ArgumentType, Message};
 

diff --git a/wayland-backend/src/server_api.rs b/wayland-backend/src/server_api.rs
@@ -1,8 +1,10 @@
 use std::{
     ffi::CString,
     fmt,
-    os::unix::io::{BorrowedFd, OwnedFd},
-    os::unix::{io::RawFd, net::UnixStream},
+    os::unix::{
+        io::{BorrowedFd, OwnedFd, RawFd},
+        net::UnixStream,
+    },
     sync::Arc,
 };
 

diff --git a/wayland-backend/src/sys/client_impl/mod.rs b/wayland-backend/src/sys/client_impl/mod.rs
@@ -4,9 +4,8 @@ use std::{
     collections::HashSet,
     ffi::CStr,
     os::raw::{c_int, c_void},
-    os::unix::io::{BorrowedFd, OwnedFd},
     os::unix::{
-        io::{FromRawFd, IntoRawFd, RawFd},
+        io::{BorrowedFd, FromRawFd, IntoRawFd, OwnedFd, RawFd},
         net::UnixStream,
     },
     sync::{

diff --git a/wayland-backend/src/sys/server_impl/mod.rs b/wayland-backend/src/sys/server_impl/mod.rs
@@ -3,9 +3,8 @@
 use std::{
     ffi::{CStr, CString},
     os::raw::{c_int, c_void},
-    os::unix::io::{BorrowedFd, OwnedFd},
     os::unix::{
-        io::{FromRawFd, IntoRawFd, RawFd},
+        io::{BorrowedFd, FromRawFd, IntoRawFd, OwnedFd, RawFd},
         net::UnixStream,
     },
     sync::{

diff --git a/wayland-client/examples/simple_window.rs b/wayland-client/examples/simple_window.rs
@@ -1,4 +1,4 @@
-use std::{fs::File, os::unix::prelude::AsFd};
+use std::{fs::File, os::unix::io::AsFd};
 
 use wayland_client::{
     delegate_noop,

diff --git a/wayland-server/src/socket.rs b/wayland-server/src/socket.rs
@@ -5,10 +5,7 @@ use std::{
     io,
     os::unix::{
         fs::OpenOptionsExt,
-        io::{AsFd, BorrowedFd},
-    },
-    os::unix::{
-        io::{AsRawFd, RawFd},
+        io::{AsFd, AsRawFd, BorrowedFd, RawFd},
         net::{UnixListener, UnixStream},
         prelude::MetadataExt,
     },