1
0
Fork 0
forked from wry/wry

all: set rust edition to 2024

This commit is contained in:
Julian Orth 2025-02-21 10:44:29 +01:00
parent 02a18f620b
commit 3338909170
515 changed files with 1225 additions and 1187 deletions

View file

@ -6,7 +6,7 @@ use {
},
std::rc::Rc,
thiserror::Error,
uapi::{c, format_ustr, Errno, OwnedFd, Ustring},
uapi::{Errno, OwnedFd, Ustring, c, format_ustr},
};
#[derive(Debug, Error)]

View file

@ -4,10 +4,10 @@ use {
async_engine::SpawnedFuture,
client::ClientId,
ei::{
EiContext, EiInterfaceVersion,
ei_client::ei_objects::EiObjects,
ei_ifs::{ei_connection::EiConnection, ei_handshake::EiHandshake},
ei_object::{EiInterface, EiObject, EiObjectId},
EiContext, EiInterfaceVersion,
},
ifs::wl_seat::WlSeatGlobal,
leaks::Tracker,
@ -19,7 +19,7 @@ use {
debug_fn::debug_fn,
errorfmt::ErrorFmt,
numcell::NumCell,
pid_info::{get_pid_info, get_socket_creds, PidInfo},
pid_info::{PidInfo, get_pid_info, get_socket_creds},
},
wire_ei::EiInterfaceVersions,
},

View file

@ -2,7 +2,7 @@ use {
crate::{
async_engine::Phase,
ei::{
ei_client::{ei_error::EiClientError, EiClient},
ei_client::{EiClient, ei_error::EiClientError},
ei_object::EiObjectId,
},
utils::{
@ -11,7 +11,7 @@ use {
vec_ext::VecExt,
},
},
futures_util::{select, FutureExt},
futures_util::{FutureExt, select},
std::{collections::VecDeque, mem, rc::Rc, time::Duration},
};

View file

@ -8,8 +8,8 @@ use {
},
leaks::Tracker,
wire_ei::{
ei_button::{ClientButton, EiButtonRequestHandler, Release, ServerButton},
EiButtonId,
ei_button::{ClientButton, EiButtonRequestHandler, Release, ServerButton},
},
},
std::rc::Rc,

View file

@ -6,8 +6,8 @@ use {
},
leaks::Tracker,
wire_ei::{
ei_callback::{Done, EiCallbackRequestHandler},
EiCallbackId,
ei_callback::{Done, EiCallbackRequestHandler},
},
},
std::rc::Rc,

View file

