✨ Implement RenderCSS for all Option<T: RenderCSS>

ewen-lbh · May 5, 2024 · 7f1c59b · 7f1c59b
1 parent 25d66b7
commit 7f1c59b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/src/fill.rs b/src/fill.rs
@@ -147,14 +147,3 @@ impl Fill {
     }
 }
 
-impl RenderCSS for Option<Fill> {
-    fn render_fill_css(&self, colormap: &ColorMapping) -> String {
-        self.map(|fill| fill.render_fill_css(colormap))
-            .unwrap_or_default()
-    }
-
-    fn render_stroke_css(&self, colormap: &ColorMapping) -> String {
-        self.map(|fill| fill.render_stroke_css(colormap))
-            .unwrap_or_default()
-    }
-}
diff --git a/src/objects.rs b/src/objects.rs
@@ -109,6 +109,20 @@ pub trait RenderCSS {
     }
 }
 
+impl<T: RenderCSS> RenderCSS for Option<T> {
+    fn render_fill_css(&self, colormap: &ColorMapping) -> String {
+        self.as_ref()
+            .map(|v| v.render_fill_css(colormap))
+            .unwrap_or_default()
+    }
+
+    fn render_stroke_css(&self, colormap: &ColorMapping) -> String {
+        self.as_ref()
+            .map(|v| v.render_stroke_css(colormap))
+            .unwrap_or_default()
+    }
+}
+
 impl Object {
     pub fn translate(&mut self, dx: i32, dy: i32) {
         match self {