[librsvg: 9/15] ResolvedPrimitive.get_bounds() doesn't need to return a Result anymore

[Federico Mena Quintero <federico src gnome org>]

commit e72ac06237da3f7eea74d9bda756bee99bfce88d
Author: Federico Mena Quintero <federico gnome org>
Date:   Thu Apr 8 15:53:12 2021 -0500

    ResolvedPrimitive.get_bounds() doesn't need to return a Result anymore

 src/filters/blend.rs              |  2 +-
 src/filters/color_matrix.rs       |  2 +-
 src/filters/component_transfer.rs |  2 +-
 src/filters/composite.rs          |  2 +-
 src/filters/convolve_matrix.rs    |  2 +-
 src/filters/displacement_map.rs   |  2 +-
 src/filters/flood.rs              |  2 +-
 src/filters/gaussian_blur.rs      |  2 +-
 src/filters/image.rs              |  2 +-
 src/filters/lighting.rs           |  2 +-
 src/filters/merge.rs              |  2 +-
 src/filters/mod.rs                | 10 ++--------
 src/filters/morphology.rs         |  2 +-
 src/filters/offset.rs             |  2 +-
 src/filters/tile.rs               |  2 +-
 src/filters/turbulence.rs         |  2 +-
 16 files changed, 17 insertions(+), 23 deletions(-)
---
diff --git a/src/filters/blend.rs b/src/filters/blend.rs
index 84b2e9df..11367f8c 100755
--- a/src/filters/blend.rs
+++ b/src/filters/blend.rs
@@ -89,7 +89,7 @@ impl Blend {
             self.color_interpolation_filters,
         )?;
         let bounds = primitive
-            .get_bounds(ctx)?
+            .get_bounds(ctx)
             .add_input(&input_1)
             .add_input(&input_2)
             .into_irect(ctx);
diff --git a/src/filters/color_matrix.rs b/src/filters/color_matrix.rs
index e7781c90..bfe577a3 100644
--- a/src/filters/color_matrix.rs
+++ b/src/filters/color_matrix.rs
@@ -163,7 +163,7 @@ impl ColorMatrix {
             self.color_interpolation_filters,
         )?;
         let bounds = primitive
-            .get_bounds(ctx)?
+            .get_bounds(ctx)
             .add_input(&input_1)
             .into_irect(ctx);
 
diff --git a/src/filters/component_transfer.rs b/src/filters/component_transfer.rs
index 380a6d86..8c62a091 100644
--- a/src/filters/component_transfer.rs
+++ b/src/filters/component_transfer.rs
@@ -300,7 +300,7 @@ impl ComponentTransfer {
             self.color_interpolation_filters,
         )?;
         let bounds = primitive
-            .get_bounds(ctx)?
+            .get_bounds(ctx)
             .add_input(&input_1)
             .into_irect(ctx);
 
diff --git a/src/filters/composite.rs b/src/filters/composite.rs
index f059f736..7cfdf336 100644
--- a/src/filters/composite.rs
+++ b/src/filters/composite.rs
@@ -88,7 +88,7 @@ impl Composite {
             self.color_interpolation_filters,
         )?;
         let bounds = primitive
-            .get_bounds(ctx)?
+            .get_bounds(ctx)
             .add_input(&input_1)
             .add_input(&input_2)
             .into_irect(ctx);
diff --git a/src/filters/convolve_matrix.rs b/src/filters/convolve_matrix.rs
index 4daceeed..690bdc7c 100644
--- a/src/filters/convolve_matrix.rs
+++ b/src/filters/convolve_matrix.rs
@@ -150,7 +150,7 @@ impl ConvolveMatrix {
             self.color_interpolation_filters,
         )?;
         let mut bounds = primitive
-            .get_bounds(ctx)?
+            .get_bounds(ctx)
             .add_input(&input_1)
             .into_irect(ctx);
         let original_bounds = bounds;
diff --git a/src/filters/displacement_map.rs b/src/filters/displacement_map.rs
index 03446f4e..c74163d4 100644
--- a/src/filters/displacement_map.rs
+++ b/src/filters/displacement_map.rs
@@ -93,7 +93,7 @@ impl DisplacementMap {
             self.color_interpolation_filters,
         )?;
         let bounds = primitive
-            .get_bounds(ctx)?
+            .get_bounds(ctx)
             .add_input(&input_1)
             .add_input(&displacement_input)
             .into_irect(ctx);
