Merge pull request #29 from benedikt-schaber/feat/colorlifetime

feat!: allow `Color::Named` with limited lifetimes

Author: kylebarron

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 All notable changes to this project will be documented in this file. See [conventional commits](https://www.conventionalcommits.org/) for commit guidelines.
 
+## Unreleased
+#### Features
+- BREAKING: allow `Color::Named` with limited lifetimes - benedikt-schaber
+
 ## 0.8.0 - 2025-07-12
 
 - Updated to rust 2024 edition

src/color.rs

@@ -1,14 +1,14 @@
 use std::fmt::{Display, Formatter, Result};
 
 #[derive(Debug, Clone, Copy, PartialEq)]
-pub enum Color {
-    Named(&'static str),
+pub enum Color<'a> {
+    Named(&'a str),
     Rgb(u8, u8, u8),
     Hex(u32),
     Hsl(u16, u8, u8),
 }
 
-impl Display for Color {
+impl Display for Color<'_> {
     fn fmt(&self, fmt: &mut Formatter) -> Result {
         match self {
             Color::Named(name) => write!(fmt, "{name}"),

src/style.rs

@@ -85,11 +85,11 @@ pub enum LineJoin {
 }
 
 #[derive(Debug, Clone, PartialEq)]
-pub struct Style {
+pub struct Style<'a> {
     pub opacity: Option<f32>,
-    pub fill: Option<Color>,
+    pub fill: Option<Color<'a>>,
     pub fill_opacity: Option<f32>,
-    pub stroke_color: Option<Color>,
+    pub stroke_color: Option<Color<'a>>,
     pub stroke_width: Option<f32>,
     pub stroke_opacity: Option<f32>,
     pub stroke_dasharray: Option<Vec<f32>>,
@@ -98,7 +98,7 @@ pub struct Style {
     pub radius: f32,
 }
 
-impl Default for Style {
+impl Default for Style<'_> {
     fn default() -> Self {
         Self {
             opacity: None,
@@ -115,7 +115,7 @@ impl Default for Style {
     }
 }
 
-impl Display for Style {
+impl Display for Style<'_> {
     fn fmt(&self, fmt: &mut Formatter) -> Result {
         if let Some(opacity) = self.opacity {
             write!(fmt, r#" opacity="{opacity}""#)?;

src/svg.rs

@@ -6,7 +6,7 @@ pub struct Svg<'a> {
     pub items: Vec<&'a dyn ToSvgStr>,
     pub siblings: Vec<Svg<'a>>,
     pub viewbox: ViewBox,
-    pub style: Style,
+    pub style: Style<'a>,
     pub width: Option<Unit>,
     pub height: Option<Unit>,
 }
@@ -17,7 +17,7 @@ impl<'a> Svg<'a> {
         self
     }
 
-    pub fn with_style(mut self, style: &Style) -> Self {
+    pub fn with_style(mut self, style: &Style<'a>) -> Self {
         self.style = style.clone();
         for sibling in &mut self.siblings {
             *sibling = sibling.clone().with_style(style);
@@ -30,7 +30,7 @@ impl<'a> Svg<'a> {
         self
     }
 
-    pub fn with_color(mut self, color: Color) -> Self {
+    pub fn with_color(mut self, color: Color<'a>) -> Self {
         self.style.fill = Some(color);
         self.style.stroke_color = Some(color);
         for sibling in &mut self.siblings {
@@ -47,7 +47,7 @@ impl<'a> Svg<'a> {
         self
     }
 
-    pub fn with_fill_color(mut self, fill: Color) -> Self {
+    pub fn with_fill_color(mut self, fill: Color<'a>) -> Self {
         self.style.fill = Some(fill);
         for sibling in &mut self.siblings {
             *sibling = sibling.clone().with_fill_color(fill);
@@ -79,7 +79,7 @@ impl<'a> Svg<'a> {
         self
     }
 
-    pub fn with_stroke_color(mut self, stroke_color: Color) -> Self {
+    pub fn with_stroke_color(mut self, stroke_color: Color<'a>) -> Self {
         self.style.stroke_color = Some(stroke_color);
         for sibling in &mut self.siblings {
             *sibling = sibling.clone().with_stroke_color(stroke_color);