move try_unwrap.rs and print.rs into utils.rs

Author: remi-dupre

src/input.rs

@@ -1,11 +1,13 @@
+//! Tools used to fetch input contents from adventofcode.com.
+
 use std::error::Error;
 use std::fs::{create_dir_all, read_to_string, File};
 use std::io::Write;
 use std::io::{stdin, stdout};
 use std::path::PathBuf;
 use std::time::Instant;
 
-use crate::print::Line;
+use crate::utils::Line;
 
 const BASE_URL: &str = "https://adventofcode.com";
 const INPUT_DIR: &str = "input";

src/lib.rs

@@ -1,8 +1,7 @@
 pub mod input;
 pub mod parse;
-pub mod print;
 pub mod run;
-pub mod try_unwrap;
+pub mod utils;
 
 use std::path::PathBuf;
 

src/parse.rs

@@ -1,3 +1,5 @@
+//! Macro used to parse input tokens.
+
 // Call `apply` macro on this generated form of token tree;
 // $ctx, { day DAY { { gen GENERATOR } { { sol SOLUTION } { sol SOLUTION } } } }
 #[macro_export]

src/run.rs

@@ -1,3 +1,5 @@
+//! Generate code to run solutions.
+
 #[macro_export]
 macro_rules! run_day {
     (
@@ -41,7 +43,7 @@ macro_rules! run_gen {
 
     // Run generator
     ( $day: ident, $data: expr, { gen $generator: ident } ) => {{
-        use $crate::print::Line;
+        use $crate::utils::Line;
 
         let start = Instant::now();
         let input = $day::$generator($data);
@@ -53,8 +55,7 @@ macro_rules! run_gen {
     // Run fallible generator
     ( $day: ident, $data: expr, { gen_fallible $generator: ident } ) => {{
         use $crate::colored::*;
-        use $crate::print::Line;
-        use $crate::try_unwrap::TryUnwrap;
+        use $crate::utils::{Line, TryUnwrap};
 
         let start = Instant::now();
         let result = $day::$generator($data);
@@ -83,7 +84,7 @@ macro_rules! run_sol {
     // Run solution
     ( $day: ident, $input: expr, { sol $solution: ident } ) => {{
         use $crate::colored::*;
-        use $crate::print::Line;
+        use $crate::utils::Line;
 
         let start = Instant::now();
         let response = $day::$solution($input);
@@ -100,8 +101,7 @@ macro_rules! run_sol {
     // Run fallible solution
     ( $day: ident, $input: expr, { sol_fallible $solution: ident } ) => {{
         use $crate::colored::*;
-        use $crate::print::Line;
-        use $crate::try_unwrap::TryUnwrap;
+        use $crate::utils::{Line, TryUnwrap};
 
         let start = Instant::now();
         let response = $day::$solution($input);
@@ -126,7 +126,7 @@ macro_rules! run_sol {
 macro_rules! skip_sol {
     ({ $kind: tt $solution: ident }) => {{
         use $crate::colored::*;
-        use $crate::print::Line;
+        use $crate::utils::Line;
 
         println!(
             "  - {}",

src/try_unwrap.rs

@@ -1,10 +1,45 @@
+//! General purpose utilities.
+
 use colored::*;
 
 use std::cmp::min;
 use std::fmt;
 use std::iter;
 use std::time::Duration;
 
+// ---
+// --- TryUnwrap: wrapper for Option and Result
+// ---
+
+pub trait TryUnwrap {
+    type Val;
+    fn try_unwrap(self) -> Result<Self::Val, String>;
+}
+
+impl<T> TryUnwrap for Option<T> {
+    type Val = T;
+
+    fn try_unwrap(self) -> Result<Self::Val, String> {
+        if let Some(val) = self {
+            Ok(val)
+        } else {
+            Err("empty output".to_string())
+        }
+    }
+}
+
+impl<T, E: fmt::Display> TryUnwrap for Result<T, E> {
+    type Val = T;
+
+    fn try_unwrap(self) -> Result<Self::Val, String> {
+        self.map_err(|err| format!("{}", err))
+    }
+}
+
+// ---
+// --- Line: helper struct for printing
+// ---
+
 const DEFAULT_WIDTH: usize = 30;
 
 /// Simple helper struct used to display lines with a dotted separator.