entailz/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

22
jay-config/src/_private/client.rs
View file

@ -3,50 +3,50 @@
use {
crate::{
_private::{
bincode_ops,
Config, ConfigEntry, ConfigEntryGen, PollableId, VERSION, WireMode, bincode_ops,
ipc::{
ClientMessage, InitMessage, Response, ServerFeature, ServerMessage, WorkspaceSource,
},
logging, Config, ConfigEntry, ConfigEntryGen, PollableId, WireMode, VERSION,
logging,
},
Axis, Direction, ModifiedKeySym, PciId, Workspace,
exec::Command,
input::{
acceleration::AccelProfile, capability::Capability, FocusFollowsMouseMode, InputDevice,
Seat, SwitchEvent,
FocusFollowsMouseMode, InputDevice, Seat, SwitchEvent, acceleration::AccelProfile,
capability::Capability,
},
keyboard::{
Keymap,
mods::{Modifiers, RELEASE},
syms::KeySym,
Keymap,
},
logging::LogLevel,
tasks::{JoinHandle, JoinSlot},
theme::{colors::Colorable, sized::Resizable, Color},
theme::{Color, colors::Colorable, sized::Resizable},
timer::Timer,
video::{
connector_type::{ConnectorType, CON_UNKNOWN},
Connector, DrmDevice, Format, GfxApi, Mode, TearingMode, Transform, VrrMode,
connector_type::{CON_UNKNOWN, ConnectorType},
},
xwayland::XScalingMode,
Axis, Direction, ModifiedKeySym, PciId, Workspace,
},
bincode::Options,
futures_util::task::ArcWake,
std::{
cell::{Cell, RefCell},
collections::{hash_map::Entry, HashMap, VecDeque},
collections::{HashMap, VecDeque, hash_map::Entry},
future::Future,
mem,
ops::Deref,
os::fd::IntoRawFd,
panic::{catch_unwind, AssertUnwindSafe},
panic::{AssertUnwindSafe, catch_unwind},
pin::Pin,
ptr,
rc::Rc,
slice,
sync::{
atomic::{AtomicBool, Ordering::Relaxed},
Arc, Mutex,
atomic::{AtomicBool, Ordering::Relaxed},
},
task::{Context, Poll, Waker},
time::Duration,

16
jay-config/src/_private/ipc.rs
View file

@ -1,19 +1,19 @@
use {
crate::{
_private::{PollableId, WireMode},
Axis, Direction, PciId, Workspace,
input::{
acceleration::AccelProfile, capability::Capability, FocusFollowsMouseMode, InputDevice,
Seat, SwitchEvent,
FocusFollowsMouseMode, InputDevice, Seat, SwitchEvent, acceleration::AccelProfile,
capability::Capability,
},
keyboard::{mods::Modifiers, syms::KeySym, Keymap},
keyboard::{Keymap, mods::Modifiers, syms::KeySym},
logging::LogLevel,
theme::{colors::Colorable, sized::Resizable, Color},
theme::{Color, colors::Colorable, sized::Resizable},
timer::Timer,
video::{
connector_type::ConnectorType, Connector, DrmDevice, Format, GfxApi, TearingMode,
Transform, VrrMode,
Connector, DrmDevice, Format, GfxApi, TearingMode, Transform, VrrMode,
connector_type::ConnectorType,
},
Axis, Direction, PciId, Workspace,
_private::{PollableId, WireMode},
xwayland::XScalingMode,
},
serde::{Deserialize, Serialize},

6
jay-config/src/input.rs
View file

@ -5,10 +5,10 @@ pub mod capability;
use {
crate::{
input::{acceleration::AccelProfile, capability::Capability},
keyboard::{mods::Modifiers, Keymap},
_private::{DEFAULT_SEAT_NAME, ipc::WorkspaceSource},
Axis, Direction, ModifiedKeySym, Workspace,
_private::{ipc::WorkspaceSource, DEFAULT_SEAT_NAME},
input::{acceleration::AccelProfile, capability::Capability},
keyboard::{Keymap, mods::Modifiers},
video::Connector,
},
serde::{Deserialize, Serialize},

4
jay-config/src/io.rs
View file

@ -2,13 +2,13 @@
use {
crate::_private::PollableId,
futures_util::{io::AsyncRead, AsyncWrite},
futures_util::{AsyncWrite, io::AsyncRead},
std::{
future::poll_fn,
io::{self, ErrorKind, IoSlice, IoSliceMut, Read, Write},
os::fd::{AsFd, AsRawFd},
pin::Pin,
task::{ready, Context, Poll},
task::{Context, Poll, ready},
},
thiserror::Error,
uapi::c,

2
jay-config/src/keyboard/mods.rs
View file

@ -1,7 +1,7 @@
//! Keyboard modifiers
use {
crate::{keyboard::syms::KeySym, ModifiedKeySym},
crate::{ModifiedKeySym, keyboard::syms::KeySym},
serde::{Deserialize, Serialize},
std::ops::{BitAnd, BitAndAssign, BitOr, BitOrAssign},
};

4
jay-config/src/macros.rs
View file

@ -30,9 +30,7 @@ macro_rules! try_get {
}
macro_rules! get {
() => {{
get!(Default::default())
}};
() => {{ get!(Default::default()) }};
($def:expr) => {{
let client = unsafe {
let client = crate::_private::client::CLIENT.with(|client| client.get());

4
jay-config/src/status.rs
View file

@ -4,10 +4,10 @@ use {
crate::{exec::Command, io::Async, tasks::spawn},
bstr::ByteSlice,
error_reporter::Report,
futures_util::{io::BufReader, AsyncBufReadExt},
futures_util::{AsyncBufReadExt, io::BufReader},
serde::Deserialize,
std::borrow::BorrowMut,
uapi::{c, OwnedFd},
uapi::{OwnedFd, c},
};
/// Sets the status text.

5
jay-config/src/theme.rs
View file

@ -75,7 +75,10 @@ impl Color {
if !validate_f32_all([r, g, b, a]) {
Self::BLACK
} else if r > a || g > a || b > a {
log::warn!("f32 values {:?} are not valid valid for a premultiplied color. Using solid black instead.", [r, g, b, a]);
log::warn!(
"f32 values {:?} are not valid valid for a premultiplied color. Using solid black instead.",
[r, g, b, a]
);
Self::BLACK
} else {
Self { r, g, b, a }

14
jay-config/src/video.rs
View file

@ -2,14 +2,14 @@
use {
crate::{
video::connector_type::{
ConnectorType, CON_9PIN_DIN, CON_COMPONENT, CON_COMPOSITE, CON_DISPLAY_PORT, CON_DPI,
CON_DSI, CON_DVIA, CON_DVID, CON_DVII, CON_EDP, CON_EMBEDDED_WINDOW, CON_HDMIA,
CON_HDMIB, CON_LVDS, CON_SPI, CON_SVIDEO, CON_TV, CON_UNKNOWN, CON_USB, CON_VGA,
CON_VIRTUAL, CON_WRITEBACK,
},
PciId,
_private::WireMode,
PciId,
video::connector_type::{
CON_9PIN_DIN, CON_COMPONENT, CON_COMPOSITE, CON_DISPLAY_PORT, CON_DPI, CON_DSI,
CON_DVIA, CON_DVID, CON_DVII, CON_EDP, CON_EMBEDDED_WINDOW, CON_HDMIA, CON_HDMIB,
CON_LVDS, CON_SPI, CON_SVIDEO, CON_TV, CON_UNKNOWN, CON_USB, CON_VGA, CON_VIRTUAL,
CON_WRITEBACK, ConnectorType,
},
},
serde::{Deserialize, Serialize},
std::{str::FromStr, time::Duration},