Skip to content

Commit a4ffacf

Browse files
ShadowApexShadowApex
committed
fix: update extension dependencies to allow building with Rust 1.94.x
1 parent 0b45064 commit a4ffacf

32 files changed

Lines changed: 662 additions & 896 deletions

‎extensions/Cargo.lock‎

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

‎extensions/core/Cargo.toml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ edition = "2021"
77
crate-type = ["cdylib"] # Compile this crate to a dynamic C library.
88

99
[dependencies]
10-
futures-util = "0.3.31"
11-
godot = { version = "0.3.4", features = [
10+
futures-util = "0.3.32"
11+
godot = { version = "0.4.5", features = [
1212
"experimental-threads",
1313
"register-docs",
1414
] }
15-
nix = { version = "0.30.1", features = ["term", "process", "fs"] }
16-
once_cell = "1.21.3"
17-
tokio = { version = "1.47.0", features = ["full"] }
18-
zbus = "5.9.0"
19-
zvariant = "5.6.0"
15+
nix = { version = "0.31.2", features = ["term", "process", "fs"] }
16+
once_cell = "1.21.4"
17+
tokio = { version = "1.50.0", features = ["full"] }
18+
zbus = "5.14.0"
19+
zvariant = "5.10.0"
2020
gamescope-x11-client = { git = "https://github.com/ShadowBlip/gamescope-x11-client", branch = "main" }
21-
inotify = "0.11.0"
22-
byte-unit = "5.1.6"
23-
log = "0.4.27"
24-
keyvalues-parser = "0.2.0"
21+
inotify = "0.11.1"
22+
byte-unit = "5.2.0"
23+
log = "0.4.29"
24+
keyvalues-parser = "0.2.3"

‎extensions/core/src/bluetooth/bluez/adapter.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -178,12 +178,12 @@ impl BluetoothAdapter {
178178
let device: Gd<BluetoothAdapter> = res.cast();
179179
device
180180
} else {
181-
let mut device = BluetoothAdapter::from_path(path.to_string().into());
181+
let mut device = BluetoothAdapter::from_path(path.into());
182182
device.take_over_path(res_path.as_str());
183183
device
184184
}
185185
} else {
186-
let mut device = BluetoothAdapter::from_path(path.to_string().into());
186+
let mut device = BluetoothAdapter::from_path(path.into());
187187
device.take_over_path(res_path.as_str());
188188
device
189189
}
@@ -200,23 +200,23 @@ impl BluetoothAdapter {
200200
let Some(proxy) = self.proxy.as_ref() else {
201201
return Default::default();
202202
};
203-
proxy.address().unwrap_or_default().into()
203+
proxy.address().unwrap_or_default().as_str().into()
204204
}
205205

206206
#[func]
207207
pub fn get_address_type(&self) -> GString {
208208
let Some(proxy) = self.proxy.as_ref() else {
209209
return Default::default();
210210
};
211-
proxy.address_type().unwrap_or_default().into()
211+
proxy.address_type().unwrap_or_default().as_str().into()
212212
}
213213

214214
#[func]
215215
pub fn get_alias(&self) -> GString {
216216
let Some(proxy) = self.proxy.as_ref() else {
217217
return Default::default();
218218
};
219-
proxy.alias().unwrap_or_default().into()
219+
proxy.alias().unwrap_or_default().as_str().into()
220220
}
221221

222222
#[func]
@@ -304,15 +304,15 @@ impl BluetoothAdapter {
304304
let Some(proxy) = self.proxy.as_ref() else {
305305
return Default::default();
306306
};
307-
proxy.modalias().unwrap_or_default().into()
307+
proxy.modalias().unwrap_or_default().as_str().into()
308308
}
309309

310310
#[func]
311311
pub fn get_name(&self) -> GString {
312312
let Some(proxy) = self.proxy.as_ref() else {
313313
return Default::default();
314314
};
315-
proxy.name().unwrap_or_default().into()
315+
proxy.name().unwrap_or_default().as_str().into()
316316
}
317317

318318
#[func]
@@ -352,7 +352,7 @@ impl BluetoothAdapter {
352352
let Some(proxy) = self.proxy.as_ref() else {
353353
return Default::default();
354354
};
355-
proxy.power_state().unwrap_or_default().into()
355+
proxy.power_state().unwrap_or_default().as_str().into()
356356
}
357357

358358
#[func]

‎extensions/core/src/bluetooth/bluez/device.rs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -174,12 +174,12 @@ impl BluetoothDevice {
174174
let device: Gd<BluetoothDevice> = res.cast();
175175
device
176176
} else {
177-
let mut device = BluetoothDevice::from_path(path.to_string().into());
177+
let mut device = BluetoothDevice::from_path(path.into());
178178
device.take_over_path(res_path.as_str());
179179
device
180180
}
181181
} else {
182-
let mut device = BluetoothDevice::from_path(path.to_string().into());
182+
let mut device = BluetoothDevice::from_path(path.into());
183183
device.take_over_path(res_path.as_str());
184184
device
185185
}
@@ -324,15 +324,15 @@ impl BluetoothDevice {
324324
let Some(proxy) = self.proxy.as_ref() else {
325325
return Default::default();
326326
};
327-
proxy.name().unwrap_or_default().into()
327+
proxy.name().unwrap_or_default().as_str().into()
328328
}
329329

