kossLAN/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

all: set rust edition to 2024

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

6
src/ifs/ipc/data_control/ext_data_control_device_v1.rs
View file

@ -6,8 +6,8 @@ use {
ext_data_control_offer_v1::ExtDataControlOfferV1,
ext_data_control_source_v1::ExtDataControlSourceV1,
private::{
logic::{self, DataControlError},
DataControlDevice, DataControlDeviceData, DataControlIpc, DataControlOfferData,
logic::{self, DataControlError},
},
},
wl_seat::WlSeatGlobal,
@ -15,8 +15,8 @@ use {
leaks::Tracker,
object::{Object, Version},
wire::{
ext_data_control_device_v1::*, ExtDataControlDeviceV1Id, ExtDataControlOfferV1Id,
ExtDataControlSourceV1Id,
ExtDataControlDeviceV1Id, ExtDataControlOfferV1Id, ExtDataControlSourceV1Id,
ext_data_control_device_v1::*,
},
},
std::rc::Rc,

12
src/ifs/ipc/data_control/ext_data_control_manager_v1.rs
View file

@ -1,17 +1,17 @@
use {
crate::{
client::{Client, ClientCaps, ClientError, CAP_DATA_CONTROL_MANAGER},
client::{CAP_DATA_CONTROL_MANAGER, Client, ClientCaps, ClientError},
globals::{Global, GlobalName},
ifs::ipc::{
data_control::{
ext_data_control_device_v1::ExtDataControlDeviceV1,
ext_data_control_source_v1::ExtDataControlSourceV1, DynDataControlDevice,
},
IpcLocation,
data_control::{
DynDataControlDevice, ext_data_control_device_v1::ExtDataControlDeviceV1,
ext_data_control_source_v1::ExtDataControlSourceV1,
},
},
leaks::Tracker,
object::{Object, Version},
wire::{ext_data_control_manager_v1::*, ExtDataControlManagerV1Id},
wire::{ExtDataControlManagerV1Id, ext_data_control_manager_v1::*},
},
std::rc::Rc,
thiserror::Error,

4
src/ifs/ipc/data_control/ext_data_control_offer_v1.rs
View file

@ -3,13 +3,13 @@ use {
ifs::ipc::data_control::{
ext_data_control_device_v1::ExtDataControlIpc,
private::{
logic::{self, DataControlError},
DataControlOffer, DataControlOfferData,
logic::{self, DataControlError},
},
},
leaks::Tracker,
object::Object,
wire::{ext_data_control_offer_v1::*, ExtDataControlOfferV1Id},
wire::{ExtDataControlOfferV1Id, ext_data_control_offer_v1::*},
},
std::rc::Rc,
thiserror::Error,

6
src/ifs/ipc/data_control/ext_data_control_source_v1.rs
View file

@ -2,18 +2,18 @@ use {
crate::{
client::Client,
ifs::ipc::{
IpcLocation, SourceData,
data_control::{
ext_data_control_device_v1::ExtDataControlIpc,
private::{
logic::{self, DataControlError},
DataControlSource, DataControlSourceData,
logic::{self, DataControlError},
},
},
IpcLocation, SourceData,
},
leaks::Tracker,
object::{Object, Version},
wire::{ext_data_control_source_v1::*, ExtDataControlSourceV1Id},
wire::{ExtDataControlSourceV1Id, ext_data_control_source_v1::*},
},
std::{cell::Cell, rc::Rc},
thiserror::Error,

9
src/ifs/ipc/data_control/private.rs
View file

@ -3,12 +3,11 @@ use {
client::{Client, ClientError, ClientId, WaylandObject, WaylandObjectLookup},
ifs::{
ipc::{
cancel_offer, cancel_offers,
DataOffer, DataOfferId, DataSource, DeviceData, DynDataOffer, DynDataSource,
IpcLocation, IpcVtable, OfferData, Role, SourceData, cancel_offer, cancel_offers,
data_control::{DataControlDeviceId, DynDataControlDevice},
detach_seat, offer_source_to_data_control_device, offer_source_to_x,
x_data_device::{XClipboardIpc, XIpcDevice, XPrimarySelectionIpc},
DataOffer, DataOfferId, DataSource, DeviceData, DynDataOffer, DynDataSource,
IpcLocation, IpcVtable, OfferData, Role, SourceData,
},
wl_seat::WlSeatGlobal,
},
@ -294,14 +293,14 @@ pub mod logic {
client::ClientError,
ifs::{
ipc::{
add_data_source_mime_type, break_device_loops, break_offer_loops,
IpcLocation, add_data_source_mime_type, break_device_loops, break_offer_loops,
break_source_loops,
data_control::private::{
Clipboard, DataControlDevice, DataControlOffer, DataControlSource,
PrimarySelection, Source, SourceId,
},
destroy_data_device, destroy_data_offer, destroy_data_source,
receive_data_offer, IpcLocation,
receive_data_offer,
},
wl_seat::WlSeatError,
},

6
src/ifs/ipc/data_control/zwlr_data_control_device_v1.rs
View file

@ -4,8 +4,8 @@ use {
ifs::{
ipc::data_control::{
private::{
logic::{self, DataControlError},
DataControlDevice, DataControlDeviceData, DataControlIpc, DataControlOfferData,
logic::{self, DataControlError},
},
zwlr_data_control_offer_v1::ZwlrDataControlOfferV1,
zwlr_data_control_source_v1::ZwlrDataControlSourceV1,
@ -15,8 +15,8 @@ use {
leaks::Tracker,
object::{Object, Version},
wire::{
zwlr_data_control_device_v1::*, ZwlrDataControlDeviceV1Id, ZwlrDataControlOfferV1Id,
ZwlrDataControlSourceV1Id,
ZwlrDataControlDeviceV1Id, ZwlrDataControlOfferV1Id, ZwlrDataControlSourceV1Id,
zwlr_data_control_device_v1::*,
},
},
std::rc::Rc,

12
src/ifs/ipc/data_control/zwlr_data_control_manager_v1.rs
View file

@ -1,17 +1,17 @@
use {
crate::{
client::{Client, ClientCaps, ClientError, CAP_DATA_CONTROL_MANAGER},
client::{CAP_DATA_CONTROL_MANAGER, Client, ClientCaps, ClientError},
globals::{Global, GlobalName},
ifs::ipc::{
data_control::{
zwlr_data_control_device_v1::ZwlrDataControlDeviceV1,
zwlr_data_control_source_v1::ZwlrDataControlSourceV1, DynDataControlDevice,
},
IpcLocation,
data_control::{
DynDataControlDevice, zwlr_data_control_device_v1::ZwlrDataControlDeviceV1,
zwlr_data_control_source_v1::ZwlrDataControlSourceV1,
},
},
leaks::Tracker,
object::{Object, Version},
wire::{zwlr_data_control_manager_v1::*, ZwlrDataControlManagerV1Id},
wire::{ZwlrDataControlManagerV1Id, zwlr_data_control_manager_v1::*},
},
std::rc::Rc,
thiserror::Error,

4
src/ifs/ipc/data_control/zwlr_data_control_offer_v1.rs
View file

@ -2,14 +2,14 @@ use {
crate::{
ifs::ipc::data_control::{
private::{
logic::{self, DataControlError},
DataControlOffer, DataControlOfferData,
logic::{self, DataControlError},
},
zwlr_data_control_device_v1::WlrDataControlIpc,
},
leaks::Tracker,
object::Object,
wire::{zwlr_data_control_offer_v1::*, ZwlrDataControlOfferV1Id},
wire::{ZwlrDataControlOfferV1Id, zwlr_data_control_offer_v1::*},
},
std::rc::Rc,
thiserror::Error,

6
src/ifs/ipc/data_control/zwlr_data_control_source_v1.rs
View file

@ -2,18 +2,18 @@ use {
crate::{
client::Client,
ifs::ipc::{
IpcLocation, SourceData,
data_control::{
private::{
logic::{self, DataControlError},
DataControlSource, DataControlSourceData,
logic::{self, DataControlError},
},
zwlr_data_control_device_v1::WlrDataControlIpc,
},
IpcLocation, SourceData,
},
leaks::Tracker,
object::{Object, Version},
wire::{zwlr_data_control_source_v1::*, ZwlrDataControlSourceV1Id},
wire::{ZwlrDataControlSourceV1Id, zwlr_data_control_source_v1::*},
},
std::{cell::Cell, rc::Rc},
thiserror::Error,

7
src/ifs/ipc/wl_data_device.rs
View file

@ -4,16 +4,15 @@ use {
fixed::Fixed,
ifs::{
ipc::{
break_device_loops, destroy_data_device, wl_data_offer::WlDataOffer,
wl_data_source::WlDataSource, DeviceData, IpcVtable, IterableIpcVtable, OfferData,
Role,
DeviceData, IpcVtable, IterableIpcVtable, OfferData, Role, break_device_loops,
destroy_data_device, wl_data_offer::WlDataOffer, wl_data_source::WlDataSource,
},
wl_seat::{WlSeatError, WlSeatGlobal},
wl_surface::WlSurfaceError,
},
leaks::Tracker,
object::{Object, Version},
wire::{wl_data_device::*, WlDataDeviceId, WlDataOfferId, WlSurfaceId},
wire::{WlDataDeviceId, WlDataOfferId, WlSurfaceId, wl_data_device::*},
},
std::rc::Rc,
thiserror::Error,

2
src/ifs/ipc/wl_data_device_manager.rs
View file

@ -5,7 +5,7 @@ use {
ifs::ipc::{wl_data_device::WlDataDevice, wl_data_source::WlDataSource},
leaks::Tracker,
object::{Object, Version},
wire::{wl_data_device_manager::*, WlDataDeviceManagerId},
wire::{WlDataDeviceManagerId, wl_data_device_manager::*},
},
std::rc::Rc,
thiserror::Error,

8
src/ifs/ipc/wl_data_offer.rs
View file

@ -4,18 +4,18 @@ use {
fixed::Fixed,
ifs::{
ipc::{
break_offer_loops, cancel_offer, destroy_data_offer, receive_data_offer,
DataOffer, DataOfferId, DynDataOffer, OFFER_STATE_ACCEPTED, OFFER_STATE_DROPPED,
OFFER_STATE_FINISHED, OfferData, Role, SOURCE_STATE_FINISHED, break_offer_loops,
cancel_offer, destroy_data_offer, receive_data_offer,
wl_data_device::{ClipboardIpc, WlDataDevice},
wl_data_device_manager::DND_ALL,
DataOffer, DataOfferId, DynDataOffer, OfferData, Role, OFFER_STATE_ACCEPTED,
OFFER_STATE_DROPPED, OFFER_STATE_FINISHED, SOURCE_STATE_FINISHED,
},
wl_seat::WlSeatGlobal,
},
leaks::Tracker,
object::Object,
utils::bitflags::BitflagsExt,
wire::{wl_data_offer::*, WlDataOfferId, WlSurfaceId},
wire::{WlDataOfferId, WlSurfaceId, wl_data_offer::*},
},
std::rc::Rc,
thiserror::Error,

7
src/ifs/ipc/wl_data_source.rs
View file

@ -3,14 +3,13 @@ use {
client::{Client, ClientError},
ifs::{
ipc::{
DataSource, DynDataOffer, DynDataSource, OFFER_STATE_ACCEPTED, OFFER_STATE_DROPPED,
SOURCE_STATE_CANCELLED, SOURCE_STATE_DROPPED, SharedState, SourceData,
add_data_source_mime_type, break_source_loops, cancel_offers, destroy_data_source,
detach_seat, offer_source_to_x,
wl_data_device::ClipboardIpc,
wl_data_device_manager::{DND_ALL, DND_NONE},
x_data_device::{XClipboardIpc, XIpcDevice},
DataSource, DynDataOffer, DynDataSource, SharedState, SourceData,
OFFER_STATE_ACCEPTED, OFFER_STATE_DROPPED, SOURCE_STATE_CANCELLED,
SOURCE_STATE_DROPPED,
},
wl_seat::WlSeatGlobal,
xdg_toplevel_drag_v1::XdgToplevelDragV1,
@ -18,7 +17,7 @@ use {
leaks::Tracker,
object::{Object, Version},
utils::{bitflags::BitflagsExt, cell_ext::CellExt, clonecell::CloneCell},
wire::{wl_data_source::*, WlDataSourceId},
wire::{WlDataSourceId, wl_data_source::*},
},
std::rc::Rc,
thiserror::Error,

6
src/ifs/ipc/x_data_device.rs
View file

@ -3,16 +3,16 @@ use {
client::{Client, ClientError},
ifs::{
ipc::{
x_data_offer::XDataOffer, x_data_source::XDataSource, DeviceData, IpcLocation,
IpcVtable, OfferData, Role,
DeviceData, IpcLocation, IpcVtable, OfferData, Role, x_data_offer::XDataOffer,
x_data_source::XDataSource,
},
wl_seat::WlSeatGlobal,
},
state::State,
xwayland::XWaylandEvent,
},
std::rc::Rc,
XWaylandEvent::IpcSetOffer,
std::rc::Rc,
};
linear_ids!(XIpcDeviceIds, XIpcDeviceId, u64);

5
src/ifs/ipc/x_data_offer.rs
View file

@ -3,17 +3,16 @@ use {
client::ClientId,
ifs::{
ipc::{
cancel_offer,
DataOffer, DataOfferId, DynDataOffer, IpcLocation, OfferData, cancel_offer,
x_data_device::{XClipboardIpc, XIpcDevice, XPrimarySelectionIpc},
DataOffer, DataOfferId, DynDataOffer, IpcLocation, OfferData,
},
wl_seat::WlSeatGlobal,
},
leaks::Tracker,
xwayland::XWaylandEvent,
},
std::rc::Rc,
XWaylandEvent::IpcAddOfferMimeType,
std::rc::Rc,
};
pub struct XDataOffer {

4
src/ifs/ipc/x_data_source.rs
View file

@ -2,8 +2,8 @@ use {
crate::{
ifs::{
ipc::{
cancel_offers, detach_seat, x_data_device::XIpcDevice, DataSource, DynDataSource,
IpcLocation, SourceData,
DataSource, DynDataSource, IpcLocation, SourceData, cancel_offers, detach_seat,
x_data_device::XIpcDevice,
},
wl_seat::WlSeatGlobal,
},

2
src/ifs/ipc/zwp_primary_selection_device_manager_v1.rs
View file

@ -8,7 +8,7 @@ use {
},
leaks::Tracker,
object::{Object, Version},
wire::{zwp_primary_selection_device_manager_v1::*, ZwpPrimarySelectionDeviceManagerV1Id},
wire::{ZwpPrimarySelectionDeviceManagerV1Id, zwp_primary_selection_device_manager_v1::*},
},
std::rc::Rc,
thiserror::Error,

11
src/ifs/ipc/zwp_primary_selection_device_v1.rs
View file

@ -3,18 +3,17 @@ use {
client::{Client, ClientError, ClientId},
ifs::{
ipc::{
break_device_loops, destroy_data_device,
zwp_primary_selection_offer_v1::ZwpPrimarySelectionOfferV1,
zwp_primary_selection_source_v1::ZwpPrimarySelectionSourceV1, DeviceData,
IpcVtable, IterableIpcVtable, OfferData, Role,
DeviceData, IpcVtable, IterableIpcVtable, OfferData, Role, break_device_loops,
destroy_data_device, zwp_primary_selection_offer_v1::ZwpPrimarySelectionOfferV1,
zwp_primary_selection_source_v1::ZwpPrimarySelectionSourceV1,
},
wl_seat::{WlSeatError, WlSeatGlobal},
},
leaks::Tracker,
object::{Object, Version},
wire::{
zwp_primary_selection_device_v1::*, ZwpPrimarySelectionDeviceV1Id,
ZwpPrimarySelectionOfferV1Id,
ZwpPrimarySelectionDeviceV1Id, ZwpPrimarySelectionOfferV1Id,
zwp_primary_selection_device_v1::*,
},
},
std::rc::Rc,

6
src/ifs/ipc/zwp_primary_selection_offer_v1.rs
View file

@ -3,17 +3,17 @@ use {
client::{Client, ClientError, ClientId},
ifs::{
ipc::{
break_offer_loops, cancel_offer, destroy_data_offer, receive_data_offer,
DataOffer, DataOfferId, DynDataOffer, OfferData, break_offer_loops, cancel_offer,
destroy_data_offer, receive_data_offer,
zwp_primary_selection_device_v1::{
PrimarySelectionIpc, ZwpPrimarySelectionDeviceV1,
},
DataOffer, DataOfferId, DynDataOffer, OfferData,
},
wl_seat::WlSeatGlobal,
},
leaks::Tracker,
object::{Object, Version},
wire::{zwp_primary_selection_offer_v1::*, ZwpPrimarySelectionOfferV1Id},
wire::{ZwpPrimarySelectionOfferV1Id, zwp_primary_selection_offer_v1::*},
},
std::rc::Rc,
thiserror::Error,

8
src/ifs/ipc/zwp_primary_selection_source_v1.rs
View file

@ -3,17 +3,17 @@ use {
client::{Client, ClientError},
ifs::{
ipc::{
add_data_source_mime_type, break_source_loops, cancel_offers, destroy_data_source,
detach_seat, offer_source_to_x,
DataSource, DynDataSource, SourceData, add_data_source_mime_type,
break_source_loops, cancel_offers, destroy_data_source, detach_seat,
offer_source_to_x,
x_data_device::{XIpcDevice, XPrimarySelectionIpc},
zwp_primary_selection_device_v1::PrimarySelectionIpc,
DataSource, DynDataSource, SourceData,
},
wl_seat::WlSeatGlobal,
},
leaks::Tracker,
object::{Object, Version},
wire::{zwp_primary_selection_source_v1::*, ZwpPrimarySelectionSourceV1Id},
wire::{ZwpPrimarySelectionSourceV1Id, zwp_primary_selection_source_v1::*},
},
std::rc::Rc,
thiserror::Error,