[librsvg: 17/22] Clean up the import aliases in properties.rs



commit 47a12a2787392d2fa6e362f7551598247c3e2fe7
Author: Federico Mena Quintero <federico gnome org>
Date:   Tue Jun 30 15:45:13 2020 -0500

    Clean up the import aliases in properties.rs

 rsvg_internals/src/properties.rs | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)
---
diff --git a/rsvg_internals/src/properties.rs b/rsvg_internals/src/properties.rs
index bfad3da0..20e5d27e 100644
--- a/rsvg_internals/src/properties.rs
+++ b/rsvg_internals/src/properties.rs
@@ -10,7 +10,6 @@ use crate::css::{DeclParser, Declaration, Origin};
 use crate::error::*;
 use crate::font_props::*;
 use crate::parsers::{Parse, ParseValue};
-use crate::properties;
 use crate::property_bag::PropertyBag;
 use crate::property_defs::*;
 use crate::property_macros::Property;
@@ -428,31 +427,27 @@ impl SpecifiedValues {
     }
 
     fn set_property_expanding_shorthands(&mut self, prop: &ParsedProperty, replace: bool) {
-        use crate::properties::ParsedProperty::*;
-
         match *prop {
-            Marker(SpecifiedValue::Specified(ref m)) => self.expand_marker(m, replace),
+            ParsedProperty::Marker(SpecifiedValue::Specified(ref m)) => self.expand_marker_shorthand(m, 
replace),
 
             _ => self.set_property(prop, replace),
         }
     }
 
-    fn expand_marker(&mut self, marker: &properties::Marker, replace: bool) {
-        use crate::properties as p;
-        use crate::properties::ParsedProperty::*;
 
-        let p::Marker(v) = marker;
+    fn expand_marker_shorthand(&mut self, marker: &Marker, replace: bool) {
+        let Marker(v) = marker;
 
         self.set_property(
-            &MarkerStart(SpecifiedValue::Specified(p::MarkerStart(v.clone()))),
+            &ParsedProperty::MarkerStart(SpecifiedValue::Specified(MarkerStart(v.clone()))),
             replace,
         );
         self.set_property(
-            &MarkerMid(SpecifiedValue::Specified(p::MarkerMid(v.clone()))),
+            &ParsedProperty::MarkerMid(SpecifiedValue::Specified(MarkerMid(v.clone()))),
             replace,
         );
         self.set_property(
-            &MarkerEnd(SpecifiedValue::Specified(p::MarkerEnd(v.clone()))),
+            &ParsedProperty::MarkerEnd(SpecifiedValue::Specified(MarkerEnd(v.clone()))),
             replace,
         );
     }


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