Fix #1478

Author: plrigaux

zbus/src/connection/builder.rs

@@ -525,7 +525,15 @@ impl<'a> Builder<'a> {
             Target::VsockStream(stream) => stream.into(),
             Target::Address(address) => {
                 guid = address.guid().map(|g| g.to_owned().into());
-                match address.connect().await? {
+
+                match address
+                    .clone()
+                    .connect()
+                    .await
+                    .map_err(|error| match error {
+                        Error::InputOutput(error) => Error::InputOutputAddress(error, address),
+                        _ => error,
+                    })? {
                     #[cfg(any(unix, not(feature = "tokio")))]
                     address::transport::Stream::Unix(stream) => stream.into(),
                     #[cfg(unix)]

zbus/src/error.rs

@@ -5,6 +5,7 @@ use zvariant::{Error as VariantError, ObjectPath};
 use crate::{
     fdo,
     message::{Message, Type},
+    Address,
 };
 
 /// The error type for `zbus`.
@@ -20,6 +21,8 @@ pub enum Error {
     Address(String),
     /// An I/O error.
     InputOutput(Arc<io::Error>),
+    /// An I/O error with its Target.
+    InputOutputAddress(Arc<io::Error>, Address),
     /// Invalid message field.
     InvalidField,
     /// Data too large.
@@ -96,6 +99,7 @@ impl error::Error for Error {
             Error::InterfaceNotFound => None,
             Error::Address(_) => None,
             Error::InputOutput(e) => Some(e),
+            Error::InputOutputAddress(e, _) => Some(e),
             Error::ExcessData => None,
             Error::Handshake(_) => None,
             Error::IncorrectEndian => None,
@@ -125,6 +129,7 @@ impl fmt::Display for Error {
             Error::Address(e) => write!(f, "address error: {e}"),
             Error::ExcessData => write!(f, "excess data"),
             Error::InputOutput(e) => write!(f, "I/O error: {e}"),
+            Error::InputOutputAddress(e, address) => write!(f, "I/O error: {e} for {address}"),
             Error::Handshake(e) => write!(f, "D-Bus handshake failed: {e}"),
             Error::IncorrectEndian => write!(f, "incorrect endian"),
             Error::InvalidField => write!(f, "invalid message field"),
@@ -160,6 +165,9 @@ impl Clone for Error {
             Error::Address(e) => Error::Address(e.clone()),
             Error::ExcessData => Error::ExcessData,
             Error::InputOutput(e) => Error::InputOutput(e.clone()),
+            Error::InputOutputAddress(e, address) => {
+                Error::InputOutputAddress(e.clone(), address.clone())
+            }
             Error::Handshake(e) => Error::Handshake(e.clone()),
             Error::IncorrectEndian => Error::IncorrectEndian,
             Error::InvalidField => Error::InvalidField,