330330
#[func]
331331
pub fn get_modalias(&self) -> GString {
332332
let Some(proxy) = self.proxy.as_ref() else {
333333
return Default::default();
334334
};
335-
proxy.modalias().unwrap_or_default().into()
335+
proxy.modalias().unwrap_or_default().as_str().into()
336336
}
337337

338338
#[func]
@@ -348,7 +348,7 @@ impl BluetoothDevice {
348348
let Some(proxy) = self.proxy.as_ref() else {
349349
return Default::default();
350350
};
351-
proxy.icon().unwrap_or_default().into()
351+
proxy.icon().unwrap_or_default().as_str().into()
352352
}
353353

354354
#[func]
@@ -404,7 +404,7 @@ impl BluetoothDevice {
404404
let Some(proxy) = self.proxy.as_ref() else {
405405
return Default::default();
406406
};
407-
proxy.alias().unwrap_or_default().into()
407+
proxy.alias().unwrap_or_default().as_str().into()
408408
}
409409

410410
#[func]
@@ -422,23 +422,23 @@ impl BluetoothDevice {
422422
let Some(proxy) = self.proxy.as_ref() else {
423423
return Default::default();
424424
};
425-
proxy.address_type().unwrap_or_default().into()
425+
proxy.address_type().unwrap_or_default().as_str().into()
426426
}
427427

428428
#[func]
429429
pub fn get_address(&self) -> GString {
430430
let Some(proxy) = self.proxy.as_ref() else {
431431
return Default::default();
432432
};
433-
proxy.address().unwrap_or_default().into()
433+
proxy.address().unwrap_or_default().as_str().into()
434434
}
435435

436436
#[func]
437437
pub fn get_adapter(&self) -> GString {
438438
let Some(proxy) = self.proxy.as_ref() else {
439439
return Default::default();
440440
};
441-
proxy.adapter().unwrap_or_default().to_string().into()
441+
proxy.adapter().unwrap_or_default().as_str().into()
442442
}
443443

444444
/// Dispatches signals

