From 354a64fd23ebf89f15fb4695936856d9c23b16b5 Mon Sep 17 00:00:00 2001
From: Bill Thiede <git@xinu.tv>
Date: Sat, 5 Dec 2020 08:43:30 -0800
Subject: [PATCH] Day 4 try using FromStr instead of From<&str>.

---
 2020/src/day4.rs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/2020/src/day4.rs b/2020/src/day4.rs
index 45eff67..58a8fe7 100644
--- a/2020/src/day4.rs
+++ b/2020/src/day4.rs
@@ -107,6 +107,8 @@
 //! iyr:2010 hgt:158cm hcl:#b6652a ecl:blu byr:1944 eyr:2021 pid:093154719
 //! Count the number of valid passports - those that have all required fields and valid values. Continue to treat cid as optional. In your batch file, how many passports are valid?
 
+use std::str::FromStr;
+
 use aoc_runner_derive::{aoc, aoc_generator};
 
 #[derive(Debug, Default, PartialEq)]
@@ -215,8 +217,10 @@ impl Passport {
     }
 }
 
-impl From<&str> for Passport {
-    fn from(input: &str) -> Passport {
+impl FromStr for Passport {
+    type Err = ();
+
+    fn from_str(input: &str) -> Result<Passport, ()> {
         let mut p = Passport::default();
         input
             .replace('\n', " ")
@@ -236,13 +240,13 @@ impl From<&str> for Passport {
                     s => panic!(format!("unknown key: '{}'", s)),
                 };
             });
-        p
+        Ok(p)
     }
 }
 
 #[aoc_generator(day4)]
 fn parse(input: &str) -> Vec<Passport> {
-    input.split("\n\n").map(Passport::from).collect()
+    input.split("\n\n").filter_map(|s| s.parse().ok()).collect()
 }
 
 #[aoc(day4, part1)]