x.py fmt cleanup

Author: NathanRoyer

library/std/src/os/custom/mod.rs

@@ -7,7 +7,7 @@
 //!
 //! This is primarily geared toward experimental platforms such
 //! as new kernels and bare-bones environments, where you might
-//! want to use the standard library without recompiling 
+//! want to use the standard library without recompiling
 //! everything or adding support upstream.
 //!
 //! # Initial state
@@ -77,7 +77,7 @@ macro_rules! static_rwlock_box_impl {
             let new_impl = transition(maybe_impl);
             *writer = Some(new_impl);
         }
-    }
+    };
 }
 
 /// Platform-specific allocator
@@ -93,14 +93,14 @@ pub mod alloc {
 
 /// Platform-specific interface to a filesystem
 pub mod fs {
-    use crate::sync::RwLock;
-    use crate::path::{Path, PathBuf};
     use crate::io;
+    use crate::path::{Path, PathBuf};
+    use crate::sync::RwLock;
 
     #[doc(inline)]
     pub use crate::sys::fs::{
-        File, FileAttr, ReadDir, ReadDirApi, FileApi, DirEntry,
-        FilePermissions, OpenOptions, FileTimes, FileType,
+        DirEntry, File, FileApi, FileAttr, FilePermissions, FileTimes, FileType, OpenOptions,
+        ReadDir, ReadDirApi,
     };
 
     static_rwlock_box_impl!(FilesystemInterface);
@@ -158,38 +158,41 @@ pub mod futex {
 
 /// Platform-specific interface to a network
 pub mod net {
-    use crate::sync::RwLock;
+    use crate::io;
     use crate::net::SocketAddr;
+    use crate::sync::RwLock;
     use crate::time::Duration;
-    use crate::io;
 
     #[doc(inline)]
     pub use crate::sys::net::{
-        TcpStreamApi, TcpListenerApi, UdpSocketApi,
-        TcpStream, TcpListener, UdpSocket, LookupHost,
+        LookupHost, TcpListener, TcpListenerApi, TcpStream, TcpStreamApi, UdpSocket, UdpSocketApi,
     };
 
     static_rwlock_box_impl!(NetworkInterface);
 
     /// Platform-specific interface to a network
     pub trait NetworkInterface: Send + Sync {
-        fn tcp_connect(&self, addr: &SocketAddr, timeout: Option<Duration>) -> io::Result<TcpStream>;
-        fn tcp_bind   (&self, addr: &SocketAddr) -> io::Result<TcpListener>;
-        fn udp_bind   (&self, addr: &SocketAddr) -> io::Result<UdpSocket>;
-        fn lookup_str  (&self, v: &str) -> io::Result<LookupHost>;
+        fn tcp_connect(
+            &self,
+            addr: &SocketAddr,
+            timeout: Option<Duration>,
+        ) -> io::Result<TcpStream>;
+        fn tcp_bind(&self, addr: &SocketAddr) -> io::Result<TcpListener>;
+        fn udp_bind(&self, addr: &SocketAddr) -> io::Result<UdpSocket>;
+        fn lookup_str(&self, v: &str) -> io::Result<LookupHost>;
         fn lookup_tuple(&self, v: (&str, u16)) -> io::Result<LookupHost>;
     }
 }
 
 /// Platform-specific interface to the running operating system
 pub mod os {
     use crate::ffi::{OsStr, OsString};
+    use crate::io;
     use crate::path::{Path, PathBuf};
     use crate::sync::RwLock;
-    use crate::io;
 
     #[doc(inline)]
-    pub use crate::sys::os::{Variable, Env, SplitPaths, JoinPathsError};
+    pub use crate::sys::os::{Env, JoinPathsError, SplitPaths, Variable};
 
     static_rwlock_box_impl!(Os);
 
@@ -220,17 +223,14 @@ pub mod os {
 
 /// Platform-specific management of processes
 pub mod process {
-    use crate::sync::RwLock;
     use crate::io;
+    use crate::sync::RwLock;
 
     #[doc(inline)]
     pub use crate::sys_common::process::{CommandEnv, CommandEnvs};
 
     #[doc(inline)]
-    pub use crate::sys::process::{
-        Command, Process, ProcessApi,
-        ExitStatus, Stdio, StdioPipes,
-    };
+    pub use crate::sys::process::{Command, ExitStatus, Process, ProcessApi, Stdio, StdioPipes};
 
     static_rwlock_box_impl!(ProcessManager);
 
@@ -242,8 +242,8 @@ pub mod process {
 
 /// Platform-specific standard IO interface
 pub mod stdio {
-    use crate::sync::RwLock;
     use crate::io;
+    use crate::sync::RwLock;
 
     static_rwlock_box_impl!(StdioInterface);
 
@@ -261,11 +261,11 @@ pub mod stdio {
 
 /// Platform-specific management of threads
 pub mod thread {
-    use crate::sync::RwLock;
     use crate::ffi::CStr;
+    use crate::io;
     use crate::num::NonZeroUsize;
+    use crate::sync::RwLock;
     use crate::time::Duration;
-    use crate::io;
 
     #[doc(inline)]
     pub use crate::sys::thread::{Thread, ThreadApi};

library/std/src/os/mod.rs

@@ -25,7 +25,7 @@ pub mod raw;
 ))]
 #[unstable(issue = "none", feature = "std_internals")]
 #[path = "fake_unix_windows.rs"]
-pub mod unix;
+pub mod linux;
 #[cfg(all(
     doc,
     any(
@@ -36,7 +36,7 @@ pub mod unix;
 ))]
 #[unstable(issue = "none", feature = "std_internals")]
 #[path = "fake_unix_windows.rs"]
-pub mod linux;
+pub mod unix;
 #[cfg(all(
     doc,
     any(
@@ -111,6 +111,8 @@ pub mod windows;
 // Others.
 #[cfg(target_os = "android")]
 pub mod android;
+#[cfg(target_os = "custom")]
+pub mod custom;
 #[cfg(target_os = "dragonfly")]
 pub mod dragonfly;
 #[cfg(target_os = "emscripten")]

library/std/src/sys/custom/fs.rs

@@ -1,10 +1,10 @@
 #![allow(missing_docs)]
 
-use crate::io::{self, BorrowedCursor, IoSlice, IoSliceMut, SeekFrom};
-use crate::path::{Path, PathBuf};
 use crate::custom_os_impl;
 use crate::ffi::OsString;
 use crate::fmt;
+use crate::io::{self, BorrowedCursor, IoSlice, IoSliceMut, SeekFrom};
+use crate::path::{Path, PathBuf};
 
 use crate::os::custom::time::SystemTime;
 

library/std/src/sys/custom/locks/condvar.rs

@@ -1,6 +1,6 @@
 use super::Mutex;
-use crate::sync::atomic::{AtomicU32, Ordering::Relaxed};
 use super::{futex_wait, futex_wake, futex_wake_all};
+use crate::sync::atomic::{AtomicU32, Ordering::Relaxed};
 use crate::time::Duration;
 
 pub struct Condvar {

library/std/src/sys/custom/locks/mod.rs

@@ -6,7 +6,6 @@
 /// - futex_wake_all
 /// - kernel_hold_interrupts
 /// - kernel_release_interrupts
-
 use core::sync::atomic::AtomicU32;
 use core::time::Duration;
 

library/std/src/sys/custom/locks/mutex.rs

@@ -1,8 +1,8 @@
+use super::{futex_wait, futex_wake};
 use crate::sync::atomic::{
     AtomicU32,
     Ordering::{Acquire, Relaxed, Release},
 };
-use super::{futex_wait, futex_wake};
 
 pub struct Mutex {
     /// 0: unlocked

library/std/src/sys/custom/locks/rwlock.rs

@@ -1,8 +1,8 @@
+use super::{futex_wait, futex_wake, futex_wake_all};
 use crate::sync::atomic::{
     AtomicU32,
     Ordering::{Acquire, Relaxed, Release},
 };
-use super::{futex_wait, futex_wake, futex_wake_all};
 
 pub struct RwLock {
     // The state consists of a 30-bit reader counter, a 'readers waiting' flag, and a 'writers waiting' flag.

library/std/src/sys/custom/mod.rs

@@ -1,7 +1,7 @@
 //! System bindings for custom platforms
 
-use crate::io as std_io;
 use crate::custom_os_impl;
+use crate::io as std_io;
 
 #[path = "../unix/cmath.rs"]
 pub mod cmath;
@@ -30,12 +30,12 @@ pub mod thread_local_key;
 #[deny(unsafe_op_in_unsafe_fn)]
 #[allow(unused)]
 mod common;
-pub use common::{memchr, init, cleanup};
+pub use common::{cleanup, init, memchr};
 
 pub mod alloc;
-pub mod locks;
 pub mod env;
 pub mod fs;
+pub mod locks;
 pub mod net;
 pub mod os;
 pub mod pipe;
@@ -50,7 +50,9 @@ pub fn decode_error_kind(errno: i32) -> std_io::ErrorKind {
 }
 
 pub fn abort_internal() -> ! {
-    fn infinite_loop() -> ! { loop {} }
+    fn infinite_loop() -> ! {
+        loop {}
+    }
 
     let rwlock = &crate::os::custom::os::IMPL;
     let reader = match rwlock.read().ok() {

library/std/src/sys/custom/net.rs

@@ -1,10 +1,10 @@
 #![allow(missing_docs)]
 
+use crate::custom_os_impl;
+use crate::fmt;
 use crate::io::{self, BorrowedCursor, IoSlice, IoSliceMut};
 use crate::net::{Ipv4Addr, Ipv6Addr, Shutdown, SocketAddr};
-use crate::custom_os_impl;
 use crate::time::Duration;
-use crate::fmt;
 
 /// Inner content of [`crate::net::TcpStream`]
 pub struct TcpStream(pub Box<dyn TcpStreamApi>);
@@ -145,11 +145,7 @@ pub struct LookupHost {
 
 impl LookupHost {
     pub fn new(addresses: Vec<SocketAddr>, port: u16) -> Self {
-        Self {
-            addresses,
-            port,
-            i: 0,
-        }
+        Self { addresses, port, i: 0 }
     }
 
     pub(crate) fn port(&self) -> u16 {

library/std/src/sys/custom/os.rs

@@ -1,13 +1,13 @@
 #![allow(missing_docs)]
 
-use crate::str::Split;
-use crate::ffi::{OsStr, OsString};
-use crate::path::{self, PathBuf};
 use crate::custom_os_impl;
 use crate::error::Error;
+use crate::ffi::{OsStr, OsString};
 use crate::fmt;
-use crate::vec;
 use crate::io;
+use crate::path::{self, PathBuf};
+use crate::str::Split;
+use crate::vec;
 
 /// Inner content of [`crate::env::SplitPaths`]
 pub struct SplitPaths<'a>(Split<'a, &'static str>);
@@ -109,7 +109,9 @@ impl fmt::Debug for EnvStrDebug<'_> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let Self { slice } = self;
         f.debug_list()
-            .entries(slice.iter().map(|var| (var.name.to_str().unwrap(), var.value.to_str().unwrap())))
+            .entries(
+                slice.iter().map(|var| (var.name.to_str().unwrap(), var.value.to_str().unwrap())),
+            )
             .finish()
     }
 }