diff --git a/src/filters/flood.rs b/src/filters/flood.rs
index 1a316494..5ead0b93 100644
--- a/src/filters/flood.rs
+++ b/src/filters/flood.rs
@@ -33,7 +33,7 @@ impl Flood {
         _acquired_nodes: &mut AcquiredNodes<'_>,
         _draw_ctx: &mut DrawingCtx,
     ) -> Result<FilterResult, FilterError> {
-        let bounds = primitive.get_bounds(ctx)?.into_irect(ctx);
+        let bounds = primitive.get_bounds(ctx).into_irect(ctx);
 
         let surface = ctx.source_graphic().flood(bounds, self.color)?;
 
diff --git a/src/filters/gaussian_blur.rs b/src/filters/gaussian_blur.rs
index 5ae3b835..bf6ad202 100644
--- a/src/filters/gaussian_blur.rs
+++ b/src/filters/gaussian_blur.rs
@@ -199,7 +199,7 @@ impl GaussianBlur {
             self.color_interpolation_filters,
         )?;
         let bounds = primitive
-            .get_bounds(ctx)?
+            .get_bounds(ctx)
             .add_input(&input_1)
             .into_irect(ctx);
 
diff --git a/src/filters/image.rs b/src/filters/image.rs
index e8759870..51ef1e81 100644
--- a/src/filters/image.rs
+++ b/src/filters/image.rs
@@ -134,7 +134,7 @@ impl Image {
         acquired_nodes: &mut AcquiredNodes<'_>,
         draw_ctx: &mut DrawingCtx,
     ) -> Result<FilterResult, FilterError> {
-        let bounds_builder = primitive.get_bounds(ctx)?;
+        let bounds_builder = primitive.get_bounds(ctx);
         let (bounds, unclipped_bounds) = bounds_builder.into_rect(ctx);
 
         let href = self.params.href.as_ref().ok_or(FilterError::InvalidInput)?;
diff --git a/src/filters/lighting.rs b/src/filters/lighting.rs
index f6301404..739ae809 100644
--- a/src/filters/lighting.rs
+++ b/src/filters/lighting.rs
@@ -449,7 +449,7 @@ macro_rules! impl_lighting_filter {
                     self.light.color_interpolation_filters,
                 )?;
                 let mut bounds = primitive
-                    .get_bounds(ctx)?
+                    .get_bounds(ctx)
                     .add_input(&input_1)
                     .into_irect(ctx);
                 let original_bounds = bounds;
diff --git a/src/filters/merge.rs b/src/filters/merge.rs
index 1ca7f09f..031e78b9 100644
--- a/src/filters/merge.rs
+++ b/src/filters/merge.rs
@@ -103,7 +103,7 @@ impl Merge {
         draw_ctx: &mut DrawingCtx,
     ) -> Result<FilterResult, FilterError> {
         // Compute the filter bounds, taking each feMergeNode's input into account.
-        let mut bounds = primitive.get_bounds(ctx)?;
+        let mut bounds = primitive.get_bounds(ctx);
         for merge_node in &self.merge_nodes {
             let input = ctx.get_input(
                 acquired_nodes,
diff --git a/src/filters/mod.rs b/src/filters/mod.rs
index 83a0959b..04ef127c 100644
--- a/src/filters/mod.rs
+++ b/src/filters/mod.rs
@@ -166,14 +166,8 @@ impl Primitive {
 impl ResolvedPrimitive {
     /// Validates attributes and returns the `BoundsBuilder` for bounds computation.
     #[inline]
-    fn get_bounds(&self, ctx: &FilterContext) -> Result<BoundsBuilder, FilterError> {
-        Ok(BoundsBuilder::new(
-            self.x,
-            self.y,
-            self.width,
-            self.height,
-            ctx.paffine(),
-        ))
+    fn get_bounds(&self, ctx: &FilterContext) -> BoundsBuilder {
+        BoundsBuilder::new(self.x, self.y, self.width, self.height, ctx.paffine())
     }
 }
 
diff --git a/src/filters/morphology.rs b/src/filters/morphology.rs
index 183872d6..98fb5bd2 100644
--- a/src/filters/morphology.rs
+++ b/src/filters/morphology.rs
@@ -87,7 +87,7 @@ impl Morphology {
             ColorInterpolationFilters::Auto,
         )?;
         let bounds = primitive
-            .get_bounds(ctx)?
+            .get_bounds(ctx)
             .add_input(&input_1)
             .into_irect(ctx);
 
diff --git a/src/filters/offset.rs b/src/filters/offset.rs
index e316c552..9fe890f8 100644
--- a/src/filters/offset.rs
+++ b/src/filters/offset.rs
@@ -64,7 +64,7 @@ impl Offset {
             ColorInterpolationFilters::Auto,
         )?;
         let bounds = primitive
-            .get_bounds(ctx)?
+            .get_bounds(ctx)
             .add_input(&input_1)
             .into_irect(ctx);
 
diff --git a/src/filters/tile.rs b/src/filters/tile.rs
index d36aca69..b832cbb3 100644
--- a/src/filters/tile.rs
+++ b/src/filters/tile.rs
@@ -51,7 +51,7 @@ impl Tile {
         )?;
 
         // feTile doesn't consider its inputs in the filter primitive subregion calculation.
-        let bounds = primitive.get_bounds(ctx)?.into_irect(ctx);
+        let bounds = primitive.get_bounds(ctx).into_irect(ctx);
 
         let surface = match input_1 {
             FilterInput::StandardInput(input_surface) => input_surface,
diff --git a/src/filters/turbulence.rs b/src/filters/turbulence.rs
index f0fab058..7b6e3b69 100644
--- a/src/filters/turbulence.rs
+++ b/src/filters/turbulence.rs
@@ -346,7 +346,7 @@ impl Turbulence {
         _acquired_nodes: &mut AcquiredNodes<'_>,
         _draw_ctx: &mut DrawingCtx,
     ) -> Result<FilterResult, FilterError> {
-        let bounds = primitive.get_bounds(ctx)?.into_irect(ctx);
+        let bounds = primitive.get_bounds(ctx).into_irect(ctx);
 
         let affine = ctx.paffine().invert().unwrap();