[librsvg] filters/image.rs: Tweak how we match the Href

[Federico Mena Quintero <federico src gnome org>]

commit c06ba242cee50aa40998dbf6232587074c817124
Author: Federico Mena Quintero <federico gnome org>
Date:   Wed Nov 28 13:15:15 2018 -0600

    filters/image.rs: Tweak how we match the Href

 rsvg_internals/src/filters/image.rs | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/rsvg_internals/src/filters/image.rs b/rsvg_internals/src/filters/image.rs
index 444c4751..311e852d 100644
--- a/rsvg_internals/src/filters/image.rs
+++ b/rsvg_internals/src/filters/image.rs
@@ -114,10 +114,10 @@ impl Image {
         ctx: &FilterContext,
         draw_ctx: &mut DrawingCtx<'_>,
         bounds_builder: BoundsBuilder<'_>,
-        href: &str,
+        uri: &str,
     ) -> Result<ImageSurface, FilterError> {
         // FIXME: translate the error better here
-        let surface = handle::image_surface_new_from_href(self.handle.get() as *mut _, href)
+        let surface = handle::image_surface_new_from_href(self.handle.get() as *mut _, uri)
             .map_err(|_| FilterError::InvalidInput)?;
 
         let output_surface = ImageSurface::create(
@@ -204,15 +204,19 @@ impl Filter for Image {
         ctx: &FilterContext,
         draw_ctx: &mut DrawingCtx<'_>,
     ) -> Result<FilterResult, FilterError> {
-        let href = self.href.borrow();
-        let href = href.as_ref().ok_or(FilterError::InvalidInput)?;
+        let href_str = self.href.borrow();
+        let href_str = href_str.as_ref().ok_or(FilterError::InvalidInput)?;
 
         let bounds_builder = self.base.get_bounds(ctx);
         let bounds = bounds_builder.into_irect(draw_ctx);
 
-        let output_surface = match Href::parse(href).map_err(|_| FilterError::InvalidInput)? {
-            Href::PlainUri(_) => self.render_external_image(ctx, draw_ctx, bounds_builder, href)?,
-            _ => self.render_node(ctx, draw_ctx, bounds, href)?,
+        let href = Href::parse(href_str).map_err(|_| FilterError::InvalidInput)?;
+
+        let output_surface = match href {
+            Href::PlainUri(ref uri) => {
+                self.render_external_image(ctx, draw_ctx, bounds_builder, uri)?
+            }
+            _ => self.render_node(ctx, draw_ctx, bounds, href_str)?,
         };
 
         Ok(FilterResult {