chore: 🤖 eliminate the use of unwrap

LottieFiles · Jan 18, 2024 · a129518 · a129518
1 parent 551fa87
commit a129518
Showing 1 changed file with 28 additions and 6 deletions.
diff --git a/dotlottie-rs/src/lottie_renderer/mod.rs b/dotlottie-rs/src/lottie_renderer/mod.rs
@@ -57,9 +57,20 @@ impl LottieRenderer {
         self.width = width;
         self.height = height;
 
-        let thorvg_animation = self.thorvg_animation.as_mut().unwrap();
-        let thorvg_canvas = self.thorvg_canvas.as_mut().unwrap();
-        let thorvg_background_shape = self.thorvg_background_shape.as_mut().unwrap();
+        let thorvg_animation = self
+            .thorvg_animation
+            .as_mut()
+            .ok_or(LottieRendererError::AnimationNotLoaded)?;
+
+        let thorvg_canvas = self
+            .thorvg_canvas
+            .as_mut()
+            .ok_or(LottieRendererError::AnimationNotLoaded)?;
+
+        let thorvg_background_shape = self
+            .thorvg_background_shape
+            .as_mut()
+            .ok_or(LottieRendererError::AnimationNotLoaded)?;
 
         thorvg_canvas
             .set_target(
@@ -109,9 +120,20 @@ impl LottieRenderer {
         self.width = width;
         self.height = height;
 
-        let thorvg_animation = self.thorvg_animation.as_mut().unwrap();
-        let thorvg_canvas = self.thorvg_canvas.as_mut().unwrap();
-        let thorvg_background_shape = self.thorvg_background_shape.as_mut().unwrap();
+        let thorvg_animation = self
+            .thorvg_animation
+            .as_mut()
+            .ok_or(LottieRendererError::AnimationNotLoaded)?;
+
+        let thorvg_canvas = self
+            .thorvg_canvas
+            .as_mut()
+            .ok_or(LottieRendererError::AnimationNotLoaded)?;
+
+        let thorvg_background_shape = self
+            .thorvg_background_shape
+            .as_mut()
+            .ok_or(LottieRendererError::AnimationNotLoaded)?;
 
         thorvg_canvas
             .set_target(