aoc: stop printing inside run functions

This will make benching implementations easier

aoc2015/src/day01.rs

@@ -1,13 +1,17 @@
+use std::fmt::Write;
+
 use aoc::err;
 use aoc::Result;
 
 const INPUT: &str = include_str!("../input/day01.txt");
 
-pub fn run() -> Result<()> {
-    println!("part 1: {}", part1(INPUT)?);
-    println!("part 2: {}", part2(INPUT)?);
+pub fn run() -> Result<String> {
+    let mut res = String::with_capacity(128);
 
-    Ok(())
+    writeln!(res, "part 1: {}", part1(INPUT)?)?;
+    writeln!(res, "part 2: {}", part2(INPUT)?)?;
+
+    Ok(res)
 }
 
 fn part1(input: &str) -> Result<i64> {

aoc2015/src/day02.rs

@@ -1,4 +1,5 @@
 use std::error::Error;
+use std::fmt::Write;
 use std::str::FromStr;
 
 use aoc::err;
@@ -6,16 +7,18 @@ use aoc::Result;
 
 const INPUT: &str = include_str!("../input/day02.txt");
 
-pub fn run() -> Result<()> {
+pub fn run() -> Result<String> {
+    let mut res = String::with_capacity(128);
+
     let presents: Vec<Present> = INPUT
         .lines()
         .map(|line| line.parse())
         .collect::<Result<_>>()?;
 
-    println!("part 1: {}", part1(&presents));
-    println!("part 2: {}", part2(&presents));
+    writeln!(res, "part 1: {}", part1(&presents))?;
+    writeln!(res, "part 2: {}", part2(&presents))?;
 
-    Ok(())
+    Ok(res)
 }
 
 fn wrapping_paper(present: &Present) -> u64 {

aoc2015/src/day03.rs

@@ -1,15 +1,18 @@
 use std::collections::HashSet;
+use std::fmt::Write;
 
 use aoc::err;
 use aoc::Result;
 
 const INPUT: &str = include_str!("../input/day03.txt");
 
-pub fn run() -> Result<()> {
-    println!("part 1: {}", part1(INPUT)?);
-    println!("part 2: {}", part2(INPUT)?);
+pub fn run() -> Result<String> {
+    let mut res = String::with_capacity(128);
 
-    Ok(())
+    writeln!(res, "part 1: {}", part1(INPUT)?)?;
+    writeln!(res, "part 2: {}", part2(INPUT)?)?;
+
+    Ok(res)
 }
 
 fn part1(input: &str) -> Result<usize> {

aoc2015/src/day04.rs

@@ -1,3 +1,5 @@
+use std::fmt::Write;
+
 use md5::{Digest, Md5};
 
 use aoc::err;
@@ -5,11 +7,13 @@ use aoc::Result;
 
 const INPUT: &str = include_str!("../input/day04.txt");
 
-pub fn run() -> Result<()> {
-    println!("part 1: {}", part1(INPUT)?);
-    println!("part 2: {}", part2(INPUT)?);
+pub fn run() -> Result<String> {
+    let mut res = String::with_capacity(128);
 
-    Ok(())
+    writeln!(res, "part 1: {}", part1(INPUT)?)?;
+    writeln!(res, "part 2: {}", part2(INPUT)?)?;
+
+    Ok(res)
 }
 
 fn part1(input: &str) -> Result<u64> {

aoc2015/src/day05.rs

@@ -1,12 +1,16 @@
+use std::fmt::Write;
+
 use aoc::Result;
 
 const INPUT: &str = include_str!("../input/day05.txt");
 
-pub fn run() -> Result<()> {
-    println!("part 1: {}", part1(INPUT));
-    println!("part 2: {}", part2(INPUT));
+pub fn run() -> Result<String> {
+    let mut res = String::with_capacity(128);
 
-    Ok(())
+    writeln!(res, "part 1: {}", part1(INPUT))?;
+    writeln!(res, "part 2: {}", part2(INPUT))?;
+
+    Ok(res)
 }
 
 fn part1(input: &str) -> usize {

aoc2015/src/day06.rs

@@ -1,4 +1,5 @@
 use std::error::Error;
+use std::fmt::Write;
 use std::str::FromStr;
 
 use aoc::err;
@@ -6,11 +7,13 @@ use aoc::Result;
 
 const INPUT: &str = include_str!("../input/day06.txt");
 
-pub fn run() -> Result<()> {
-    println!("part 1: {}", part1(INPUT)?);
-    println!("part 2: {}", part2(INPUT)?);
+pub fn run() -> Result<String> {
+    let mut res = String::with_capacity(128);
 
-    Ok(())
+    writeln!(res, "part 1: {}", part1(INPUT)?)?;
+    writeln!(res, "part 2: {}", part2(INPUT)?)?;
+
+    Ok(res)
 }
 
 fn part1(input: &str) -> Result<usize> {

aoc2015/src/main.rs

@@ -1,3 +1,4 @@
+use aoc::DayFunc;
 use aoc::Result;
 
 use aoc2015::day01;
@@ -8,7 +9,7 @@ use aoc2015::day05;
 use aoc2015::day06;
 
 fn main() -> Result<()> {
-    let days: &[fn() -> Result<()>] = &[
+    let days: &[DayFunc] = &[
         day01::run,
         day02::run,
         day03::run,