From b24038d9a1ef9b27ce2811e844dcde4e0f777330 Mon Sep 17 00:00:00 2001 From: Zeeshan Ali Khan Date: Sun, 20 Oct 2024 06:32:52 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=93=9D=20book:=20Link=20to=20zbus=205?= =?UTF-8?q?=20docs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- book/src/blocking.md | 6 +++--- book/src/connection.md | 4 ++-- book/src/faq.md | 8 ++++---- book/src/service.md | 10 +++++----- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/book/src/blocking.md b/book/src/blocking.md index 027d89d2d..6d3f3f995 100644 --- a/book/src/blocking.md +++ b/book/src/blocking.md @@ -203,10 +203,10 @@ fn main() -> Result<(), Box> { } ``` -[asynchronous `Connection` API]: https://docs.rs/zbus/4/zbus/connection/struct.Connection.html -[`blocking::Connection`]: https://docs.rs/zbus/4/zbus/blocking/connection/struct.Connection.html +[asynchronous `Connection` API]: https://docs.rs/zbus/5/zbus/connection/struct.Connection.html +[`blocking::Connection`]: https://docs.rs/zbus/5/zbus/blocking/connection/struct.Connection.html [`std::iter::Iterator`]: https://doc.rust-lang.org/nightly/std/iter/trait.Iterator.html -[blocking module]: https://docs.rs/zbus/4/zbus/blocking/index.html +[blocking module]: https://docs.rs/zbus/5/zbus/blocking/index.html [wkgp]: https://rust-lang.github.io/wg-async-foundations/vision/shiny_future/users_manual.html#caveat-beware-the-async-sandwich [`blocking` crate]: https://docs.rs/blocking/ [assb]: https://docs.rs/async-std/4/async_std/task/fn.spawn_blocking.html diff --git a/book/src/connection.md b/book/src/connection.md index 68a04811f..65f9d2ba6 100644 --- a/book/src/connection.md +++ b/book/src/connection.md @@ -72,8 +72,8 @@ cargo feature of `zbus` is enabled. [BlueZ]: https://git.kernel.org/pub/scm/bluetooth/bluez.git/tree/doc [PID1]: https://www.freedesktop.org/software/systemd/man/latest/org.freedesktop.systemd1.html [`futures::stream::Stream`]: https://docs.rs/futures/4/futures/stream/trait.Stream.html -[`MessageStream`]: https://docs.rs/zbus/4/zbus/struct.MessageStream.html -[`connection::Builder::address`]: https://docs.rs/zbus/4/zbus/connection/struct.Builder.html#method.address +[`MessageStream`]: https://docs.rs/zbus/5/zbus/struct.MessageStream.html +[`connection::Builder::address`]: https://docs.rs/zbus/5/zbus/connection/struct.Builder.html#method.address [dspec]: https://dbus.freedesktop.org/doc/dbus-specification.html#addresses [^bus-less]: Unless you implemented them, none of the bus methods will exist. diff --git a/book/src/faq.md b/book/src/faq.md index 20e36a7de..ff7a88d53 100644 --- a/book/src/faq.md +++ b/book/src/faq.md @@ -221,14 +221,14 @@ let s: &str = encoded.deserialize().unwrap().0; assert_eq!(s, "Variant2"); ``` -[`proxy::Builder::uncached_properties`]: https://docs.rs/zbus/4/zbus/proxy/struct.Builder.html#method.uncached_properties -[`proxy::Builder::cache_properites`]: https://docs.rs/zbus/4/zbus/proxy/struct.Builder.html#method.cache_properties -[`proxy`]: https://docs.rs/zbus/4/zbus/attr.proxy.html +[`proxy::Builder::uncached_properties`]: https://docs.rs/zbus/5/zbus/proxy/struct.Builder.html#method.uncached_properties +[`proxy::Builder::cache_properites`]: https://docs.rs/zbus/5/zbus/proxy/struct.Builder.html#method.cache_properties +[`proxy`]: https://docs.rs/zbus/5/zbus/attr.proxy.html [tctiog]: https://github.com/tokio-rs/tokio/issues/2201 [`Type`]: https://docs.rs/zvariant/4/zvariant/derive.Type.html [`SerializeDict`]: https://docs.rs/zvariant/4/zvariant/derive.SerializeDict.html [`DeserializeDict`]: https://docs.rs/zvariant/4/zvariant/derive.DeserializeDict.html -[`MessageStream`]: https://docs.rs/zbus/4/zbus/struct.MessageStream.html +[`MessageStream`]: https://docs.rs/zbus/5/zbus/struct.MessageStream.html [nonull]: https://gitlab.freedesktop.org/dbus/dbus/-/issues/25 [dsi]: http://dbus.freedesktop.org/doc/dbus-specification.html#standard-interfaces [`Optional`]: https://docs.rs/zvariant/4/zvariant/struct.Optional.html diff --git a/book/src/service.md b/book/src/service.md index 696307622..81881016f 100644 --- a/book/src/service.md +++ b/book/src/service.md @@ -456,10 +456,10 @@ While it's extremely useful to be able to generate the client-side proxy code di proxy as well. [D-Bus concepts]: concepts.html#bus-name--service-name -[didoc]: https://docs.rs/zbus/4/zbus/attr.interface.html +[didoc]: https://docs.rs/zbus/5/zbus/attr.interface.html [`Value`]: https://docs.rs/zvariant/4/zvariant/derive.Value.html [`OwnedValue`]: https://docs.rs/zvariant/4/zvariant/derive.OwnedValue.html -[`zbus::DBusError`]:https://docs.rs/zbus/4/zbus/trait.DBusError.html -[`zbus::fdo::Error`]: https://docs.rs/zbus/4/zbus/fdo/enum.Error.html -[`zbus::fdo::Error::UnknownProperty`]: https://docs.rs/zbus/4/zbus/fdo/enum.Error.html#variant.UnknownProperty -[`proxy`]: https://docs.rs/zbus/4/zbus/attr.proxy.html +[`zbus::DBusError`]:https://docs.rs/zbus/5/zbus/trait.DBusError.html +[`zbus::fdo::Error`]: https://docs.rs/zbus/5/zbus/fdo/enum.Error.html +[`zbus::fdo::Error::UnknownProperty`]: https://docs.rs/zbus/5/zbus/fdo/enum.Error.html#variant.UnknownProperty +[`proxy`]: https://docs.rs/zbus/5/zbus/attr.proxy.html From af9e1db9177293a832d83cb47616905d5e558531 Mon Sep 17 00:00:00 2001 From: Zeeshan Ali Khan Date: Sun, 20 Oct 2024 06:32:52 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=93=9D=20book:=20Link=20to=20zvariant?= =?UTF-8?q?=205=20docs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- book/src/client.md | 4 ++-- book/src/faq.md | 12 ++++++------ book/src/service.md | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/book/src/client.md b/book/src/client.md index ecf17e893..cbab257bb 100644 --- a/book/src/client.md +++ b/book/src/client.md @@ -618,7 +618,7 @@ There you have it, a Rust-friendly binding for your D-Bus service! [`pkg-config`]: https://www.freedesktop.org/wiki/Software/pkg-config/ [cob]: blocking.html [`Stream`]: https://docs.rs/futures/4/futures/stream/trait.Stream.html -[`Value`]: https://docs.rs/zvariant/4/zvariant/derive.Value.html -[`OwnedValue`]: https://docs.rs/zvariant/4/zvariant/derive.OwnedValue.html +[`Value`]: https://docs.rs/zvariant/5/zvariant/derive.Value.html +[`OwnedValue`]: https://docs.rs/zvariant/5/zvariant/derive.OwnedValue.html [^busctl]: `busctl` is part of [`systemd`](https://systemd.io/). diff --git a/book/src/faq.md b/book/src/faq.md index ff7a88d53..9151f085e 100644 --- a/book/src/faq.md +++ b/book/src/faq.md @@ -225,15 +225,15 @@ assert_eq!(s, "Variant2"); [`proxy::Builder::cache_properites`]: https://docs.rs/zbus/5/zbus/proxy/struct.Builder.html#method.cache_properties [`proxy`]: https://docs.rs/zbus/5/zbus/attr.proxy.html [tctiog]: https://github.com/tokio-rs/tokio/issues/2201 -[`Type`]: https://docs.rs/zvariant/4/zvariant/derive.Type.html -[`SerializeDict`]: https://docs.rs/zvariant/4/zvariant/derive.SerializeDict.html -[`DeserializeDict`]: https://docs.rs/zvariant/4/zvariant/derive.DeserializeDict.html +[`Type`]: https://docs.rs/zvariant/5/zvariant/derive.Type.html +[`SerializeDict`]: https://docs.rs/zvariant/5/zvariant/derive.SerializeDict.html +[`DeserializeDict`]: https://docs.rs/zvariant/5/zvariant/derive.DeserializeDict.html [`MessageStream`]: https://docs.rs/zbus/5/zbus/struct.MessageStream.html [nonull]: https://gitlab.freedesktop.org/dbus/dbus/-/issues/25 [dsi]: http://dbus.freedesktop.org/doc/dbus-specification.html#standard-interfaces -[`Optional`]: https://docs.rs/zvariant/4/zvariant/struct.Optional.html +[`Optional`]: https://docs.rs/zvariant/5/zvariant/struct.Optional.html [`d-feet`]: https://wiki.gnome.org/Apps/DFeet [specialization]: https://rust-lang.github.io/rfcs/1210-impl-specialization.html -[`Value`]: https://docs.rs/zvariant/4/zvariant/enum.Value.html -[`OwnedValue`]: https://docs.rs/zvariant/4/zvariant/struct.OwnedValue.html +[`Value`]: https://docs.rs/zvariant/5/zvariant/enum.Value.html +[`OwnedValue`]: https://docs.rs/zvariant/5/zvariant/struct.OwnedValue.html [`serde_repr`]: https://crates.io/crates/serde_repr diff --git a/book/src/service.md b/book/src/service.md index 81881016f..67e284614 100644 --- a/book/src/service.md +++ b/book/src/service.md @@ -457,8 +457,8 @@ While it's extremely useful to be able to generate the client-side proxy code di [D-Bus concepts]: concepts.html#bus-name--service-name [didoc]: https://docs.rs/zbus/5/zbus/attr.interface.html -[`Value`]: https://docs.rs/zvariant/4/zvariant/derive.Value.html -[`OwnedValue`]: https://docs.rs/zvariant/4/zvariant/derive.OwnedValue.html +[`Value`]: https://docs.rs/zvariant/5/zvariant/derive.Value.html +[`OwnedValue`]: https://docs.rs/zvariant/5/zvariant/derive.OwnedValue.html [`zbus::DBusError`]:https://docs.rs/zbus/5/zbus/trait.DBusError.html [`zbus::fdo::Error`]: https://docs.rs/zbus/5/zbus/fdo/enum.Error.html [`zbus::fdo::Error::UnknownProperty`]: https://docs.rs/zbus/5/zbus/fdo/enum.Error.html#variant.UnknownProperty From ad203b5f0048007ccaa4f390c2d0910781456ac9 Mon Sep 17 00:00:00 2001 From: Zeeshan Ali Khan Date: Sun, 20 Oct 2024 06:45:34 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=93=9D=20book:=20Remove=20direct=20zv?= =?UTF-8?q?ariant=20use=20in=20an=20example?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- book/src/client.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/book/src/client.md b/book/src/client.md index cbab257bb..299ab4465 100644 --- a/book/src/client.md +++ b/book/src/client.md @@ -164,9 +164,7 @@ Let's look at this API in action, with an example where we monitor started syste ```rust,no_run # // NOTE: When changing this, please also keep `zbus/examples/watch-systemd-jobs.rs` in sync. use futures_util::stream::StreamExt; -use zbus::Connection; -use zbus_macros::proxy; -use zvariant::OwnedObjectPath; +use zbus::{zvariant::OwnedObjectPath, proxy, Connection}; # fn main() { # async_io::block_on(watch_systemd_jobs()).expect("Error listening to signal");