diff --git a/.rustfmt.toml b/.rustfmt.toml new file mode 100644 index 00000000..ad335080 --- /dev/null +++ b/.rustfmt.toml @@ -0,0 +1,4 @@ +style_edition = "2024" + +max_width = 100 +tab_spaces = 4 diff --git a/input-capture/src/dummy.rs b/input-capture/src/dummy.rs index 24da6d95..3a2a734e 100644 --- a/input-capture/src/dummy.rs +++ b/input-capture/src/dummy.rs @@ -1,6 +1,6 @@ use std::f64::consts::PI; use std::pin::Pin; -use std::task::{ready, Context, Poll}; +use std::task::{Context, Poll, ready}; use std::time::Duration; use async_trait::async_trait; diff --git a/input-capture/src/error.rs b/input-capture/src/error.rs index 7e7a0e6c..469234a1 100644 --- a/input-capture/src/error.rs +++ b/input-capture/src/error.rs @@ -12,9 +12,9 @@ pub enum InputCaptureError { use std::io; #[cfg(all(unix, feature = "layer_shell", not(target_os = "macos")))] use wayland_client::{ + ConnectError, DispatchError, backend::WaylandError, globals::{BindError, GlobalError}, - ConnectError, DispatchError, }; #[cfg(all(unix, feature = "libei", not(target_os = "macos")))] diff --git a/input-capture/src/layer_shell.rs b/input-capture/src/layer_shell.rs index ea8a4e01..698c5849 100644 --- a/input-capture/src/layer_shell.rs +++ b/input-capture/src/layer_shell.rs @@ -7,7 +7,7 @@ use std::{ io::{self, ErrorKind}, os::fd::{AsFd, RawFd}, pin::Pin, - task::{ready, Context, Poll}, + task::{Context, Poll, ready}, }; use tokio::io::unix::AsyncFd; @@ -45,9 +45,10 @@ use wayland_protocols_wlr::layer_shell::v1::client::{ }; use wayland_client::{ + Connection, Dispatch, DispatchError, EventQueue, QueueHandle, WEnum, backend::{ReadEventsGuard, WaylandError}, delegate_noop, - globals::{registry_queue_init, Global, GlobalList, GlobalListContents}, + globals::{Global, GlobalList, GlobalListContents, registry_queue_init}, protocol::{ wl_buffer, wl_compositor, wl_keyboard::{self, WlKeyboard}, @@ -58,7 +59,6 @@ use wayland_client::{ wl_seat, wl_shm, wl_shm_pool, wl_surface::WlSurface, }, - Connection, Dispatch, DispatchError, EventQueue, QueueHandle, WEnum, }; use input_event::{Event, KeyboardEvent, PointerEvent}; @@ -66,8 +66,8 @@ use input_event::{Event, KeyboardEvent, PointerEvent}; use crate::{CaptureError, CaptureEvent}; use super::{ - error::{LayerShellCaptureCreationError, WaylandBindError}, Capture, Position, + error::{LayerShellCaptureCreationError, WaylandBindError}, }; struct Globals { diff --git a/input-capture/src/lib.rs b/input-capture/src/lib.rs index 6b4f4f88..47675031 100644 --- a/input-capture/src/lib.rs +++ b/input-capture/src/lib.rs @@ -2,14 +2,14 @@ use std::{ collections::{HashMap, HashSet, VecDeque}, fmt::Display, mem::swap, - task::{ready, Poll}, + task::{Poll, ready}, }; use async_trait::async_trait; use futures::StreamExt; use futures_core::Stream; -use input_event::{scancode, Event, KeyboardEvent}; +use input_event::{Event, KeyboardEvent, scancode}; pub use error::{CaptureCreationError, CaptureError, InputCaptureError}; diff --git a/input-capture/src/libei.rs b/input-capture/src/libei.rs index 95f9cd57..697b7828 100644 --- a/input-capture/src/libei.rs +++ b/input-capture/src/libei.rs @@ -1,10 +1,10 @@ use ashpd::{ desktop::{ + Session, input_capture::{ Activated, ActivatedBarrier, Barrier, BarrierID, Capabilities, InputCapture, Region, Zones, }, - Session, }, enumflags2::BitFlags, }; @@ -28,8 +28,8 @@ use std::{ }; use tokio::{ sync::{ - mpsc::{self, Receiver, Sender}, Notify, + mpsc::{self, Receiver, Sender}, }, task::JoinHandle, }; @@ -42,8 +42,8 @@ use input_event::Event; use crate::CaptureEvent; use super::{ - error::{CaptureError, LibeiCaptureCreationError}, Capture as LanMouseInputCapture, Position, + error::{CaptureError, LibeiCaptureCreationError}, }; /* there is a bug in xdg-remote-desktop-portal-gnome / mutter that diff --git a/input-capture/src/macos.rs b/input-capture/src/macos.rs index 16c4b8c8..b0af388d 100644 --- a/input-capture/src/macos.rs +++ b/input-capture/src/macos.rs @@ -1,15 +1,15 @@ -use super::{error::MacosCaptureCreationError, Capture, CaptureError, CaptureEvent, Position}; +use super::{Capture, CaptureError, CaptureEvent, Position, error::MacosCaptureCreationError}; use async_trait::async_trait; use bitflags::bitflags; use core_foundation::{ - base::{kCFAllocatorDefault, CFRelease}, + base::{CFRelease, kCFAllocatorDefault}, date::CFTimeInterval, - number::{kCFBooleanTrue, CFBooleanRef}, - runloop::{kCFRunLoopCommonModes, CFRunLoop, CFRunLoopSource}, - string::{kCFStringEncodingUTF8, CFStringCreateWithCString, CFStringRef}, + number::{CFBooleanRef, kCFBooleanTrue}, + runloop::{CFRunLoop, CFRunLoopSource, kCFRunLoopCommonModes}, + string::{CFStringCreateWithCString, CFStringRef, kCFStringEncodingUTF8}, }; use core_graphics::{ - base::{kCGErrorSuccess, CGError}, + base::{CGError, kCGErrorSuccess}, display::{CGDisplay, CGPoint}, event::{ CGEvent, CGEventFlags, CGEventTap, CGEventTapLocation, CGEventTapOptions, @@ -18,21 +18,22 @@ use core_graphics::{ event_source::{CGEventSource, CGEventSourceStateID}, }; use futures_core::Stream; -use input_event::{Event, KeyboardEvent, PointerEvent, BTN_LEFT, BTN_MIDDLE, BTN_RIGHT}; +use input_event::{BTN_LEFT, BTN_MIDDLE, BTN_RIGHT, Event, KeyboardEvent, PointerEvent}; use keycode::{KeyMap, KeyMapping}; use libc::c_void; use once_cell::unsync::Lazy; use std::{ collections::HashSet, - ffi::{c_char, CString}, + ffi::{CString, c_char}, pin::Pin, sync::Arc, - task::{ready, Context, Poll}, + task::{Context, Poll, ready}, thread::{self}, }; use tokio::sync::{ + Mutex, mpsc::{self, Receiver, Sender}, - oneshot, Mutex, + oneshot, }; #[derive(Debug, Default)] diff --git a/input-capture/src/windows.rs b/input-capture/src/windows.rs index aaf5076e..0d0ed7c2 100644 --- a/input-capture/src/windows.rs +++ b/input-capture/src/windows.rs @@ -5,7 +5,7 @@ use futures::Stream; use std::pin::Pin; use std::task::ready; -use tokio::sync::mpsc::{channel, Receiver}; +use tokio::sync::mpsc::{Receiver, channel}; use super::{Capture, CaptureError, CaptureEvent, Position}; diff --git a/input-capture/src/windows/event_thread.rs b/input-capture/src/windows/event_thread.rs index 284a179c..2a44c0fc 100644 --- a/input-capture/src/windows/event_thread.rs +++ b/input-capture/src/windows/event_thread.rs @@ -6,33 +6,32 @@ use std::default::Default; use std::sync::atomic::{AtomicBool, AtomicI32, Ordering}; use std::sync::{Arc, Condvar, Mutex}; use std::thread; -use tokio::sync::mpsc::error::TrySendError; use tokio::sync::mpsc::Sender; -use windows::core::{w, PCWSTR}; +use tokio::sync::mpsc::error::TrySendError; use windows::Win32::Foundation::{FALSE, HWND, LPARAM, LRESULT, RECT, WPARAM}; use windows::Win32::Graphics::Gdi::{ - EnumDisplayDevicesW, EnumDisplaySettingsW, DEVMODEW, DISPLAY_DEVICEW, - DISPLAY_DEVICE_ATTACHED_TO_DESKTOP, ENUM_CURRENT_SETTINGS, + DEVMODEW, DISPLAY_DEVICE_ATTACHED_TO_DESKTOP, DISPLAY_DEVICEW, ENUM_CURRENT_SETTINGS, + EnumDisplayDevicesW, EnumDisplaySettingsW, }; use windows::Win32::System::LibraryLoader::GetModuleHandleW; use windows::Win32::System::Threading::GetCurrentThreadId; +use windows::core::{PCWSTR, w}; use windows::Win32::UI::WindowsAndMessaging::{ - CallNextHookEx, CreateWindowExW, DispatchMessageW, GetMessageW, PostThreadMessageW, - RegisterClassW, SetWindowsHookExW, TranslateMessage, EDD_GET_DEVICE_INTERFACE_NAME, HOOKPROC, - KBDLLHOOKSTRUCT, LLKHF_EXTENDED, MSG, MSLLHOOKSTRUCT, WH_KEYBOARD_LL, WH_MOUSE_LL, - WINDOW_STYLE, WM_DISPLAYCHANGE, WM_KEYDOWN, WM_KEYUP, WM_LBUTTONDOWN, WM_LBUTTONUP, - WM_MBUTTONDOWN, WM_MBUTTONUP, WM_MOUSEHWHEEL, WM_MOUSEMOVE, WM_MOUSEWHEEL, WM_RBUTTONDOWN, - WM_RBUTTONUP, WM_SYSKEYDOWN, WM_SYSKEYUP, WM_USER, WM_XBUTTONDOWN, WM_XBUTTONUP, WNDCLASSW, - WNDPROC, + CallNextHookEx, CreateWindowExW, DispatchMessageW, EDD_GET_DEVICE_INTERFACE_NAME, GetMessageW, + HOOKPROC, KBDLLHOOKSTRUCT, LLKHF_EXTENDED, MSG, MSLLHOOKSTRUCT, PostThreadMessageW, + RegisterClassW, SetWindowsHookExW, TranslateMessage, WH_KEYBOARD_LL, WH_MOUSE_LL, WINDOW_STYLE, + WM_DISPLAYCHANGE, WM_KEYDOWN, WM_KEYUP, WM_LBUTTONDOWN, WM_LBUTTONUP, WM_MBUTTONDOWN, + WM_MBUTTONUP, WM_MOUSEHWHEEL, WM_MOUSEMOVE, WM_MOUSEWHEEL, WM_RBUTTONDOWN, WM_RBUTTONUP, + WM_SYSKEYDOWN, WM_SYSKEYUP, WM_USER, WM_XBUTTONDOWN, WM_XBUTTONUP, WNDCLASSW, WNDPROC, }; use input_event::{ + BTN_BACK, BTN_FORWARD, BTN_LEFT, BTN_MIDDLE, BTN_RIGHT, Event, KeyboardEvent, PointerEvent, scancode::{self, Linux}, - Event, KeyboardEvent, PointerEvent, BTN_BACK, BTN_FORWARD, BTN_LEFT, BTN_MIDDLE, BTN_RIGHT, }; -use super::{display_util, CaptureEvent, Position}; +use super::{CaptureEvent, Position, display_util}; pub(crate) struct EventThread { request_buffer: Arc>>, diff --git a/input-capture/src/x11.rs b/input-capture/src/x11.rs index 7cf5b587..6fc917ec 100644 --- a/input-capture/src/x11.rs +++ b/input-capture/src/x11.rs @@ -3,7 +3,7 @@ use std::task::Poll; use async_trait::async_trait; use futures_core::Stream; -use super::{error::X11InputCaptureCreationError, Capture, CaptureError, CaptureEvent, Position}; +use super::{Capture, CaptureError, CaptureEvent, Position, error::X11InputCaptureCreationError}; pub struct X11InputCapture {} diff --git a/input-emulation/src/error.rs b/input-emulation/src/error.rs index ae774265..078e8512 100644 --- a/input-emulation/src/error.rs +++ b/input-emulation/src/error.rs @@ -11,15 +11,15 @@ pub enum InputEmulationError { any(feature = "remote_desktop_portal", feature = "libei"), not(target_os = "macos") ))] -use ashpd::{desktop::ResponseError, Error::Response}; +use ashpd::{Error::Response, desktop::ResponseError}; use std::io; use thiserror::Error; #[cfg(all(unix, feature = "wlroots", not(target_os = "macos")))] use wayland_client::{ + ConnectError, DispatchError, backend::WaylandError, globals::{BindError, GlobalError}, - ConnectError, DispatchError, }; #[derive(Debug, Error)] diff --git a/input-emulation/src/libei.rs b/input-emulation/src/libei.rs index 0ba0e5a1..674a4982 100644 --- a/input-emulation/src/libei.rs +++ b/input-emulation/src/libei.rs @@ -1,25 +1,25 @@ -use futures::{future, StreamExt}; +use futures::{StreamExt, future}; use std::{ io, os::{fd::OwnedFd, unix::net::UnixStream}, sync::{ - atomic::{AtomicBool, Ordering}, Arc, Mutex, RwLock, + atomic::{AtomicBool, Ordering}, }, time::{SystemTime, UNIX_EPOCH}, }; use tokio::task::JoinHandle; use ashpd::desktop::{ - remote_desktop::{DeviceType, RemoteDesktop}, PersistMode, Session, + remote_desktop::{DeviceType, RemoteDesktop}, }; use async_trait::async_trait; use reis::{ ei::{ - self, button::ButtonState, handshake::ContextType, keyboard::KeyState, Button, Keyboard, - Pointer, Scroll, + self, Button, Keyboard, Pointer, Scroll, button::ButtonState, handshake::ContextType, + keyboard::KeyState, }, event::{self, Connection, DeviceCapability, DeviceEvent, EiEvent, SeatEvent}, tokio::EiConvertEventStream, @@ -29,7 +29,7 @@ use input_event::{Event, KeyboardEvent, PointerEvent}; use crate::error::EmulationError; -use super::{error::LibeiEmulationCreationError, Emulation, EmulationHandle}; +use super::{Emulation, EmulationHandle, error::LibeiEmulationCreationError}; #[derive(Clone, Default)] struct Devices { @@ -50,8 +50,8 @@ pub(crate) struct LibeiEmulation<'a> { session: Session<'a, RemoteDesktop<'a>>, } -async fn get_ei_fd<'a>( -) -> Result<(RemoteDesktop<'a>, Session<'a, RemoteDesktop<'a>>, OwnedFd), ashpd::Error> { +async fn get_ei_fd<'a>() +-> Result<(RemoteDesktop<'a>, Session<'a, RemoteDesktop<'a>>, OwnedFd), ashpd::Error> { let remote_desktop = RemoteDesktop::new().await?; log::debug!("creating session ..."); diff --git a/input-emulation/src/macos.rs b/input-emulation/src/macos.rs index 84028867..a679cbf3 100644 --- a/input-emulation/src/macos.rs +++ b/input-emulation/src/macos.rs @@ -1,4 +1,4 @@ -use super::{error::EmulationError, Emulation, EmulationHandle}; +use super::{Emulation, EmulationHandle, error::EmulationError}; use async_trait::async_trait; use bitflags::bitflags; use core_graphics::base::CGFloat; @@ -10,7 +10,7 @@ use core_graphics::event::{ ScrollEventUnit, }; use core_graphics::event_source::{CGEventSource, CGEventSourceStateID}; -use input_event::{scancode, Event, KeyboardEvent, PointerEvent, BTN_LEFT, BTN_MIDDLE, BTN_RIGHT}; +use input_event::{BTN_LEFT, BTN_MIDDLE, BTN_RIGHT, Event, KeyboardEvent, PointerEvent, scancode}; use keycode::{KeyMap, KeyMapping}; use std::cell::Cell; use std::ops::{Index, IndexMut}; diff --git a/input-emulation/src/windows.rs b/input-emulation/src/windows.rs index 3d0eacd5..6610ec25 100644 --- a/input-emulation/src/windows.rs +++ b/input-emulation/src/windows.rs @@ -1,22 +1,22 @@ use super::error::{EmulationError, WindowsEmulationCreationError}; use input_event::{ - scancode, Event, KeyboardEvent, PointerEvent, BTN_BACK, BTN_FORWARD, BTN_LEFT, BTN_MIDDLE, - BTN_RIGHT, + BTN_BACK, BTN_FORWARD, BTN_LEFT, BTN_MIDDLE, BTN_RIGHT, Event, KeyboardEvent, PointerEvent, + scancode, }; use async_trait::async_trait; use std::ops::BitOrAssign; use std::time::Duration; use tokio::task::AbortHandle; -use windows::Win32::UI::Input::KeyboardAndMouse::{ - SendInput, INPUT_0, KEYEVENTF_EXTENDEDKEY, MOUSEEVENTF_XDOWN, MOUSEEVENTF_XUP, -}; use windows::Win32::UI::Input::KeyboardAndMouse::{ INPUT, INPUT_KEYBOARD, INPUT_MOUSE, KEYBDINPUT, KEYEVENTF_KEYUP, KEYEVENTF_SCANCODE, MOUSEEVENTF_HWHEEL, MOUSEEVENTF_LEFTDOWN, MOUSEEVENTF_LEFTUP, MOUSEEVENTF_MIDDLEDOWN, MOUSEEVENTF_MIDDLEUP, MOUSEEVENTF_MOVE, MOUSEEVENTF_RIGHTDOWN, MOUSEEVENTF_RIGHTUP, MOUSEEVENTF_WHEEL, MOUSEINPUT, }; +use windows::Win32::UI::Input::KeyboardAndMouse::{ + INPUT_0, KEYEVENTF_EXTENDEDKEY, MOUSEEVENTF_XDOWN, MOUSEEVENTF_XUP, SendInput, +}; use windows::Win32::UI::WindowsAndMessaging::{XBUTTON1, XBUTTON2}; use super::{Emulation, EmulationHandle}; diff --git a/input-emulation/src/wlroots.rs b/input-emulation/src/wlroots.rs index 944ebffe..f79f8d9e 100644 --- a/input-emulation/src/wlroots.rs +++ b/input-emulation/src/wlroots.rs @@ -1,6 +1,6 @@ use crate::error::EmulationError; -use super::{error::WlrootsEmulationCreationError, Emulation}; +use super::{Emulation, error::WlrootsEmulationCreationError}; use async_trait::async_trait; use bitflags::bitflags; use std::collections::HashMap; @@ -8,8 +8,8 @@ use std::io; use std::os::fd::{AsFd, OwnedFd}; use std::sync::{Arc, Mutex}; use std::time::{SystemTime, UNIX_EPOCH}; -use wayland_client::backend::WaylandError; use wayland_client::WEnum; +use wayland_client::backend::WaylandError; use wayland_client::protocol::wl_keyboard::{self, WlKeyboard}; use wayland_client::protocol::wl_pointer::{Axis, AxisSource, ButtonState}; @@ -25,16 +25,15 @@ use wayland_protocols_misc::zwp_virtual_keyboard_v1::client::{ }; use wayland_client::{ - delegate_noop, - globals::{registry_queue_init, GlobalListContents}, + Connection, Dispatch, EventQueue, QueueHandle, delegate_noop, + globals::{GlobalListContents, registry_queue_init}, protocol::{wl_registry, wl_seat}, - Connection, Dispatch, EventQueue, QueueHandle, }; -use input_event::{scancode, Event, KeyboardEvent, PointerEvent}; +use input_event::{Event, KeyboardEvent, PointerEvent, scancode}; -use super::error::WaylandBindError; use super::EmulationHandle; +use super::error::WaylandBindError; struct State { keymap: Option<(u32, OwnedFd, u32)>, diff --git a/input-emulation/src/x11.rs b/input-emulation/src/x11.rs index 041d560f..aadca294 100644 --- a/input-emulation/src/x11.rs +++ b/input-emulation/src/x11.rs @@ -6,12 +6,12 @@ use x11::{ }; use input_event::{ - Event, KeyboardEvent, PointerEvent, BTN_BACK, BTN_FORWARD, BTN_LEFT, BTN_MIDDLE, BTN_RIGHT, + BTN_BACK, BTN_FORWARD, BTN_LEFT, BTN_MIDDLE, BTN_RIGHT, Event, KeyboardEvent, PointerEvent, }; use crate::error::EmulationError; -use super::{error::X11EmulationCreationError, Emulation, EmulationHandle}; +use super::{Emulation, EmulationHandle, error::X11EmulationCreationError}; pub(crate) struct X11Emulation { display: *mut xlib::Display, diff --git a/input-emulation/src/xdg_desktop_portal.rs b/input-emulation/src/xdg_desktop_portal.rs index 962a23f5..37d29744 100644 --- a/input-emulation/src/xdg_desktop_portal.rs +++ b/input-emulation/src/xdg_desktop_portal.rs @@ -1,7 +1,7 @@ use ashpd::{ desktop::{ - remote_desktop::{Axis, DeviceType, KeyState, RemoteDesktop}, PersistMode, Session, + remote_desktop::{Axis, DeviceType, KeyState, RemoteDesktop}, }, zbus::AsyncDrop, }; @@ -15,7 +15,7 @@ use input_event::{ use crate::error::EmulationError; -use super::{error::XdpEmulationCreationError, Emulation, EmulationHandle}; +use super::{Emulation, EmulationHandle, error::XdpEmulationCreationError}; pub(crate) struct DesktopPortalEmulation<'a> { proxy: RemoteDesktop<'a>, diff --git a/lan-mouse-cli/src/lib.rs b/lan-mouse-cli/src/lib.rs index dda74a8c..26e7a05b 100644 --- a/lan-mouse-cli/src/lib.rs +++ b/lan-mouse-cli/src/lib.rs @@ -5,8 +5,8 @@ use std::{net::IpAddr, time::Duration}; use thiserror::Error; use lan_mouse_ipc::{ - connect_async, ClientHandle, ConnectionError, FrontendEvent, FrontendRequest, IpcError, - Position, + ClientHandle, ConnectionError, FrontendEvent, FrontendRequest, IpcError, Position, + connect_async, }; #[derive(Debug, Error)] diff --git a/lan-mouse-gtk/src/authorization_window/imp.rs b/lan-mouse-gtk/src/authorization_window/imp.rs index 4792b2b1..69b15046 100644 --- a/lan-mouse-gtk/src/authorization_window/imp.rs +++ b/lan-mouse-gtk/src/authorization_window/imp.rs @@ -4,8 +4,9 @@ use adw::prelude::*; use adw::subclass::prelude::*; use glib::subclass::InitializingObject; use gtk::{ + Button, CompositeTemplate, Label, glib::{self, subclass::Signal}, - template_callbacks, Button, CompositeTemplate, Label, + template_callbacks, }; #[derive(CompositeTemplate, Default)] diff --git a/lan-mouse-gtk/src/client_row.rs b/lan-mouse-gtk/src/client_row.rs index ca9c5f43..cd3d02b3 100644 --- a/lan-mouse-gtk/src/client_row.rs +++ b/lan-mouse-gtk/src/client_row.rs @@ -4,7 +4,7 @@ use adw::prelude::*; use adw::subclass::prelude::*; use gtk::glib::{self, Object}; -use lan_mouse_ipc::{Position, DEFAULT_PORT}; +use lan_mouse_ipc::{DEFAULT_PORT, Position}; use super::ClientObject; diff --git a/lan-mouse-gtk/src/client_row/imp.rs b/lan-mouse-gtk/src/client_row/imp.rs index 8c5b20a3..67e9034b 100644 --- a/lan-mouse-gtk/src/client_row/imp.rs +++ b/lan-mouse-gtk/src/client_row/imp.rs @@ -1,11 +1,11 @@ use std::cell::RefCell; use adw::subclass::prelude::*; -use adw::{prelude::*, ActionRow, ComboRow}; -use glib::{subclass::InitializingObject, Binding}; +use adw::{ActionRow, ComboRow, prelude::*}; +use glib::{Binding, subclass::InitializingObject}; use gtk::glib::subclass::Signal; -use gtk::glib::{clone, SignalHandlerId}; -use gtk::{glib, Button, CompositeTemplate, Entry, Switch}; +use gtk::glib::{SignalHandlerId, clone}; +use gtk::{Button, CompositeTemplate, Entry, Switch, glib}; use lan_mouse_ipc::Position; use std::sync::OnceLock; diff --git a/lan-mouse-gtk/src/fingerprint_window/imp.rs b/lan-mouse-gtk/src/fingerprint_window/imp.rs index 1ba80af9..943b68a2 100644 --- a/lan-mouse-gtk/src/fingerprint_window/imp.rs +++ b/lan-mouse-gtk/src/fingerprint_window/imp.rs @@ -4,8 +4,9 @@ use adw::prelude::*; use adw::subclass::prelude::*; use glib::subclass::InitializingObject; use gtk::{ + Button, CompositeTemplate, Text, glib::{self, subclass::Signal}, - template_callbacks, Button, CompositeTemplate, Text, + template_callbacks, }; #[derive(CompositeTemplate, Default)] @@ -51,9 +52,11 @@ impl ObjectImpl for FingerprintWindow { fn signals() -> &'static [Signal] { static SIGNALS: OnceLock> = OnceLock::new(); SIGNALS.get_or_init(|| { - vec![Signal::builder("confirm-clicked") - .param_types([String::static_type(), String::static_type()]) - .build()] + vec![ + Signal::builder("confirm-clicked") + .param_types([String::static_type(), String::static_type()]) + .build(), + ] }) } } diff --git a/lan-mouse-gtk/src/key_row/imp.rs b/lan-mouse-gtk/src/key_row/imp.rs index df248f89..57529aed 100644 --- a/lan-mouse-gtk/src/key_row/imp.rs +++ b/lan-mouse-gtk/src/key_row/imp.rs @@ -1,11 +1,11 @@ use std::cell::RefCell; use adw::subclass::prelude::*; -use adw::{prelude::*, ActionRow}; -use glib::{subclass::InitializingObject, Binding}; +use adw::{ActionRow, prelude::*}; +use glib::{Binding, subclass::InitializingObject}; use gtk::glib::clone; use gtk::glib::subclass::Signal; -use gtk::{glib, Button, CompositeTemplate}; +use gtk::{Button, CompositeTemplate, glib}; use std::sync::OnceLock; #[derive(CompositeTemplate, Default)] diff --git a/lan-mouse-gtk/src/lib.rs b/lan-mouse-gtk/src/lib.rs index 4532b0ed..9908e05f 100644 --- a/lan-mouse-gtk/src/lib.rs +++ b/lan-mouse-gtk/src/lib.rs @@ -13,7 +13,7 @@ use window::Window; use lan_mouse_ipc::FrontendEvent; use adw::Application; -use gtk::{gdk::Display, glib::clone, prelude::*, IconTheme}; +use gtk::{IconTheme, gdk::Display, glib::clone, prelude::*}; use gtk::{gio, glib, prelude::ApplicationExt}; use self::client_object::ClientObject; diff --git a/lan-mouse-gtk/src/window.rs b/lan-mouse-gtk/src/window.rs index 7ce961fb..47db9263 100644 --- a/lan-mouse-gtk/src/window.rs +++ b/lan-mouse-gtk/src/window.rs @@ -4,16 +4,15 @@ use std::collections::HashMap; use adw::prelude::*; use adw::subclass::prelude::*; -use glib::{clone, Object}; +use glib::{Object, clone}; use gtk::{ - gio, + NoSelection, gio, glib::{self, closure_local}, - NoSelection, }; use lan_mouse_ipc::{ - ClientConfig, ClientHandle, ClientState, FrontendRequest, FrontendRequestWriter, Position, - DEFAULT_PORT, + ClientConfig, ClientHandle, ClientState, DEFAULT_PORT, FrontendRequest, FrontendRequestWriter, + Position, }; use crate::{ diff --git a/lan-mouse-gtk/src/window/imp.rs b/lan-mouse-gtk/src/window/imp.rs index b64dad17..f37647ea 100644 --- a/lan-mouse-gtk/src/window/imp.rs +++ b/lan-mouse-gtk/src/window/imp.rs @@ -1,12 +1,12 @@ use std::cell::{Cell, RefCell}; use adw::subclass::prelude::*; -use adw::{prelude::*, ActionRow, PreferencesGroup, ToastOverlay}; +use adw::{ActionRow, PreferencesGroup, ToastOverlay, prelude::*}; use glib::subclass::InitializingObject; use gtk::glib::clone; -use gtk::{gdk, gio, glib, Button, CompositeTemplate, Entry, Image, Label, ListBox}; +use gtk::{Button, CompositeTemplate, Entry, Image, Label, ListBox, gdk, gio, glib}; -use lan_mouse_ipc::{FrontendRequestWriter, DEFAULT_PORT}; +use lan_mouse_ipc::{DEFAULT_PORT, FrontendRequestWriter}; use crate::authorization_window::AuthorizationWindow; diff --git a/lan-mouse-ipc/src/connect.rs b/lan-mouse-ipc/src/connect.rs index fac4f518..1b751bea 100644 --- a/lan-mouse-ipc/src/connect.rs +++ b/lan-mouse-ipc/src/connect.rs @@ -1,7 +1,7 @@ use crate::{ConnectionError, FrontendEvent, FrontendRequest, IpcError}; use std::{ cmp::min, - io::{self, prelude::*, BufReader, LineWriter, Lines}, + io::{self, BufReader, LineWriter, Lines, prelude::*}, thread, time::Duration, }; diff --git a/lan-mouse-ipc/src/connect_async.rs b/lan-mouse-ipc/src/connect_async.rs index ea4fa9e3..b627107d 100644 --- a/lan-mouse-ipc/src/connect_async.rs +++ b/lan-mouse-ipc/src/connect_async.rs @@ -1,7 +1,7 @@ use crate::{ConnectionError, FrontendEvent, FrontendRequest, IpcError}; use std::{ cmp::min, - task::{ready, Poll}, + task::{Poll, ready}, time::Duration, }; diff --git a/lan-mouse-ipc/src/lib.rs b/lan-mouse-ipc/src/lib.rs index 37663f8c..60c01250 100644 --- a/lan-mouse-ipc/src/lib.rs +++ b/lan-mouse-ipc/src/lib.rs @@ -20,8 +20,8 @@ mod connect; mod connect_async; mod listen; -pub use connect::{connect, FrontendEventReader, FrontendRequestWriter}; -pub use connect_async::{connect_async, AsyncFrontendEventReader, AsyncFrontendRequestWriter}; +pub use connect::{FrontendEventReader, FrontendRequestWriter, connect}; +pub use connect_async::{AsyncFrontendEventReader, AsyncFrontendRequestWriter, connect_async}; pub use listen::AsyncFrontendListener; #[derive(Debug, Error)] diff --git a/lan-mouse-ipc/src/listen.rs b/lan-mouse-ipc/src/listen.rs index 6c700c64..8e260897 100644 --- a/lan-mouse-ipc/src/listen.rs +++ b/lan-mouse-ipc/src/listen.rs @@ -1,4 +1,4 @@ -use futures::{stream::SelectAll, Stream, StreamExt}; +use futures::{Stream, StreamExt, stream::SelectAll}; #[cfg(unix)] use std::path::PathBuf; use std::{ @@ -63,7 +63,7 @@ impl AsyncFrontendListener { Ok(ls) => ls, // some other lan-mouse instance has bound the socket in the meantime Err(e) if e.kind() == ErrorKind::AddrInUse => { - return Err(IpcListenerCreationError::AlreadyRunning) + return Err(IpcListenerCreationError::AlreadyRunning); } Err(e) => return Err(IpcListenerCreationError::Bind(e)), }; @@ -75,7 +75,7 @@ impl AsyncFrontendListener { Ok(ls) => ls, // some other lan-mouse instance has bound the socket in the meantime Err(e) if e.kind() == ErrorKind::AddrInUse => { - return Err(IpcListenerCreationError::AlreadyRunning) + return Err(IpcListenerCreationError::AlreadyRunning); } Err(e) => return Err(IpcListenerCreationError::Bind(e)), }; diff --git a/src/capture.rs b/src/capture.rs index f2c95b13..82636fd2 100644 --- a/src/capture.rs +++ b/src/capture.rs @@ -10,8 +10,8 @@ use input_capture::{ }; use input_event::scancode; use lan_mouse_proto::ProtoEvent; -use local_channel::mpsc::{channel, Receiver, Sender}; -use tokio::task::{spawn_local, JoinHandle}; +use local_channel::mpsc::{Receiver, Sender, channel}; +use tokio::task::{JoinHandle, spawn_local}; use tokio_util::sync::CancellationToken; use crate::connect::LanMouseConnection; diff --git a/src/config.rs b/src/config.rs index 41f442dd..c0584cc3 100644 --- a/src/config.rs +++ b/src/config.rs @@ -13,7 +13,7 @@ use thiserror::Error; use toml; use lan_mouse_cli::CliArgs; -use lan_mouse_ipc::{Position, DEFAULT_PORT}; +use lan_mouse_ipc::{DEFAULT_PORT, Position}; use input_event::scancode::{ self, diff --git a/src/connect.rs b/src/connect.rs index 4fccc75a..fb77e8e3 100644 --- a/src/connect.rs +++ b/src/connect.rs @@ -1,7 +1,7 @@ use crate::client::ClientManager; use lan_mouse_ipc::{ClientHandle, DEFAULT_PORT}; -use lan_mouse_proto::{ProtoEvent, MAX_EVENT_SIZE}; -use local_channel::mpsc::{channel, Receiver, Sender}; +use lan_mouse_proto::{MAX_EVENT_SIZE, ProtoEvent}; +use local_channel::mpsc::{Receiver, Sender, channel}; use std::{ cell::RefCell, collections::{HashMap, HashSet}, @@ -15,7 +15,7 @@ use thiserror::Error; use tokio::{ net::UdpSocket, sync::Mutex, - task::{spawn_local, JoinSet}, + task::{JoinSet, spawn_local}, }; use webrtc_dtls::{ config::{Config, ExtendedMasterSecretType}, diff --git a/src/dns.rs b/src/dns.rs index 55ed1961..60bc100a 100644 --- a/src/dns.rs +++ b/src/dns.rs @@ -1,7 +1,7 @@ use std::{collections::HashMap, net::IpAddr}; -use local_channel::mpsc::{channel, Receiver, Sender}; -use tokio::task::{spawn_local, JoinHandle}; +use local_channel::mpsc::{Receiver, Sender, channel}; +use tokio::task::{JoinHandle, spawn_local}; use hickory_resolver::{ResolveError, TokioResolver}; use tokio_util::sync::CancellationToken; diff --git a/src/emulation.rs b/src/emulation.rs index c8f13311..853267ca 100644 --- a/src/emulation.rs +++ b/src/emulation.rs @@ -3,7 +3,7 @@ use futures::StreamExt; use input_emulation::{EmulationHandle, InputEmulation, InputEmulationError}; use input_event::Event; use lan_mouse_proto::{Position, ProtoEvent}; -use local_channel::mpsc::{channel, Receiver, Sender}; +use local_channel::mpsc::{Receiver, Sender, channel}; use std::{ cell::Cell, collections::HashMap, @@ -13,7 +13,7 @@ use std::{ }; use tokio::{ select, - task::{spawn_local, JoinHandle}, + task::{JoinHandle, spawn_local}, }; /// emulation handling events received from a listener diff --git a/src/listen.rs b/src/listen.rs index bf0653da..bd508584 100644 --- a/src/listen.rs +++ b/src/listen.rs @@ -1,6 +1,6 @@ use futures::{Stream, StreamExt}; -use lan_mouse_proto::{ProtoEvent, MAX_EVENT_SIZE}; -use local_channel::mpsc::{channel, Receiver, Sender}; +use lan_mouse_proto::{MAX_EVENT_SIZE, ProtoEvent}; +use local_channel::mpsc::{Receiver, Sender, channel}; use rustls::pki_types::CertificateDer; use std::{ collections::{HashMap, VecDeque}, @@ -12,7 +12,7 @@ use std::{ use thiserror::Error; use tokio::{ sync::Mutex as AsyncMutex, - task::{spawn_local, JoinHandle}, + task::{JoinHandle, spawn_local}, }; use webrtc_dtls::{ config::{ClientAuthType::RequireAnyClientCert, Config, ExtendedMasterSecretType}, @@ -20,7 +20,7 @@ use webrtc_dtls::{ crypto::Certificate, listener::listen, }; -use webrtc_util::{conn::Listener, Conn, Error}; +use webrtc_util::{Conn, Error, conn::Listener}; use crate::crypto;