From 35012a3b2cbaa0fac356ce00f4ea9e1835ad0ed0 Mon Sep 17 00:00:00 2001 From: Raphael Amorim Date: Fri, 20 Mar 2026 09:44:52 +0100 Subject: [PATCH] format code --- corcovado/src/channel.rs | 2 +- corcovado/src/event_imp.rs | 2 +- corcovado/src/poll.rs | 4 ++-- corcovado/src/sys/fuchsia/awakener.rs | 2 +- corcovado/src/sys/fuchsia/eventedfd.rs | 4 ++-- corcovado/src/sys/fuchsia/handles.rs | 2 +- corcovado/src/sys/fuchsia/mod.rs | 2 +- corcovado/src/sys/fuchsia/net.rs | 4 ++-- corcovado/src/sys/fuchsia/selector.rs | 12 ++++++------ corcovado/src/sys/unix/awakener.rs | 2 +- corcovado/src/sys/unix/eventedfd.rs | 2 +- corcovado/src/sys/unix/kqueue.rs | 2 +- corcovado/src/sys/windows/awakener.rs | 4 ++-- corcovado/src/sys/windows/tcp.rs | 2 +- corcovado/src/sys/windows/udp.rs | 2 +- corcovado/src/timer.rs | 4 ++-- rio-backend/src/graphics/kitty/mod.rs | 2 +- 17 files changed, 27 insertions(+), 27 deletions(-) diff --git a/corcovado/src/channel.rs b/corcovado/src/channel.rs index dc7a37e3..29774f0a 100644 --- a/corcovado/src/channel.rs +++ b/corcovado/src/channel.rs @@ -1,6 +1,6 @@ //! Thread safe communication channel implementing `Evented` -use crate::{event::Evented, Poll, PollOpt, Ready, Registration, SetReadiness, Token}; use crate::lazycell::{AtomicLazyCell, LazyCell}; +use crate::{event::Evented, Poll, PollOpt, Ready, Registration, SetReadiness, Token}; use std::any::Any; use std::error; use std::sync::atomic::{AtomicUsize, Ordering}; diff --git a/corcovado/src/event_imp.rs b/corcovado/src/event_imp.rs index 4b42e8bf..b258e12a 100644 --- a/corcovado/src/event_imp.rs +++ b/corcovado/src/event_imp.rs @@ -1,5 +1,5 @@ -use std::{fmt, io, ops}; use crate::{Poll, Token}; +use std::{fmt, io, ops}; /// A value that may be registered with `Poll` /// diff --git a/corcovado/src/poll.rs b/corcovado/src/poll.rs index efd1171f..dfc3b129 100644 --- a/corcovado/src/poll.rs +++ b/corcovado/src/poll.rs @@ -1,5 +1,5 @@ use crate::event_imp::{self as event, Event, Evented, PollOpt, Ready}; -use tracing::trace; +use crate::{sys, Token}; use std::cell::UnsafeCell; #[cfg(all(unix, not(target_os = "fuchsia")))] use std::os::unix::io::AsRawFd; @@ -13,7 +13,7 @@ use std::sync::{Arc, Condvar, Mutex}; use std::time::{Duration, Instant}; use std::{fmt, io, ptr}; use std::{mem, ops}; -use crate::{sys, Token}; +use tracing::trace; // Poll is backed by two readiness queues. The first is a system readiness queue // represented by `sys::Selector`. The system readiness queue handles events diff --git a/corcovado/src/sys/fuchsia/awakener.rs b/corcovado/src/sys/fuchsia/awakener.rs index ea7bb4fa..ed141669 100644 --- a/corcovado/src/sys/fuchsia/awakener.rs +++ b/corcovado/src/sys/fuchsia/awakener.rs @@ -1,6 +1,6 @@ +use crate::{io, poll, Evented, Poll, PollOpt, Ready, Token}; use std::sync::{Arc, Mutex, Weak}; use zircon; -use crate::{io, poll, Evented, Poll, PollOpt, Ready, Token}; pub struct Awakener { /// Token and weak reference to the port on which Awakener was registered. diff --git a/corcovado/src/sys/fuchsia/eventedfd.rs b/corcovado/src/sys/fuchsia/eventedfd.rs index 8f1d5883..5d9fb769 100644 --- a/corcovado/src/sys/fuchsia/eventedfd.rs +++ b/corcovado/src/sys/fuchsia/eventedfd.rs @@ -1,11 +1,11 @@ +use crate::sys::fuchsia::{poll_opts_to_wait_async, sys, DontDrop}; +use crate::{io, poll, Evented, Poll, PollOpt, Ready, Token}; use libc; use std::mem; use std::os::unix::io::RawFd; use std::sync::{Arc, Mutex}; -use crate::sys::fuchsia::{poll_opts_to_wait_async, sys, DontDrop}; use zircon; use zircon::AsHandleRef; -use crate::{io, poll, Evented, Poll, PollOpt, Ready, Token}; /// Properties of an `EventedFd`'s current registration #[derive(Debug)] diff --git a/corcovado/src/sys/fuchsia/handles.rs b/corcovado/src/sys/fuchsia/handles.rs index 3caf57cc..c1cf780a 100644 --- a/corcovado/src/sys/fuchsia/handles.rs +++ b/corcovado/src/sys/fuchsia/handles.rs @@ -1,6 +1,6 @@ +use crate::{io, poll, Evented, Poll, PollOpt, Ready, Token}; use std::sync::Mutex; use zircon_sys::zx_handle_t; -use crate::{io, poll, Evented, Poll, PollOpt, Ready, Token}; /// Wrapper for registering a `HandleBase` type with mio. #[derive(Debug)] diff --git a/corcovado/src/sys/fuchsia/mod.rs b/corcovado/src/sys/fuchsia/mod.rs index 56b6cb93..462c5e3d 100644 --- a/corcovado/src/sys/fuchsia/mod.rs +++ b/corcovado/src/sys/fuchsia/mod.rs @@ -1,10 +1,10 @@ +use crate::{io, PollOpt, Ready}; use libc; use std::mem; use std::net::{IpAddr, Ipv4Addr, SocketAddr}; use std::ops::{Deref, DerefMut}; use std::os::unix::io::RawFd; use zircon; -use crate::{io, PollOpt, Ready}; mod awakener; mod eventedfd; diff --git a/corcovado/src/sys/fuchsia/net.rs b/corcovado/src/sys/fuchsia/net.rs index 58779708..30c64a39 100644 --- a/corcovado/src/sys/fuchsia/net.rs +++ b/corcovado/src/sys/fuchsia/net.rs @@ -1,3 +1,5 @@ +use crate::sys::fuchsia::{recv_from, set_nonblock, DontDrop, EventedFd}; +use crate::{io, Evented, Poll, PollOpt, Ready, Token}; use iovec::unix as iovec; use iovec::IoVec; use libc; @@ -9,8 +11,6 @@ use std::io::{Read, Write}; use std::net::{self, Ipv4Addr, Ipv6Addr, SocketAddr}; use std::os::unix::io::AsRawFd; use std::time::Duration; -use crate::sys::fuchsia::{recv_from, set_nonblock, DontDrop, EventedFd}; -use crate::{io, Evented, Poll, PollOpt, Ready, Token}; #[derive(Debug)] pub struct TcpStream { diff --git a/corcovado/src/sys/fuchsia/selector.rs b/corcovado/src/sys/fuchsia/selector.rs index 4e31d6a4..daa584f9 100644 --- a/corcovado/src/sys/fuchsia/selector.rs +++ b/corcovado/src/sys/fuchsia/selector.rs @@ -1,18 +1,18 @@ +use crate::sys; +use crate::sys::fuchsia::{ + assert_fuchsia_ready_repr, epoll_event_to_ready, poll_opts_to_wait_async, EventedFd, + EventedFdInner, FuchsiaReady, +}; +use crate::{io, Event, PollOpt, Ready, Token}; use std::collections::hash_map; use std::fmt; use std::mem; use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering, ATOMIC_USIZE_INIT}; use std::sync::{Arc, Mutex, Weak}; use std::time::Duration; -use crate::sys; -use crate::sys::fuchsia::{ - assert_fuchsia_ready_repr, epoll_event_to_ready, poll_opts_to_wait_async, EventedFd, - EventedFdInner, FuchsiaReady, -}; use zircon; use zircon::AsHandleRef; use zircon_sys::zx_handle_t; -use crate::{io, Event, PollOpt, Ready, Token}; /// The kind of registration-- file descriptor or handle. /// diff --git a/corcovado/src/sys/unix/awakener.rs b/corcovado/src/sys/unix/awakener.rs index cbff7e99..33d67ff0 100644 --- a/corcovado/src/sys/unix/awakener.rs +++ b/corcovado/src/sys/unix/awakener.rs @@ -3,9 +3,9 @@ pub use self::pipe::Awakener; /// Default awakener backed by a pipe mod pipe { use crate::event::Evented; - use std::io::{Read, Write}; use crate::sys::unix; use crate::{io, Poll, PollOpt, Ready, Token}; + use std::io::{Read, Write}; /* * diff --git a/corcovado/src/sys/unix/eventedfd.rs b/corcovado/src/sys/unix/eventedfd.rs index ae985cbd..fd920602 100644 --- a/corcovado/src/sys/unix/eventedfd.rs +++ b/corcovado/src/sys/unix/eventedfd.rs @@ -1,6 +1,6 @@ use crate::event::Evented; -use std::os::unix::io::RawFd; use crate::{io, poll, Poll, PollOpt, Ready, Token}; +use std::os::unix::io::RawFd; /* * diff --git a/corcovado/src/sys/unix/kqueue.rs b/corcovado/src/sys/unix/kqueue.rs index 2b299d92..93673a45 100644 --- a/corcovado/src/sys/unix/kqueue.rs +++ b/corcovado/src/sys/unix/kqueue.rs @@ -1,5 +1,4 @@ use std::collections::HashMap; -use tracing::trace; #[cfg(not(target_os = "netbsd"))] use std::os::raw::{c_int, c_short}; use std::os::unix::io::AsRawFd; @@ -7,6 +6,7 @@ use std::os::unix::io::RawFd; use std::sync::atomic::{AtomicUsize, Ordering}; use std::time::Duration; use std::{cmp, fmt, ptr}; +use tracing::trace; use libc::{self, time_t}; diff --git a/corcovado/src/sys/windows/awakener.rs b/corcovado/src/sys/windows/awakener.rs index 0cfef904..93ecc586 100644 --- a/corcovado/src/sys/windows/awakener.rs +++ b/corcovado/src/sys/windows/awakener.rs @@ -1,9 +1,9 @@ use std::sync::Mutex; -use event::Evented; -use miow::iocp::CompletionStatus; use crate::sys::windows::Selector; use crate::{io, poll, Poll, PollOpt, Ready, Token}; +use event::Evented; +use miow::iocp::CompletionStatus; pub struct Awakener { inner: Mutex>, diff --git a/corcovado/src/sys/windows/tcp.rs b/corcovado/src/sys/windows/tcp.rs index 9ca89a19..3d497adf 100644 --- a/corcovado/src/sys/windows/tcp.rs +++ b/corcovado/src/sys/windows/tcp.rs @@ -13,10 +13,10 @@ use miow::iocp::CompletionStatus; use miow::net::*; use net2::{TcpBuilder, TcpStreamExt as Net2TcpExt}; -use event::Evented; use crate::sys::windows::from_raw_arc::FromRawArc; use crate::sys::windows::selector::{Overlapped, ReadyBinding}; use crate::sys::windows::Family; +use event::Evented; use {poll, Poll, PollOpt, Ready, Token}; pub struct TcpStream { diff --git a/corcovado/src/sys/windows/udp.rs b/corcovado/src/sys/windows/udp.rs index c38283aa..7e31e4c4 100644 --- a/corcovado/src/sys/windows/udp.rs +++ b/corcovado/src/sys/windows/udp.rs @@ -20,9 +20,9 @@ use miow::net::UdpSocketExt as MiowUdpSocketExt; #[allow(unused_imports)] use net2::{UdpBuilder, UdpSocketExt}; -use event::Evented; use crate::sys::windows::from_raw_arc::FromRawArc; use crate::sys::windows::selector::{Overlapped, ReadyBinding}; +use event::Evented; use {poll, Poll, PollOpt, Ready, Token}; pub struct UdpSocket { diff --git a/corcovado/src/timer.rs b/corcovado/src/timer.rs index 0b5b71eb..906705ac 100644 --- a/corcovado/src/timer.rs +++ b/corcovado/src/timer.rs @@ -1,12 +1,12 @@ //! Timer optimized for I/O related operations -use tracing::trace; -use crate::{event::Evented, Poll, PollOpt, Ready, Registration, SetReadiness, Token}; use crate::lazycell::LazyCell; +use crate::{event::Evented, Poll, PollOpt, Ready, Registration, SetReadiness, Token}; use slab::Slab; use std::sync::atomic::{AtomicUsize, Ordering}; use std::sync::Arc; use std::time::{Duration, Instant}; use std::{cmp, fmt, io, thread}; +use tracing::trace; mod convert { use std::time::Duration; diff --git a/rio-backend/src/graphics/kitty/mod.rs b/rio-backend/src/graphics/kitty/mod.rs index 570a3845..15e1d850 100644 --- a/rio-backend/src/graphics/kitty/mod.rs +++ b/rio-backend/src/graphics/kitty/mod.rs @@ -1105,7 +1105,7 @@ fn test_delete_by_image_id_does_not_delete_wrong_id() { fn test_no_double_push_on_graphic_cell_drop() { use crate::ansi::graphics::{GraphicCell, TextureRef}; use parking_lot::Mutex; - use std::sync::{Arc, Weak}; + use std::sync::Arc; let texture_ops: Arc>> = Arc::new(Mutex::new(Vec::new())); -- 2.51.2