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

@ -3,8 +3,9 @@ use {
ifs::jay_compositor::Cap,
object::Version,
utils::clonecell::CloneCell,
wire::{jay_compositor::*, JayCompositorId},
wire::{JayCompositorId, jay_compositor::*},
wl_usr::{
UsrCon,
usr_ifs::{
usr_jay_ei_session_builder::UsrJayEiSessionBuilder, usr_jay_output::UsrJayOutput,
usr_jay_pointer::UsrJayPointer, usr_jay_render_ctx::UsrJayRenderCtx,
@ -15,7 +16,6 @@ use {
usr_wl_seat::UsrWlSeat,
},
usr_object::UsrObject,
UsrCon,
},
},
std::{cell::Cell, convert::Infallible, rc::Rc},

View file

@ -3,10 +3,10 @@ use {
object::Version,
utils::clonecell::CloneCell,
wire::{
jay_ei_session::{Created, Destroyed, Failed, JayEiSessionEventHandler, Release},
JayEiSessionId,
jay_ei_session::{Created, Destroyed, Failed, JayEiSessionEventHandler, Release},
},
wl_usr::{usr_object::UsrObject, UsrCon},
wl_usr::{UsrCon, usr_object::UsrObject},
},
std::{convert::Infallible, rc::Rc},
uapi::OwnedFd,

View file

@ -2,10 +2,10 @@ use {
crate::{
object::Version,
wire::{
jay_ei_session_builder::{Commit, JayEiSessionBuilderEventHandler, SetAppId},
JayEiSessionBuilderId,
jay_ei_session_builder::{Commit, JayEiSessionBuilderEventHandler, SetAppId},
},
wl_usr::{usr_ifs::usr_jay_ei_session::UsrJayEiSession, usr_object::UsrObject, UsrCon},
wl_usr::{UsrCon, usr_ifs::usr_jay_ei_session::UsrJayEiSession, usr_object::UsrObject},
},
std::{convert::Infallible, rc::Rc},
};

View file

@ -2,8 +2,8 @@ use {
crate::{
object::Version,
utils::clonecell::CloneCell,
wire::{jay_output::*, JayOutputId},
wl_usr::{usr_object::UsrObject, UsrCon},
wire::{JayOutputId, jay_output::*},
wl_usr::{UsrCon, usr_object::UsrObject},
},
std::{convert::Infallible, rc::Rc},
};

View file

@ -2,8 +2,8 @@ use {
crate::{
cursor::KnownCursor,
object::Version,
wire::{jay_pointer::*, JayPointerId},
wl_usr::{usr_object::UsrObject, UsrCon},
wire::{JayPointerId, jay_pointer::*},
wl_usr::{UsrCon, usr_object::UsrObject},
},
std::{convert::Infallible, rc::Rc},
};

View file

@ -6,8 +6,8 @@ use {
object::Version,
utils::clonecell::CloneCell,
video::Modifier,
wire::{jay_render_ctx::*, JayRenderCtxId},
wl_usr::{usr_object::UsrObject, UsrCon},
wire::{JayRenderCtxId, jay_render_ctx::*},
wl_usr::{UsrCon, usr_object::UsrObject},
},
ahash::AHashMap,
std::{cell::RefCell, convert::Infallible, rc::Rc},

View file

@ -4,14 +4,14 @@ use {
object::Version,
utils::clonecell::CloneCell,
video::dmabuf::{DmaBuf, DmaBufPlane, PlaneVec},
wire::{jay_screencast::*, JayScreencastId},
wire::{JayScreencastId, jay_screencast::*},
wl_usr::{
UsrCon,
usr_ifs::{
usr_jay_output::UsrJayOutput, usr_jay_toplevel::UsrJayToplevel,
usr_jay_workspace::UsrJayWorkspace, usr_wl_buffer::UsrWlBuffer,
},
usr_object::UsrObject,
UsrCon,
},
},
std::{cell::RefCell, mem, ops::DerefMut, rc::Rc},

View file

@ -3,11 +3,11 @@ use {
ifs::jay_toplevel::ID_SINCE,
object::Version,
utils::clonecell::CloneCell,
wire::{jay_select_toplevel::*, JaySelectToplevelId},
wire::{JaySelectToplevelId, jay_select_toplevel::*},
wl_usr::{
UsrCon,
usr_ifs::usr_jay_toplevel::{UsrJayToplevel, UsrJayToplevelOwner},
usr_object::UsrObject,
UsrCon,
},
},
std::{convert::Infallible, rc::Rc},

View file

@ -2,11 +2,11 @@ use {
crate::{
object::Version,
utils::clonecell::CloneCell,
wire::{jay_select_workspace::*, JaySelectWorkspaceId},
wire::{JaySelectWorkspaceId, jay_select_workspace::*},
wl_usr::{
UsrCon,
usr_ifs::usr_jay_workspace::{UsrJayWorkspace, UsrJayWorkspaceOwner},
usr_object::UsrObject,
UsrCon,
},
},
std::{convert::Infallible, rc::Rc},

View file

@ -2,8 +2,8 @@ use {
crate::{
object::Version,
utils::clonecell::CloneCell,
wire::{jay_toplevel::*, JayToplevelId},
wl_usr::{usr_object::UsrObject, UsrCon},
wire::{JayToplevelId, jay_toplevel::*},
wl_usr::{UsrCon, usr_object::UsrObject},
},
std::{cell::RefCell, convert::Infallible, rc::Rc},
};

View file

@ -2,8 +2,8 @@ use {
crate::{
object::Version,
utils::clonecell::CloneCell,
wire::{jay_workspace::*, JayWorkspaceId},
wl_usr::{usr_object::UsrObject, UsrCon},
wire::{JayWorkspaceId, jay_workspace::*},
wl_usr::{UsrCon, usr_object::UsrObject},
},
std::{
cell::{Cell, RefCell},

View file

@ -2,8 +2,8 @@ use {
crate::{
object::Version,
utils::clonecell::CloneCell,
wire::{jay_workspace_watcher::*, JayWorkspaceWatcherId},
wl_usr::{usr_ifs::usr_jay_workspace::UsrJayWorkspace, usr_object::UsrObject, UsrCon},
wire::{JayWorkspaceWatcherId, jay_workspace_watcher::*},
wl_usr::{UsrCon, usr_ifs::usr_jay_workspace::UsrJayWorkspace, usr_object::UsrObject},
},
std::{convert::Infallible, ops::Deref, rc::Rc},
};

View file

@ -3,8 +3,8 @@ use {
object::Version,
utils::clonecell::CloneCell,
video::dmabuf::DmaBuf,
wire::{zwp_linux_buffer_params_v1::*, ZwpLinuxBufferParamsV1Id},
wl_usr::{usr_ifs::usr_wl_buffer::UsrWlBuffer, usr_object::UsrObject, UsrCon},
wire::{ZwpLinuxBufferParamsV1Id, zwp_linux_buffer_params_v1::*},
wl_usr::{UsrCon, usr_ifs::usr_wl_buffer::UsrWlBuffer, usr_object::UsrObject},
},
std::{convert::Infallible, ops::Deref, rc::Rc},
};

View file

@ -1,14 +1,14 @@
use {
crate::{
format::{formats, Format},
format::{Format, formats},
object::Version,
utils::clonecell::CloneCell,
wire::{
zwp_linux_dmabuf_v1::{self, *},
ZwpLinuxDmabufV1Id,
zwp_linux_dmabuf_v1::{self, *},
},
wl_usr::{
usr_ifs::usr_linux_buffer_params::UsrLinuxBufferParams, usr_object::UsrObject, UsrCon,
UsrCon, usr_ifs::usr_linux_buffer_params::UsrLinuxBufferParams, usr_object::UsrObject,
},
},
std::{convert::Infallible, rc::Rc},

View file

@ -2,8 +2,8 @@ use {
crate::{
object::Version,
utils::clonecell::CloneCell,
wire::{wl_buffer::*, WlBufferId},
wl_usr::{usr_object::UsrObject, UsrCon},
wire::{WlBufferId, wl_buffer::*},
wl_usr::{UsrCon, usr_object::UsrObject},
},
std::{convert::Infallible, rc::Rc},
};

View file

@ -1,8 +1,8 @@
use {
crate::{
object::Version,
wire::{wl_callback::*, WlCallbackId},
wl_usr::{usr_object::UsrObject, UsrCon},
wire::{WlCallbackId, wl_callback::*},
wl_usr::{UsrCon, usr_object::UsrObject},
},
std::{cell::Cell, convert::Infallible, rc::Rc},
};

View file

@ -2,10 +2,10 @@ use {
crate::{
object::Version,
wire::{
wl_compositor::{CreateSurface, WlCompositorEventHandler},
WlCompositorId,
wl_compositor::{CreateSurface, WlCompositorEventHandler},
},
wl_usr::{usr_ifs::usr_wl_surface::UsrWlSurface, usr_object::UsrObject, UsrCon},
wl_usr::{UsrCon, usr_ifs::usr_wl_surface::UsrWlSurface, usr_object::UsrObject},
},
std::{convert::Infallible, rc::Rc},
};

View file

@ -1,8 +1,8 @@
use {
crate::{
object::Version,
wire::{wl_display::*, WlDisplayId},
wl_usr::{usr_object::UsrObject, UsrCon},
wire::{WlDisplayId, wl_display::*},
wl_usr::{UsrCon, usr_object::UsrObject},
},
std::rc::Rc,
};

View file

@ -2,8 +2,8 @@ use {
crate::{
object::Version,
utils::clonecell::CloneCell,
wire::{wl_output::*, WlOutputId},
wl_usr::{usr_object::UsrObject, UsrCon},
wire::{WlOutputId, wl_output::*},
wl_usr::{UsrCon, usr_object::UsrObject},
},
std::{cell::RefCell, convert::Infallible, rc::Rc},
};

View file

@ -3,8 +3,8 @@ use {
ifs::wl_seat::wl_pointer::PendingScroll,
object::Version,
utils::clonecell::CloneCell,
wire::{wl_pointer::*, WlPointerId},
wl_usr::{usr_ifs::usr_wl_surface::UsrWlSurface, usr_object::UsrObject, UsrCon},
wire::{WlPointerId, wl_pointer::*},
wl_usr::{UsrCon, usr_ifs::usr_wl_surface::UsrWlSurface, usr_object::UsrObject},
},
std::{cell::Cell, convert::Infallible, rc::Rc},
};

View file

@ -2,8 +2,8 @@ use {
crate::{
object::Version,
utils::clonecell::CloneCell,
wire::{wl_registry::*, WlRegistryId},
wl_usr::{usr_object::UsrObject, UsrCon},
wire::{WlRegistryId, wl_registry::*},
wl_usr::{UsrCon, usr_object::UsrObject},
},
std::{convert::Infallible, rc::Rc},
};

View file

@ -2,8 +2,8 @@ use {
crate::{
object::Version,
utils::clonecell::CloneCell,
wire::{wl_seat::*, WlSeatId},
wl_usr::{usr_ifs::usr_wl_pointer::UsrWlPointer, usr_object::UsrObject, UsrCon},
wire::{WlSeatId, wl_seat::*},
wl_usr::{UsrCon, usr_ifs::usr_wl_pointer::UsrWlPointer, usr_object::UsrObject},
},
std::{cell::Cell, convert::Infallible, rc::Rc},
};

View file

@ -3,8 +3,8 @@ use {
format::{formats, map_wayland_format_id},
object::Version,
utils::copyhashmap::CopyHashMap,
wire::{wl_shm::*, WlShmId},
wl_usr::{usr_ifs::usr_wl_shm_pool::UsrWlShmPool, usr_object::UsrObject, UsrCon},
wire::{WlShmId, wl_shm::*},
wl_usr::{UsrCon, usr_ifs::usr_wl_shm_pool::UsrWlShmPool, usr_object::UsrObject},
},
std::{convert::Infallible, rc::Rc},
uapi::OwnedFd,

View file

@ -1,8 +1,8 @@
use {
crate::{
object::Version,
wire::{wl_shm_pool::*, WlShmPoolId},
wl_usr::{usr_object::UsrObject, UsrCon},
wire::{WlShmPoolId, wl_shm_pool::*},
wl_usr::{UsrCon, usr_object::UsrObject},
},
std::{convert::Infallible, rc::Rc},
};

View file

@ -1,11 +1,11 @@
use {
crate::{
object::Version,
wire::{wl_surface::*, WlSurfaceId},
wire::{WlSurfaceId, wl_surface::*},
wl_usr::{
UsrCon,
usr_ifs::{usr_wl_buffer::UsrWlBuffer, usr_wl_callback::UsrWlCallback},
usr_object::UsrObject,
UsrCon,
},
},
std::{convert::Infallible, rc::Rc},

View file

@ -1,14 +1,14 @@
use {
crate::{
object::Version,
wire::{zwlr_layer_shell_v1::*, ZwlrLayerShellV1Id},
wire::{ZwlrLayerShellV1Id, zwlr_layer_shell_v1::*},
wl_usr::{
UsrCon,
usr_ifs::{
usr_wl_output::UsrWlOutput, usr_wl_surface::UsrWlSurface,
usr_wlr_layer_surface::UsrWlrLayerSurface,
},
usr_object::UsrObject,
UsrCon,
},
},
std::{convert::Infallible, rc::Rc},

View file

@ -2,8 +2,8 @@ use {
crate::{
object::Version,
utils::clonecell::CloneCell,
wire::{zwlr_layer_surface_v1::*, ZwlrLayerSurfaceV1Id},
wl_usr::{usr_object::UsrObject, UsrCon},
wire::{ZwlrLayerSurfaceV1Id, zwlr_layer_surface_v1::*},
wl_usr::{UsrCon, usr_object::UsrObject},
},
std::{convert::Infallible, rc::Rc},
};

View file

@ -2,8 +2,8 @@ use {
crate::{
object::Version,
utils::clonecell::CloneCell,
wire::{wp_fractional_scale_v1::*, WpFractionalScaleV1Id},
wl_usr::{usr_object::UsrObject, UsrCon},
wire::{WpFractionalScaleV1Id, wp_fractional_scale_v1::*},
wl_usr::{UsrCon, usr_object::UsrObject},
},
std::{convert::Infallible, rc::Rc},
};

View file

@ -1,13 +1,13 @@
use {
crate::{
object::Version,
wire::{wp_fractional_scale_manager_v1::*, WpFractionalScaleManagerV1Id},
wire::{WpFractionalScaleManagerV1Id, wp_fractional_scale_manager_v1::*},
wl_usr::{
UsrCon,
usr_ifs::{
usr_wl_surface::UsrWlSurface, usr_wp_fractional_scale::UsrWpFractionalScale,
},
usr_object::UsrObject,
UsrCon,
},
},
std::{convert::Infallible, rc::Rc},

View file

@ -2,8 +2,8 @@ use {
crate::{
fixed::Fixed,
object::Version,
wire::{wp_viewport::*, WpViewportId},
wl_usr::{usr_object::UsrObject, UsrCon},
wire::{WpViewportId, wp_viewport::*},
wl_usr::{UsrCon, usr_object::UsrObject},
},
std::{convert::Infallible, rc::Rc},
};

View file

@ -1,11 +1,11 @@
use {
crate::{
object::Version,
wire::{wp_viewporter::*, WpViewporterId},
wire::{WpViewporterId, wp_viewporter::*},
wl_usr::{
UsrCon,
usr_ifs::{usr_wl_surface::UsrWlSurface, usr_wp_viewport::UsrWpViewport},
usr_object::UsrObject,
UsrCon,
},
},
std::{convert::Infallible, rc::Rc},

View file

@ -2,8 +2,8 @@ use {
crate::{
object::Version,
utils::clonecell::CloneCell,
wire::{zwlr_screencopy_frame_v1::*, ZwlrScreencopyFrameV1Id},
wl_usr::{usr_ifs::usr_wl_buffer::UsrWlBuffer, usr_object::UsrObject, UsrCon},
wire::{ZwlrScreencopyFrameV1Id, zwlr_screencopy_frame_v1::*},
wl_usr::{UsrCon, usr_ifs::usr_wl_buffer::UsrWlBuffer, usr_object::UsrObject},
},
std::{convert::Infallible, rc::Rc},
};

View file

@ -1,13 +1,13 @@
use {
crate::{
object::Version,
wire::{zwlr_screencopy_manager_v1::*, ZwlrScreencopyManagerV1Id},
wire::{ZwlrScreencopyManagerV1Id, zwlr_screencopy_manager_v1::*},
wl_usr::{
UsrCon,
usr_ifs::{
usr_wl_output::UsrWlOutput, usr_zwlr_screencopy_frame::UsrZwlrScreencopyFrame,
},
usr_object::UsrObject,
UsrCon,
},
},
std::{convert::Infallible, rc::Rc},