From 2fbb97644eb87ea8372a87dbd3c48a12a0da9fed Mon Sep 17 00:00:00 2001 From: Tait Hoyem Date: Wed, 26 Jun 2024 20:45:11 -0600 Subject: [PATCH] Remove use of ref to format!(...), compose output instead --- atspi-common/src/error.rs | 52 ++++++++++++++++++++++++++++++--------- atspi-common/src/role.rs | 2 +- 2 files changed, 41 insertions(+), 13 deletions(-) diff --git a/atspi-common/src/error.rs b/atspi-common/src/error.rs index 32b407dd..e18f6dc2 100644 --- a/atspi-common/src/error.rs +++ b/atspi-common/src/error.rs @@ -74,31 +74,56 @@ impl std::fmt::Display for AtspiError { match self { Self::Conversion(e) => f.write_str(&format!("atspi: conversion failure: {e}")), Self::MemberMatch(e) => { - f.write_str(format!("atspi: member mismatch in conversion: {e}").as_str()) + f.write_str("atspi: member mismatch in conversion: ")?; + e.fmt(f) } Self::InterfaceMatch(e) => { - f.write_str(format!("atspi: interface mismatch in conversion: {e}").as_str()) + f.write_str("atspi: interface mismatch in conversion: ")?; + e.fmt(f) } Self::UnknownBusSignature(e) => { - f.write_str(format!("atspi: Unknown bus body signature: {e:?}").as_str()) + f.write_str("atspi: Unknown bus body signature: ")?; + e.fmt(f) } Self::UnknownInterface => f.write_str("Unknown interface."), Self::MissingInterface => f.write_str("Missing interface."), Self::MissingMember => f.write_str("Missing member."), Self::MissingSignature => f.write_str("Missing signature."), - Self::UnknownRole(e) => f.write_str(&format!("atspi: Unknown role: {e}")), + Self::UnknownRole(e) => { + f.write_str("atspi: Unknown role: ")?; + e.fmt(f) + } Self::UnknownSignal => f.write_str("atspi: Unknown signal"), Self::CacheVariantMismatch => f.write_str("atspi: Cache variant mismatch"), - Self::Owned(e) => f.write_str(&format!("atspi: other error: {e}")), - Self::Zbus(e) => f.write_str(&format!("ZBus Error: {e}")), - Self::Zvariant(e) => f.write_str(&format!("Zvariant error: {e}")), - Self::ZBusNames(e) => f.write_str(&format!("ZBus_names Error: {e}")), + Self::Owned(e) => { + f.write_str("atspi: other error: ")?; + e.fmt(f) + } + Self::Zbus(e) => { + f.write_str("ZBus Error: ")?; + e.fmt(f) + } + Self::Zvariant(e) => { + f.write_str("Zvariant error: ")?; + e.fmt(f) + } + Self::ZBusNames(e) => { + f.write_str("ZBus_names Error: ")?; + e.fmt(f) + } Self::ParseError(e) => f.write_str(e), Self::PathConversionError(e) => { - f.write_str(&format!("ID cannot be extracted from the path: {e}")) + f.write_str("ID cannot be extracted from the path: ")?; + e.fmt(f) + } + Self::IO(e) => { + f.write_str("std IO Error: ")?; + e.fmt(f) + } + Self::IntConversionError(e) => { + f.write_str("Integer conversion error: ")?; + e.fmt(f) } - Self::IO(e) => f.write_str(&format!("std IO Error: {e}")), - Self::IntConversionError(e) => f.write_str(&format!("Integer conversion error: {e}")), Self::MissingName => f.write_str("Missing name for a bus."), Self::Infallible => { f.write_str("Infallible; only to trick the compiler. This should never happen.") @@ -166,7 +191,10 @@ impl std::fmt::Display for ObjectPathConversionError { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { match self { Self::NoIdAvailable => f.write_str("No ID available in the path."), - Self::ParseError(e) => f.write_str(&format!("Failure to parse: {e}")), + Self::ParseError(e) => { + f.write_str("Failure to parse: {e}")?; + e.fmt(f) + } } } } diff --git a/atspi-common/src/role.rs b/atspi-common/src/role.rs index 417f67b1..9093c2c3 100644 --- a/atspi-common/src/role.rs +++ b/atspi-common/src/role.rs @@ -612,7 +612,7 @@ impl Role { impl std::fmt::Display for Role { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{}", self.name()) + f.write_str(self.name()) } }