Skip to content

Commit 89bf9d5

Browse files
committed
feat: update all dependencies
1 parent e57cc17 commit 89bf9d5

File tree

11 files changed

+770
-141
lines changed

11 files changed

+770
-141
lines changed

Cargo.lock

Lines changed: 722 additions & 92 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -107,44 +107,44 @@ name = "generate"
107107
path = "./src/generate.rs"
108108

109109
[dependencies]
110-
clap = { version = "4.5.29", features = ["derive", "string"] }
111-
clap_complete = "4.5.44"
112-
env_logger = "0.11.6"
110+
clap = { version = "4.5.53", features = ["derive", "string"] }
111+
clap_complete = "4.5.63"
112+
env_logger = "0.11.8"
113113
evdev = { git = "https://github.com/emberian/evdev.git", features = [
114114
"tokio",
115115
], rev = "42b58ee08508b7799322a13bf89121a1d29cf0a2" }
116116
futures = "0.3.31"
117117
glob-match = "0.2.1"
118-
hidapi = "2.6.3"
119-
industrial-io = "0.6.0"
118+
hidapi = "2.6.4"
119+
industrial-io = "0.6.1"
120120
#evdev = { version = "0.12.1", features = ["tokio"] }
121121
inotify = "0.11.0"
122122
# Omit trace logging for release builds
123-
log = { version = "0.4.25", features = [
123+
log = { version = "0.4.29", features = [
124124
"max_level_trace",
125125
"release_max_level_debug",
126126
] }
127-
mio = { version = "1.0.3", features = ["os-poll", "os-ext", "net"] }
128-
nix = { version = "0.29.0", features = ["fs"] }
127+
mio = { version = "1.1.1", features = ["os-poll", "os-ext", "net"] }
128+
nix = { version = "0.30.1", features = ["fs"] }
129129
packed_struct = "0.10.1"
130-
procfs = "0.17.0"
131-
rand = "0.9.0"
132-
ratatui = "0.29.0"
133-
schemars = "0.8.22"
134-
serde = { version = "1.0.217", features = ["derive"] }
135-
serde_json = "1.0.140"
130+
procfs = "0.18.0"
131+
rand = "0.9.2"
132+
ratatui = "0.30.0"
133+
schemars = "1.2.0"
134+
serde = { version = "1.0.228", features = ["derive"] }
135+
serde_json = "1.0.148"
136136
serde_yaml = "0.9.34"
137137
serialport = "4.8.1"
138-
tabled = { version = "0.18.0", features = ["ansi"] }
139-
thiserror = "1.0.69"
140-
tokio = { version = "1.43.0", features = ["full"] }
138+
tabled = { version = "0.20.0", features = ["ansi"] }
139+
thiserror = "2.0.17"
140+
tokio = { version = "1.48.0", features = ["full"] }
141141
udev = { version = "0.9.3", features = ["mio"] }
142142
uhid-virt = "0.0.8"
143-
version-compare = "0.2.0"
143+
version-compare = "0.2.1"
144144
virtual-usb = { git = "https://github.com/ShadowBlip/virtual-usb-rs.git", rev = "5c4c551a23b56f627a36d6775a5876c174be9eb3" }
145-
xdg = "2.5.2"
146-
zbus = { version = "5.5.0", default-features = false, features = ["tokio"] }
147-
zbus_macros = "5.5.0"
145+
xdg = "3.0.0"
146+
zbus = { version = "5.12.0", default-features = false, features = ["tokio"] }
147+
zbus_macros = "5.12.0"
148148

149149
[profile.release]
150150
debug = false

src/config/path.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@ const FALLBACK_BASE_PATH: &str = "/usr/share/inputplumber";
1010

1111
/// Returns the base path for configuration data
1212
pub fn get_base_path() -> PathBuf {
13-
let Ok(base_dirs) = xdg::BaseDirectories::with_prefix("inputplumber") else {
14-
log::warn!("Unable to determine config base path. Using fallback path.");
15-
return PathBuf::from(FALLBACK_BASE_PATH);
16-
};
13+
let base_dirs = xdg::BaseDirectories::with_prefix("inputplumber");
1714

1815
// Get the data directories in preference order
1916
let data_dirs = base_dirs.get_data_dirs();

src/input/source/evdev/gamepad.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use std::fmt::Debug;
2-
use std::{collections::HashMap, error::Error, os::fd::AsRawFd};
2+
use std::os::fd::AsFd;
3+
use std::{collections::HashMap, error::Error};
34

45
use evdev::{
56
AbsInfo, AbsoluteAxisCode, Device, EventType, FFEffect, FFEffectData, FFEffectKind, FFReplay,
@@ -51,8 +52,8 @@ impl GamepadEventDevice {
5152
// Set the device to do non-blocking reads
5253
// TODO: use epoll to wake up when data is available
5354
// https://github.com/emberian/evdev/blob/main/examples/evtest_nonblocking.rs
54-
let raw_fd = device.as_raw_fd();
55-
nix::fcntl::fcntl(raw_fd, FcntlArg::F_SETFL(OFlag::O_NONBLOCK))?;
55+
let fd = device.as_fd();
56+
nix::fcntl::fcntl(fd, FcntlArg::F_SETFL(OFlag::O_NONBLOCK))?;
5657

5758
// Query information about the device to get the absolute ranges
5859
let mut axes_info = HashMap::new();

src/input/source/evdev/keyboard.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use std::fmt::Debug;
2-
use std::os::fd::AsRawFd;
2+
use std::os::fd::AsFd;
33
use std::{collections::HashMap, error::Error};
44

55
use evdev::{Device, EventType, InputEvent};
@@ -45,8 +45,8 @@ impl KeyboardEventDevice {
4545
// Set the device to do non-blocking reads
4646
// TODO: use epoll to wake up when data is available
4747
// https://github.com/emberian/evdev/blob/main/examples/evtest_nonblocking.rs
48-
let raw_fd = device.as_raw_fd();
49-
nix::fcntl::fcntl(raw_fd, FcntlArg::F_SETFL(OFlag::O_NONBLOCK))?;
48+
let fd = device.as_fd();
49+
nix::fcntl::fcntl(fd, FcntlArg::F_SETFL(OFlag::O_NONBLOCK))?;
5050

5151
// Create an event translator if a capability map was given
5252
let translator = capability_map.map(|map| EventTranslator::new(&map, HashMap::new()));

src/input/source/evdev/touchscreen.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use std::collections::HashSet;
22
use std::fmt::Debug;
3-
use std::{collections::HashMap, error::Error, os::fd::AsRawFd};
3+
use std::os::fd::AsFd;
4+
use std::{collections::HashMap, error::Error};
45

56
use evdev::{
67
AbsInfo, AbsoluteAxisCode, Device, EventSummary, InputEvent, KeyCode, MiscCode,
@@ -124,8 +125,8 @@ impl TouchscreenEventDevice {
124125
// Set the device to do non-blocking reads
125126
// TODO: use epoll to wake up when data is available
126127
// https://github.com/emberian/evdev/blob/main/examples/evtest_nonblocking.rs
127-
let raw_fd = device.as_raw_fd();
128-
nix::fcntl::fcntl(raw_fd, FcntlArg::F_SETFL(OFlag::O_NONBLOCK))?;
128+
let fd = device.as_fd();
129+
nix::fcntl::fcntl(fd, FcntlArg::F_SETFL(OFlag::O_NONBLOCK))?;
129130

130131
// Check to see if the user wants to override the screen width/height.
131132
let override_size = {

src/input/target/touchpad.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use std::{error::Error, os::fd::AsRawFd, time::Instant};
1+
use std::{error::Error, os::fd::AsFd, time::Instant};
22

33
use evdev::{
44
uinput::{VirtualDevice, VirtualDeviceBuilder},
@@ -155,8 +155,8 @@ impl TouchpadDevice {
155155
// Set the device to do non-blocking reads
156156
// TODO: use epoll to wake up when data is available
157157
// https://github.com/emberian/evdev/blob/main/examples/evtest_nonblocking.rs
158-
let raw_fd = device.as_raw_fd();
159-
nix::fcntl::fcntl(raw_fd, FcntlArg::F_SETFL(OFlag::O_NONBLOCK))?;
158+
let fd = device.as_fd();
159+
nix::fcntl::fcntl(fd, FcntlArg::F_SETFL(OFlag::O_NONBLOCK))?;
160160

161161
Ok(device)
162162
}

src/input/target/touchscreen.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use std::{error::Error, os::fd::AsRawFd, time::Duration};
1+
use std::{error::Error, os::fd::AsFd, time::Duration};
22

33
use evdev::{
44
uinput::{VirtualDevice, VirtualDeviceBuilder},
@@ -195,8 +195,8 @@ impl TouchscreenDevice {
195195
// Set the device to do non-blocking reads
196196
// TODO: use epoll to wake up when data is available
197197
// https://github.com/emberian/evdev/blob/main/examples/evtest_nonblocking.rs
198-
let raw_fd = device.as_raw_fd();
199-
nix::fcntl::fcntl(raw_fd, FcntlArg::F_SETFL(OFlag::O_NONBLOCK))?;
198+
let fd = device.as_fd();
199+
nix::fcntl::fcntl(fd, FcntlArg::F_SETFL(OFlag::O_NONBLOCK))?;
200200

201201
Ok(device)
202202
}

src/input/target/xb360.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use std::os::fd::AsRawFd;
1+
use std::os::fd::AsFd;
22
use std::time::Duration;
33
use std::{collections::HashMap, error::Error};
44

@@ -133,8 +133,8 @@ impl XBox360Controller {
133133
// Set the device to do non-blocking reads
134134
// TODO: use epoll to wake up when data is available
135135
// https://github.com/emberian/evdev/blob/main/examples/evtest_nonblocking.rs
136-
let raw_fd = device.as_raw_fd();
137-
nix::fcntl::fcntl(raw_fd, FcntlArg::F_SETFL(OFlag::O_NONBLOCK))?;
136+
let fd = device.as_fd();
137+
nix::fcntl::fcntl(fd, FcntlArg::F_SETFL(OFlag::O_NONBLOCK))?;
138138

139139
Ok(device)
140140
}

src/input/target/xbox_elite.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use std::os::fd::AsRawFd;
1+
use std::os::fd::AsFd;
22
use std::time::Duration;
33
use std::{collections::HashMap, error::Error};
44

@@ -138,8 +138,8 @@ impl XboxEliteController {
138138
// Set the device to do non-blocking reads
139139
// TODO: use epoll to wake up when data is available
140140
// https://github.com/emberian/evdev/blob/main/examples/evtest_nonblocking.rs
141-
let raw_fd = device.as_raw_fd();
142-
nix::fcntl::fcntl(raw_fd, FcntlArg::F_SETFL(OFlag::O_NONBLOCK))?;
141+
let fd = device.as_fd();
142+
nix::fcntl::fcntl(fd, FcntlArg::F_SETFL(OFlag::O_NONBLOCK))?;
143143

144144
Ok(device)
145145
}

0 commit comments

Comments
 (0)