GITGUD

neiam neiam /apollos-dbus

public · Issues · Pulls · Labels · Forks · Compare · Actions success · Badges · Packages

⭐

Log in to mark this repository.

zbus 5 -> 6, which folds in zvariant and zbus_names

0eedfc0 · Gabriel Morell · 2026-10-23 14:52

✓ Rust CI / Create Release (push) ✓ Rust CI / Release (apollos-dbus-aarch64-linux-gnu.tar.gz, ubuntu-24.04-arm, ubuntu-24.04-arm, 1.92) (push) ✓ Rust CI / Release (apollos-dbus-x86_64-linux-gnu.tar.gz, ubuntu-latest, arc-runner-set, 1.92) (push) ✗ Rust CI / build (aarch64, ubuntu-24.04-arm) (push) ✓ Rust CI / build (x86_64, arc-runner-set) (push)
4 files +29 -177
Message 
{commit_body(@commit)}

Files changed

modified Cargo.lock
+25 −173
@@ -97,29 +97,6 @@ dependencies = [
97 97 "serde_json",
98 98 ]
99 99
100 −[[package]]
101 −name = "async-broadcast"
102 −version = "0.7.2"
103 −source = "registry+https://github.com/rust-lang/crates.io-index"
104 −checksum = "435a87a52755b8f27fcf321ac4f04b2802e337c8c4872923137471ec39c37532"
105 −dependencies = [
106 − "event-listener",
107 − "event-listener-strategy",
108 − "futures-core",
109 − "pin-project-lite",
110 −]
111 −
112 −[[package]]
113 −name = "async-recursion"
114 −version = "1.2.0"
115 −source = "registry+https://github.com/rust-lang/crates.io-index"
116 −checksum = "4f8abc12baad266b1c8cec146854c195b5864b4221d4b2ca7296a7ae82d9e451"
117 −dependencies = [
118 − "proc-macro2",
119 − "quote",
120 − "syn 3.0.6",
121 −]
122 −
123 100 [[package]]
124 101 name = "async-trait"
125 102 version = "0.1.92"
@@ -311,27 +288,6 @@ version = "1.1.1"
311 288 source = "registry+https://github.com/rust-lang/crates.io-index"
312 289 checksum = "66b7e2430c6dff6a955451e2cfc438f09cea1965a9d6f87f7e3b90decc014099"
313 290
314 −[[package]]
315 −name = "enumflags2"
316 −version = "0.7.12"
317 −source = "registry+https://github.com/rust-lang/crates.io-index"
318 −checksum = "1027f7680c853e056ebcec683615fb6fbbc07dbaa13b4d5d9442b146ded4ecef"
319 −dependencies = [
320 − "enumflags2_derive",
321 − "serde",
322 −]
323 −
324 −[[package]]
325 −name = "enumflags2_derive"
326 −version = "0.7.12"
327 −source = "registry+https://github.com/rust-lang/crates.io-index"
328 −checksum = "67c78a4d8fdf9953a5c9d458f9efe940fd97a0cab0941c075a813ac594733827"
329 −dependencies = [
330 − "proc-macro2",
331 − "quote",
332 − "syn 2.0.119",
333 −]
334 −
335 291 [[package]]
336 292 name = "equivalent"
337 293 version = "1.0.2"
@@ -348,26 +304,6 @@ dependencies = [
348 304 "windows-sys 0.61.2",
349 305 ]
350 306
351 −[[package]]
352 −name = "event-listener"
353 −version = "5.4.2"
354 −source = "registry+https://github.com/rust-lang/crates.io-index"
355 −checksum = "5a23add41df1562121a9393cb065eab5146a1242410f23a644851e90cfd669d2"
356 −dependencies = [
357 − "parking",
358 − "pin-project-lite",
359 −]
360 −
361 −[[package]]
362 −name = "event-listener-strategy"
363 −version = "0.5.4"
364 −source = "registry+https://github.com/rust-lang/crates.io-index"
365 −checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93"
366 −dependencies = [
367 − "event-listener",
368 − "pin-project-lite",
369 −]
370 −
371 307 [[package]]
372 308 name = "fastrand"
373 309 version = "2.5.0"
@@ -424,19 +360,6 @@ version = "0.3.34"
424 360 source = "registry+https://github.com/rust-lang/crates.io-index"
425 361 checksum = "53c0fa8157de1303bfffdaa1cc2a673bfffb60102f76b0ef4441659124373fed"
426 362
427 −[[package]]
428 −name = "futures-lite"
429 −version = "2.6.1"
430 −source = "registry+https://github.com/rust-lang/crates.io-index"
431 −checksum = "f78e10609fe0e0b3f4157ffab1876319b5b0db102a2c60dc4626306dc46b44ad"
432 −dependencies = [
433 − "fastrand",
434 − "futures-core",
435 − "futures-io",
436 − "parking",
437 − "pin-project-lite",
438 −]
439 −
440 363 [[package]]
441 364 name = "futures-sink"
442 365 version = "0.3.34"
@@ -785,12 +708,6 @@ dependencies = [
785 708 "pin-project-lite",
786 709 ]
787 710
788 −[[package]]
789 −name = "parking"
790 −version = "2.2.1"
791 −source = "registry+https://github.com/rust-lang/crates.io-index"
792 −checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
793 −
794 711 [[package]]
795 712 name = "percent-encoding"
796 713 version = "2.3.2"
@@ -818,15 +735,6 @@ dependencies = [
818 735 "zerovec",
819 736 ]
820 737
821 −[[package]]
822 −name = "proc-macro-crate"
823 −version = "3.5.0"
824 −source = "registry+https://github.com/rust-lang/crates.io-index"
825 −checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f"
826 −dependencies = [
827 − "toml_edit",
828 −]
829 −
830 738 [[package]]
831 739 name = "proc-macro2"
832 740 version = "1.0.107"
@@ -1262,9 +1170,9 @@ dependencies = [
1262 1170
1263 1171 [[package]]
1264 1172 name = "tokio"
1265 −version = "1.53.2"
1173 +version = "1.54.1"
1266 1174 source = "registry+https://github.com/rust-lang/crates.io-index"
1267 −checksum = "e95f91fcc7a621e8b030f6aa23c71fe9838ae2fb4d8118b75602a328f5144044"
1175 +checksum = "b52fd3255258d26fac7264ab5a76b53c13367136dc011d3d6ad4f8ed070396a3"
1268 1176 dependencies = [
1269 1177 "bytes",
1270 1178 "libc",
@@ -1273,7 +1181,6 @@ dependencies = [
1273 1181 "signal-hook-registry",
1274 1182 "socket2",
1275 1183 "tokio-macros",
1276 − "tracing",
1277 1184 "windows-sys 0.61.2",
1278 1185 ]
1279 1186
@@ -1332,7 +1239,7 @@ dependencies = [
1332 1239 "indexmap",
1333 1240 "serde_core",
1334 1241 "serde_spanned",
1335 − "toml_datetime 0.7.5+spec-1.1.0",
1242 + "toml_datetime",
1336 1243 "toml_parser",
1337 1244 "toml_writer",
1338 1245 "winnow 0.7.15",
@@ -1347,27 +1254,6 @@ dependencies = [
1347 1254 "serde_core",
1348 1255 ]
1349 1256
1350 −[[package]]
1351 −name = "toml_datetime"
1352 −version = "1.1.1+spec-1.1.0"
1353 −source = "registry+https://github.com/rust-lang/crates.io-index"
1354 −checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7"
1355 −dependencies = [
1356 − "serde_core",
1357 −]
1358 −
1359 −[[package]]
1360 −name = "toml_edit"
1361 −version = "0.25.15+spec-1.1.0"
1362 −source = "registry+https://github.com/rust-lang/crates.io-index"
1363 −checksum = "1340ea94a5856333492c9064b02c778b191dd2c853778d9609debdcdfea3a614"
1364 −dependencies = [
1365 − "indexmap",
1366 − "toml_datetime 1.1.1+spec-1.1.0",
1367 − "toml_parser",
1368 − "winnow 1.0.4",
1369 −]
1370 −
1371 1257 [[package]]
1372 1258 name = "toml_parser"
1373 1259 version = "1.1.3+spec-1.1.0"
@@ -1693,58 +1579,55 @@ dependencies = [
1693 1579
1694 1580 [[package]]
1695 1581 name = "zbus"
1696 −version = "5.19.0"
1582 +version = "6.1.0"
1697 1583 source = "registry+https://github.com/rust-lang/crates.io-index"
1698 −checksum = "5db4be7c075cb421e4b7ee645541604239bd243ba7c357511f4ff3a74b555907"
1584 +checksum = "fcff5faa63a63d5b81051740f7382017f10b3440b3f401d97f0cf0b3b39c62d9"
1699 1585 dependencies = [
1700 − "async-broadcast",
1701 − "async-recursion",
1702 1586 "async-trait",
1703 − "enumflags2",
1704 − "event-listener",
1587 + "bitflags",
1588 + "endi",
1705 1589 "futures-core",
1706 − "futures-lite",
1707 1590 "hex",
1708 1591 "libc",
1709 1592 "ordered-stream",
1710 1593 "rustix",
1711 1594 "serde",
1712 1595 "serde_repr",
1596 + "socket2",
1713 1597 "tokio",
1714 − "tracing",
1715 1598 "uds_windows",
1716 1599 "uuid",
1717 1600 "windows-sys 0.61.2",
1718 1601 "winnow 1.0.4",
1719 1602 "zbus_macros",
1720 − "zbus_names",
1721 − "zvariant",
1603 + "zbus_utils",
1604 + "zcheapstr",
1605 + "zruntime",
1722 1606 ]
1723 1607
1724 1608 [[package]]
1725 1609 name = "zbus_macros"
1726 −version = "5.19.0"
1610 +version = "6.1.0"
1727 1611 source = "registry+https://github.com/rust-lang/crates.io-index"
1728 −checksum = "2990635d09ade6df1868f72f8cac69a876a90981e8bd3c40b1be413f8dc88f40"
1612 +checksum = "5bba6e2bfe19571dc81b3e0be9f8daec6e5422db3e2eea2e766a859553e7bd37"
1729 1613 dependencies = [
1730 − "proc-macro-crate",
1731 1614 "proc-macro2",
1732 1615 "quote",
1733 1616 "syn 3.0.6",
1734 − "zbus_names",
1735 − "zvariant",
1736 − "zvariant_utils",
1617 + "zbus_utils",
1737 1618 ]
1738 1619
1739 1620 [[package]]
1740 −name = "zbus_names"
1741 −version = "4.3.4"
1621 +name = "zbus_utils"
1622 +version = "6.0.0"
1742 1623 source = "registry+https://github.com/rust-lang/crates.io-index"
1743 −checksum = "d8bf88b4a3ff53e883001e0e0115b297a9d53c31b9c1edd2bfdd853e3428624e"
1624 +checksum = "c27a055b114bd9fc3686e90f62bd1fe612d523fc5f620bac3b1d2f42d3f6cab8"
1744 1625 dependencies = [
1626 + "proc-macro2",
1627 + "quote",
1745 1628 "serde",
1629 + "syn 3.0.6",
1746 1630 "winnow 1.0.4",
1747 − "zvariant",
1748 1631 ]
1749 1632
1750 1633 [[package]]
@@ -1823,42 +1706,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1823 1706 checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b"
1824 1707
1825 1708 [[package]]
1826 −name = "zvariant"
1827 −version = "5.15.0"
1828 −source = "registry+https://github.com/rust-lang/crates.io-index"
1829 −checksum = "c1d34c27cc6cdd1f458427519dd6b8612f7b7e3f7b9a0b2355d041dda9869147"
1830 −dependencies = [
1831 − "endi",
1832 − "enumflags2",
1833 − "serde",
1834 − "winnow 1.0.4",
1835 − "zcheapstr",
1836 − "zvariant_derive",
1837 − "zvariant_utils",
1838 −]
1839 −
1840 −[[package]]
1841 −name = "zvariant_derive"
1842 −version = "5.15.0"
1843 −source = "registry+https://github.com/rust-lang/crates.io-index"
1844 −checksum = "864155e69b4352db0c7f374917bf45d1e0c8d17659c8b3dbf9795f3673f8c497"
1845 −dependencies = [
1846 − "proc-macro-crate",
1847 − "proc-macro2",
1848 − "quote",
1849 − "syn 3.0.6",
1850 − "zvariant_utils",
1851 −]
1852 −
1853 −[[package]]
1854 −name = "zvariant_utils"
1855 −version = "4.2.0"
1709 +name = "zruntime"
1710 +version = "0.2.1"
1856 1711 source = "registry+https://github.com/rust-lang/crates.io-index"
1857 −checksum = "bad0294361a320b694a328460dc73add56c306150f5cb6bfafc44446120008a3"
1712 +checksum = "dfc035df602243402949ddf3dcc5bcfad7edeb732dd49ec6e605431c4eca54ce"
1858 1713 dependencies = [
1859 − "proc-macro2",
1860 − "quote",
1861 − "serde",
1862 − "syn 3.0.6",
1863 − "winnow 1.0.4",
1714 + "futures-core",
1715 + "futures-io",
1864 1716 ]
modified Cargo.toml
+1 −1
@@ -20,7 +20,7 @@ toml = "0.9"
20 20 tracing = "0.1"
21 21 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
22 22 url = "2"
23 −zbus = { version = "5", default-features = false, features = ["tokio"] }
23 +zbus = { version = "6", default-features = false, features = ["tokio", "service", "object-manager"] }
24 24
25 25 [package.metadata.deb]
26 26 assets = [
modified src/main.rs
+3 −3
@@ -92,9 +92,9 @@ async fn main() -> Result<()> {
92 92 origins: HashMap::new(),
93 93 commands,
94 94 };
95 − let conn = zbus::connection::Builder::session()?
96 − .serve_at(bus::ROOT, root)?
97 − .serve_at(bus::ROOT, zbus::fdo::ObjectManager)?
95 + let conn = zbus::connection::Builder::session()
96 + .serve_at(bus::ROOT, root)
97 + .serve_at(bus::ROOT, zbus::fdo::ObjectManager)
98 98 .build()
99 99 .await?;
100 100 // Named only once the objects are there, so activation never hands a

Parents: abdb2d7