@ -1,25 +1,25 @@
use {
crate::{
ei::{
EiContext,
ei_client::{EiClient, EiClientError},
ei_ifs::{
ei_callback::EiCallback,
ei_seat::{
EiSeat, EI_CAP_BUTTON, EI_CAP_KEYBOARD, EI_CAP_POINTER,
EI_CAP_POINTER_ABSOLUTE, EI_CAP_SCROLL, EI_CAP_TOUCHSCREEN,
EI_CAP_BUTTON, EI_CAP_KEYBOARD, EI_CAP_POINTER, EI_CAP_POINTER_ABSOLUTE,
EI_CAP_SCROLL, EI_CAP_TOUCHSCREEN, EiSeat,
},
},
ei_object::{EiObject, EiObjectId, EiVersion},
EiContext,
},
ifs::wl_seat::WlSeatGlobal,
leaks::Tracker,
wire_ei::{
EiButton, EiConnectionId, EiKeyboard, EiPointer, EiPointerAbsolute, EiScroll,
EiTouchscreen,
ei_connection::{
Disconnect, Disconnected, EiConnectionRequestHandler, InvalidObject, Seat,
},
EiButton, EiConnectionId, EiKeyboard, EiPointer, EiPointerAbsolute, EiScroll,
EiTouchscreen,
},
},
std::{cell::Cell, rc::Rc},

View file

@ -13,12 +13,12 @@ use {
scale::Scale,
utils::{copyhashmap::CopyHashMap, syncqueue::SyncQueue},
wire_ei::{
EiDeviceId,
ei_device::{
ClientFrame, ClientStartEmulating, ClientStopEmulating, Destroyed, DeviceType,
Done, EiDeviceRequestHandler, Interface, Paused, Region, RegionMappingId, Release,
Resumed, ServerFrame, ServerStartEmulating,
},
EiDeviceId,
},
},
std::{cell::Cell, rc::Rc},

View file

@ -1,19 +1,19 @@
use {
crate::{
ei::{
EiContext,
ei_client::{EiClient, EiClientError},
ei_ifs::ei_connection::EiConnection,
ei_object::{EiInterface, EiObject, EiVersion, EI_HANDSHAKE_ID},
EiContext,
ei_object::{EI_HANDSHAKE_ID, EiInterface, EiObject, EiVersion},
},
leaks::Tracker,
wire_ei::{
EiHandshake, EiHandshakeId,
ei_handshake::{
ClientHandshakeVersion, ClientInterfaceVersion, Connection, ContextType,
EiHandshakeRequestHandler, Finish, Name, ServerHandshakeVersion,
ServerInterfaceVersion,
},
EiHandshake, EiHandshakeId,
},
},
std::{cell::Cell, rc::Rc},

View file

@ -9,10 +9,10 @@ use {
keyboard::KeyboardState,
leaks::Tracker,
wire_ei::{
EiKeyboardId,
ei_keyboard::{
ClientKey, EiKeyboardRequestHandler, Keymap, Modifiers, Release, ServerKey,
},
EiKeyboardId,
},
},
std::rc::Rc,

View file

@ -6,8 +6,8 @@ use {
},
leaks::Tracker,
wire_ei::{
ei_pingpong::{Done, EiPingpongRequestHandler},
EiPingpongId,
ei_pingpong::{Done, EiPingpongRequestHandler},
},
},
std::rc::Rc,

View file

@ -8,10 +8,10 @@ use {
fixed::Fixed,
leaks::Tracker,
wire_ei::{
EiPointerId,
ei_pointer::{
ClientMotionRelative, EiPointerRequestHandler, Release, ServerMotionRelative,
},
EiPointerId,
},
},
std::rc::Rc,

View file

@ -8,11 +8,11 @@ use {
fixed::Fixed,
leaks::Tracker,
wire_ei::{
EiPointerAbsoluteId,
ei_pointer_absolute::{
ClientMotionAbsolute, EiPointerAbsoluteRequestHandler, Release,
ServerMotionAbsolute,
},
EiPointerAbsoluteId,
},
},
std::rc::Rc,

View file

@ -8,11 +8,11 @@ use {
fixed::Fixed,
leaks::Tracker,
wire_ei::{
EiScrollId,
ei_scroll::{
ClientScroll, ClientScrollDiscrete, ClientScrollStop, EiScrollRequestHandler,
Release, ServerScroll, ServerScrollDiscrete, ServerScrollStop,
},
EiScrollId,
},
},
std::rc::Rc,

View file

@ -2,10 +2,11 @@ use {
crate::{
backend::KeyState,
ei::{
EiContext,
ei_client::{EiClient, EiClientError},
ei_ifs::{
ei_button::EiButton,
ei_device::{EiDevice, EiDeviceInterface, EI_DEVICE_TYPE_VIRTUAL},
ei_device::{EI_DEVICE_TYPE_VIRTUAL, EiDevice, EiDeviceInterface},
ei_keyboard::EiKeyboard,
ei_pointer::EiPointer,
ei_pointer_absolute::EiPointerAbsolute,
@ -13,19 +14,18 @@ use {
ei_touchscreen::EiTouchscreen,
},
ei_object::{EiInterface, EiObject, EiVersion},
EiContext,
},
fixed::Fixed,
ifs::wl_seat::{wl_pointer::PendingScroll, PhysicalKeyboardId, WlSeatGlobal},
ifs::wl_seat::{PhysicalKeyboardId, WlSeatGlobal, wl_pointer::PendingScroll},
keyboard::{DynKeyboardState, KeyboardState, KeyboardStateId},
leaks::Tracker,
tree::Node,
utils::{array, bitflags::BitflagsExt, clonecell::CloneCell},
wire_ei::{
EiSeatId,
ei_seat::{
Bind, Capability, Destroyed, Device, Done, EiSeatRequestHandler, Name, Release,
},
EiSeatId,
},
},
std::{cell::Cell, rc::Rc},

View file

@ -9,11 +9,11 @@ use {
leaks::Tracker,
utils::clonecell::UnsafeCellCloneSafe,
wire_ei::{
EiTouchscreenId,
ei_touchscreen::{
ClientCancel, ClientDown, ClientMotion, ClientUp, EiTouchscreenRequestHandler,
Release, ServerCancel, ServerDown, ServerMotion, ServerUp,
},
EiTouchscreenId,
},
},
std::{collections::hash_map::Entry, rc::Rc},

View file

@ -1,8 +1,8 @@
use {
crate::{
ei::{
ei_client::{EiClient, EiClientError},
EiContext,
ei_client::{EiClient, EiClientError},
},
utils::buffd::EiMsgParser,
wire_ei::EiHandshakeId,