From 118651055b7844e04aa5b89023c385e483de305f Mon Sep 17 00:00:00 2001
From: HampusM <hampus@hampusmat.com>
Date: Tue, 31 Jan 2023 21:44:05 +0100
Subject: fix: remove unwrap from generated implementations of Injectable

---
 macros/src/injectable/implementation.rs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'macros')

diff --git a/macros/src/injectable/implementation.rs b/macros/src/injectable/implementation.rs
index e81dd2d..30132bf 100644
--- a/macros/src/injectable/implementation.rs
+++ b/macros/src/injectable/implementation.rs
@@ -430,10 +430,16 @@ impl<Dep: IDependency> InjectableImpl<Dep>
         };
 
         Ok(quote! {
-            #do_method_call.map_err(|err| #resolve_failed_error {
-                reason: Box::new(err),
-                affected: self_type_name
-            })?.#to_ptr().unwrap()
+            #do_method_call
+                .map_err(|err| #resolve_failed_error {
+                    reason: Box::new(err),
+                    affected: self_type_name
+                })?
+                .#to_ptr()
+                .map_err(|err| InjectableError:: PrepareDependencyFailed {
+                    reason: err,
+                    dependency_name: #dep_interface_str
+                })?
         })
     }
 
-- 
cgit v1.2.3-18-g5258