leyoda/iced-yoda
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Remove Color::parse method and add some more tests

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2025-11-25 23:36:51 +01:00
parent e2f5d36cee
commit 39d1971b46
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
1 changed files with 17 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

41
core/src/color.rs
View file

@ -7,9 +7,12 @@ use thiserror::Error;
/// # String Representation /// # String Representation
/// ///
/// A color can be represented in either of the following valid formats: `#rrggbb`, `#rrggbbaa`, `#rgb`, and `#rgba`. /// A color can be represented in either of the following valid formats: `#rrggbb`, `#rrggbbaa`, `#rgb`, and `#rgba`.
/// Both uppercase and lowercase letters are supported. /// Where `rgba` represent hexadecimal digits. Both uppercase and lowercase letters are supported.
/// ///
/// If `a` (transparency) is not specified, `1.0` (completely opaque) would be used by default. /// If `a` (transparency) is not specified, `1.0` (completely opaque) would be used by default.
///
/// If you have a static color string, using the [`color!`] macro should be preferred
/// since it leverages hexadecimal literal notation and arithmetic directly.
#[derive(Debug, Clone, Copy, PartialEq, Default)] #[derive(Debug, Clone, Copy, PartialEq, Default)]
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
pub struct Color { pub struct Color {
@ -109,19 +112,6 @@ impl Color {
) )
} }
/// Parses a [`Color`] from a hex string.
///
/// Supported formats are `#rrggbb`, `#rrggbbaa`, `#rgb`, and `#rgba`.
/// The starting "#" is optional. Both uppercase and lowercase are supported.
///
/// If you have a static color string, using the [`color!`] macro should be preferred
/// since it leverages hexadecimal literal notation and arithmetic directly.
///
/// [`color!`]: crate::color!
pub fn parse(s: &str) -> Option<Color> {
s.parse().ok()
}
/// Converts the [`Color`] into its RGBA8 equivalent. /// Converts the [`Color`] into its RGBA8 equivalent.
#[must_use] #[must_use]
pub fn into_rgba8(self) -> [u8; 4] { pub fn into_rgba8(self) -> [u8; 4] {
@ -272,9 +262,11 @@ impl FromStr for Color {
impl Display for Color { impl Display for Color {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
let [r, g, b, a] = self.into_rgba8(); let [r, g, b, a] = self.into_rgba8();
if self.a == 1.0 { if self.a == 1.0 {
return write!(f, "#{r:02x}{g:02x}{b:02x}"); return write!(f, "#{r:02x}{g:02x}{b:02x}");
} }
write!(f, "#{r:02x}{g:02x}{b:02x}{a:02x}") write!(f, "#{r:02x}{g:02x}{b:02x}{a:02x}")
} }
} }
@ -318,19 +310,20 @@ mod tests {
#[test] #[test]
fn parse() { fn parse() {
let tests = [ let tests = [
("#ff0000", [255, 0, 0, 255]), ("#ff0000", [255, 0, 0, 255], "#ff0000"),
("00ff0080", [0, 255, 0, 128]), ("00ff0080", [0, 255, 0, 128], "#00ff0080"),
("#F80", [255, 136, 0, 255]), ("#F80", [255, 136, 0, 255], "#ff8800"),
("#00f1", [0, 0, 255, 17]), ("#00f1", [0, 0, 255, 17], "#0000ff11"),
("#00ff", [0, 0, 255, 255], "#0000ff"),
]; ];
for (arg, expected) in tests { for (arg, expected_rgba8, expected_str) in tests {
assert_eq!( let color = arg.parse::<Color>().expect("color must parse");
Color::parse(arg).expect("color must parse").into_rgba8(),
expected assert_eq!(color.into_rgba8(), expected_rgba8);
); assert_eq!(color.to_string(), expected_str);
} }
assert!(Color::parse("invalid").is_none()); assert!("invalid".parse::<Color>().is_err());
} }
} }