From 3c993aa73c93f0fe335ced78d9709b39cdbd1935 Mon Sep 17 00:00:00 2001
From: HampusM <hampus@hampusmat.com>
Date: Sun, 6 Nov 2022 14:06:22 +0100
Subject: refactor: improve cast error handling

---
 src/libs/intertrait/cast/arc.rs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/libs/intertrait/cast/arc.rs')

diff --git a/src/libs/intertrait/cast/arc.rs b/src/libs/intertrait/cast/arc.rs
index 1742c32..135cf64 100644
--- a/src/libs/intertrait/cast/arc.rs
+++ b/src/libs/intertrait/cast/arc.rs
@@ -31,16 +31,17 @@ impl<CastFromSelf: ?Sized + CastFromSync> CastArc for CastFromSelf
         self: Arc<Self>,
     ) -> Result<Arc<OtherTrait>, CastError>
     {
-        let caster =
-            get_caster::<OtherTrait>((*self).type_id()).ok_or(CastError::CastFailed {
-                from: type_name::<CastFromSelf>(),
-                to: type_name::<OtherTrait>(),
-            })?;
+        let caster = get_caster::<OtherTrait>((*self).type_id())
+            .map_err(CastError::GetCasterFailed)?;
 
         let cast_arc = caster
             .opt_cast_arc
             .ok_or(CastError::NotArcCastable(type_name::<OtherTrait>()))?;
 
-        Ok(cast_arc(self.arc_any()))
+        cast_arc(self.arc_any()).map_err(|err| CastError::CastFailed {
+            source: err,
+            from: type_name::<Self>(),
+            to: type_name::<OtherTrait>(),
+        })
     }
 }
-- 
cgit v1.2.3-18-g5258