‎extensions/core/src/dbus.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ impl<'a> GodotVariant for zvariant::Value<'a> {
6969
Some(arr.to_variant())
7070
}
7171
zvariant::Value::Dict(value) => {
72-
let mut dict = Dictionary::new();
72+
let mut dict = VarDictionary::new();
7373
for (key, val) in value.iter() {
7474
let Some(key) = key.as_godot_variant() else {
7575
continue;
@@ -90,12 +90,12 @@ impl<'a> GodotVariant for zvariant::Value<'a> {
9090

9191
/// Interface for converting Godot types -> DBus types
9292
pub trait DBusVariant {
93-
fn as_zvariant(&self) -> Option<zvariant::Value>;
93+
fn as_zvariant(&'_ self) -> Option<zvariant::Value<'_>>;
9494
}
9595

9696
impl DBusVariant for Variant {
9797
/// Convert the Godot variant type into a DBus variant type
98-
fn as_zvariant(&self) -> Option<zvariant::Value> {
98+
fn as_zvariant(&'_ self) -> Option<zvariant::Value<'_>> {
9999
match self.get_type() {
100100
VariantType::NIL => {
101101
let value = zvariant::Optional::<&str>::null_value();

‎extensions/core/src/dbus/networkmanager/active.rs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ use zbus::proxy;
2525
default_service = "org.freedesktop.NetworkManager"
2626
)]
2727
pub trait Active {
28-
/// StateChanged signal
29-
//#[zbus(signal)]
30-
//fn state_changed(&self, state: u32, reason: u32) -> zbus::Result<()>;
31-
3228
/// Connection property
3329
#[zbus(property)]
3430
fn connection(&self) -> zbus::Result<zbus::zvariant::OwnedObjectPath>;

‎extensions/core/src/dbus/networkmanager/device.rs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,6 @@ pub trait Device {
5555
flags: u32,
5656
) -> zbus::Result<()>;
5757

58-
/// StateChanged signal
59-
//#[zbus(signal)]
60-
//fn state_changed(&self, new_state: u32, old_state: u32, reason: u32) -> zbus::Result<()>;
61-
6258
/// ActiveConnection property
6359
#[zbus(property)]
6460
fn active_connection(&self) -> zbus::Result<zbus::zvariant::OwnedObjectPath>;

‎extensions/core/src/dbus/networkmanager/network_manager.rs‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,6 @@ pub trait NetworkManager {
125125
/// Sleep method
126126
fn sleep(&self, sleep: bool) -> zbus::Result<()>;
127127

128-
/// state method
129-
//#[zbus(name = "state")]
130-
//fn state(&self) -> zbus::Result<u32>;
131-
132128
/// CheckPermissions signal
133129
#[zbus(signal)]
134130
fn check_permissions(&self) -> zbus::Result<()>;
@@ -141,10 +137,6 @@ pub trait NetworkManager {
141137
#[zbus(signal)]
142138
fn device_removed(&self, device_path: zbus::zvariant::ObjectPath<'_>) -> zbus::Result<()>;
143139

144-
/// StateChanged signal
145-
//#[zbus(signal)]
146-
//fn state_changed(&self, state: u32) -> zbus::Result<()>;
147-
148140
/// ActivatingConnection property
149141
#[zbus(property)]
150142
fn activating_connection(&self) -> zbus::Result<zbus::zvariant::OwnedObjectPath>;
@@ -192,11 +184,6 @@ pub trait NetworkManager {
192184
fn global_dns_configuration(
193185
&self,
194186
) -> zbus::Result<std::collections::HashMap<String, zbus::zvariant::OwnedValue>>;
195-
//#[zbus(property)]
196-
//fn set_global_dns_configuration(
197-
// &self,
198-
// value: std::collections::HashMap<&str, &zbus::zvariant::Value<'_>>,
199-
//) -> zbus::Result<()>;
200187

201188
/// Metered property
202189
#[zbus(property)]

‎extensions/core/src/disk/udisks2/block_device.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,12 @@ impl BlockDevice {
9191
let device: Gd<BlockDevice> = res.cast();
9292
device
9393
} else {
94-
let mut device = BlockDevice::from_path(path.to_string().into());
94+
let mut device = BlockDevice::from_path(path.into());
9595
device.take_over_path(res_path.as_str());
9696
device
9797
}
9898
} else {
99-
let mut device = BlockDevice::from_path(path.to_string().into());
99+
let mut device = BlockDevice::from_path(path.into());
100100
device.take_over_path(res_path.as_str());
101101
device
102102
}

‎extensions/core/src/disk/udisks2/drive_device.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,12 @@ impl DriveDevice {
7979
let device: Gd<DriveDevice> = res.cast();
8080
device
8181
} else {
82-
let mut device = DriveDevice::from_path(path.to_string().into());
82+
let mut device = DriveDevice::from_path(path.into());
8383
device.take_over_path(res_path.as_str());
8484
device
8585
}
8686
} else {
87-
let mut device = DriveDevice::from_path(path.to_string().into());
87+
let mut device = DriveDevice::from_path(path.into());
8888
device.take_over_path(res_path.as_str());
8989
device
9090
}

0 commit comments

Comments
 (0)