fix merge call

Author: mre

src/bin/analyzer/main.rs

@@ -64,8 +64,7 @@ fn main() -> Result<()> {
                     Ok(path) => {
                         println!("Merging {}", path.display());
                         let input = fs::read_to_string(path)?;
-                        let mut parser = Parser::new(input);
-                        let timeline = parser.parse()?;
+                        let timeline: Timeline = serde_json::from_str(&input)?;
                         merger.merge_timeline(&timeline)?;
                     }
                     Err(e) => println!("{:?}", e),

src/git.rs

@@ -36,7 +36,7 @@ pub fn parse_date(line: &str) -> Result<Option<NaiveDate>> {
         // Empty lines are allowed, but skipped
         return Ok(None);
     }
-    let date: NaiveDate = line.parse().context(format!("Invalid date {}", line))?;
+    let date: NaiveDate = line.parse().context(format!("Invalid date: {}", line))?;
     Ok(Some(date))
 }