Read from UTF-8 suit symbols

src/core/card.rs

@@ -182,10 +182,10 @@ impl Suit {
     /// Returns `None` for characters not representing a Suit. The input is case-insensitive.
     pub fn from_char(c: char) -> Option<Suit> {
         match c.to_ascii_lowercase() {
-            'h' => Some(Self::Heart),
-            'c' => Some(Self::Club),
-            'd' => Some(Self::Diamond),
-            's' => Some(Self::Spade),
+            'h' | '♥' => Some(Self::Heart),
+            'c' | '♣' => Some(Self::Club),
+            'd' | '♦' => Some(Self::Diamond),
+            's' | '♠' => Some(Self::Spade),
             _ => None,
         }
     }
@@ -299,7 +299,7 @@ impl From<i32> for Card {
 impl TryFrom<String> for Card {
     type Error = String;
     fn try_from(s: String) -> Result<Self, Self::Error> {
-        if s.len() != 2 {
+        if s.chars().count() != 2 {
             return Err(format!(
                 r#"Card string "{}" is not exactly a length of 2"#,
                 s
@@ -405,6 +405,14 @@ mod tests {
         }
     }
 
+    #[test]
+    fn conversion_from_suit_symbols() {
+        for index in 1..=52 {
+            let card = Card::from(index);
+            assert_eq!(Card::from_str(&card.to_string()).unwrap(), card);
+        }
+    }
+
     #[test]
     fn conversion_error() {
         assert_eq!(