From c1cc43c3e929bda77193a9fe4f94731a859ef4f8 Mon Sep 17 00:00:00 2001 From: jkomyno Date: Tue, 15 Oct 2024 12:29:37 +0400 Subject: [PATCH] feat(crosstarget-utils): replace every manual "Display" instance with "derive_more" --- libs/crosstarget-utils/src/common/spawn.rs | 12 ++++-------- libs/crosstarget-utils/src/common/timeout.rs | 11 +++-------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/libs/crosstarget-utils/src/common/spawn.rs b/libs/crosstarget-utils/src/common/spawn.rs index 7a3e9582ee78..77560452dbdc 100644 --- a/libs/crosstarget-utils/src/common/spawn.rs +++ b/libs/crosstarget-utils/src/common/spawn.rs @@ -1,12 +1,8 @@ -use std::fmt::Display; +use derive_more::Display; -#[derive(Debug)] -pub struct SpawnError; +#[derive(Debug, Display)] +#[display(fmt = "Failed to spawn a future")] -impl Display for SpawnError { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "Failed to spawn a future") - } -} +pub struct SpawnError; impl std::error::Error for SpawnError {} diff --git a/libs/crosstarget-utils/src/common/timeout.rs b/libs/crosstarget-utils/src/common/timeout.rs index 0a7cb05b3031..829abaf0ec04 100644 --- a/libs/crosstarget-utils/src/common/timeout.rs +++ b/libs/crosstarget-utils/src/common/timeout.rs @@ -1,12 +1,7 @@ -use std::fmt::Display; +use derive_more::Display; -#[derive(Debug)] +#[derive(Debug, Display)] +#[display(fmt = "Operation timed out")] pub struct TimeoutError; -impl Display for TimeoutError { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "Operation timed out") - } -} - impl std::error::Error for TimeoutError {}