Move DEFAULT const into separate function

Much cleaner. This is the way.

Author: Beinsezii

src/lib.rs

@@ -939,7 +939,7 @@ pub fn str2col(mut s: &str) -> Option<(Space, [f32; 3])> {
     let mut result = [f32::NAN; 3];
 
     // Return hex if valid
-    if let Ok(irgb) = hex_to_irgb::<3, 255>(s) {
+    if let Ok(irgb) = hex_to_irgb(s) {
         return Some((space, irgb_to_srgb(irgb)));
     }
 
@@ -1201,8 +1201,7 @@ where
 
 /// Create integer RGB set from hex string.
 /// `DEFAULT` is only used when 4 channels are requested but 3 is given.
-/// < 3 pairs or > 4 pairs will `Err`
-pub fn hex_to_irgb<const N: usize, const DEFAULT: u8>(hex: &str) -> Result<[u8; N], String>
+pub fn hex_to_irgb_default<const N: usize, const DEFAULT: u8>(hex: &str) -> Result<[u8; N], String>
 where
     Channels<N>: ValidChannels,
 {
@@ -1242,6 +1241,16 @@ where
     Ok(result)
 }
 
+/// Create integer RGB set from hex string.
+/// Will default to 255 for alpha if 4 channels requested but hex length is 6.
+/// Use `hex_to_irgb_default` to customize this.
+pub fn hex_to_irgb<const N: usize>(hex: &str) -> Result<[u8; N], String>
+where
+    Channels<N>: ValidChannels,
+{
+    hex_to_irgb_default::<N, 255>(hex)
+}
+
 /// Convert from HSV to sRGB.
 pub fn hsv_to_srgb<T: DType, const N: usize>(pixel: &mut [T; N])
 where

src/tests.rs

@@ -249,14 +249,17 @@ fn hex_to_alpha() {
 
 #[test]
 fn hex_from() {
-    assert_eq!(IRGB, hex_to_irgb::<3, 255>(HEX).unwrap());
-    assert_eq!(IRGB, hex_to_irgb::<3, 255>(HEXA).unwrap());
+    assert_eq!(IRGB, hex_to_irgb(HEX).unwrap());
+    assert_eq!(IRGB, hex_to_irgb(HEXA).unwrap());
 }
 
 #[test]
 fn hex_from_alpha() {
-    assert_eq!([IRGB[0], IRGB[1], IRGB[2], 123], hex_to_irgb::<4, 123>(HEX).unwrap());
-    assert_eq!(IRGBA, hex_to_irgb::<4, 255>(HEXA).unwrap());
+    assert_eq!(
+        [IRGB[0], IRGB[1], IRGB[2], 123],
+        hex_to_irgb_default::<4, 123>(HEX).unwrap()
+    );
+    assert_eq!(IRGBA, hex_to_irgb(HEXA).unwrap());
 }
 
 #[test]
@@ -271,14 +274,14 @@ fn hex_validations() {
         "  ABCDEF     ",
         "  #ABCDEF     ",
     ] {
-        assert!(hex_to_irgb::<3, 255>(hex).is_ok(), "NOT VALID 3: '{}'", hex);
-        assert!(hex_to_irgb::<4, 255>(hex).is_ok(), "NOT VALID 4: '{}'", hex);
+        assert!(hex_to_irgb::<3>(hex).is_ok(), "NOT VALID 3: '{}'", hex);
+        assert!(hex_to_irgb::<4>(hex).is_ok(), "NOT VALID 4: '{}'", hex);
     }
     for hex in [
         "", "#", "#5F", "#ABCDEG", "#abcdeg", "#ABCDEFF", "#abcdeg", "##ABCDEF", "ABCDEF#",
     ] {
-        assert!(hex_to_irgb::<3, 255>(hex).is_err(), "NOT INVALID 3: '{}'", hex);
-        assert!(hex_to_irgb::<4, 255>(hex).is_err(), "NOT INVALID 4: '{}'", hex);
+        assert!(hex_to_irgb::<3>(hex).is_err(), "NOT INVALID 3: '{}'", hex);
+        assert!(hex_to_irgb::<4>(hex).is_err(), "NOT INVALID 4: '{}'", hex);
     }
 }