[librsvg] shapes.rs: Use property_bag::length_or_none() in a spot that was missing



commit 3baaa2047b554ff6ada85800250b724ae0b8f8ea
Author: Federico Mena Quintero <federico gnome org>
Date:   Mon Sep 4 16:03:05 2017 -0500

    shapes.rs: Use property_bag::length_or_none() in a spot that was missing

 rust/src/shapes.rs |   17 ++---------------
 1 files changed, 2 insertions(+), 15 deletions(-)
---
diff --git a/rust/src/shapes.rs b/rust/src/shapes.rs
index d2808f0..97a773b 100644
--- a/rust/src/shapes.rs
+++ b/rust/src/shapes.rs
@@ -263,21 +263,8 @@ impl NodeTrait for NodeRect {
         self.w.set (property_bag::length_or_default (pbag, "width", LengthDir::Horizontal)?);
         self.h.set (property_bag::length_or_default (pbag, "height", LengthDir::Vertical)?);
 
-        let v = property_bag::lookup (pbag, "rx");
-        if let Some (val) = v {
-            let rlength = RsvgLength::parse (&val, LengthDir::Horizontal);
-            self.rx.set (rlength.map (|v| Some (v)).unwrap_or (None));
-        } else {
-            self.rx.set (None);
-        }
-
-        let v = property_bag::lookup (pbag, "ry");
-        if let Some (val) = v {
-            let rlength = RsvgLength::parse (&val, LengthDir::Vertical);
-            self.ry.set (rlength.map (|v| Some (v)).unwrap_or (None));
-        } else {
-            self.ry.set (None);
-        }
+        self.rx.set (property_bag::length_or_none (pbag, "rx", LengthDir::Horizontal)?);
+        self.ry.set (property_bag::length_or_none (pbag, "ry", LengthDir::Vertical)?);
 
         Ok (())
     }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]