Start connecting stuff

diff --git a/src/lib.rs b/src/lib.rs
index fcf5dc822e790b15b377e6c154669f6b07524c71..8d60eb8ba898b65d93f3e50c00d859206f11ba36 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,8 +1,5 @@
-#[cfg(test)]

 use std::collections::{HashMap, HashSet};
 use std::collections::{HashMap, HashSet};

-#[cfg(test)]

 use std::io::BufRead;
 use std::io::BufRead;

-#[cfg(test)]

 use std::iter::Iterator;
 
 #[derive(Debug, PartialEq, Eq)]
 use std::iter::Iterator;
 
 #[derive(Debug, PartialEq, Eq)]


@@ -16,7 +13,6 @@ struct Reader<Input: Iterator<Item = Result<String, std::io::Error>>> {
     row: Option<RowInput>,
 }
 impl<Input: Iterator<Item = Result<String, std::io::Error>>> Reader<Input> {
     row: Option<RowInput>,
 }
 impl<Input: Iterator<Item = Result<String, std::io::Error>>> Reader<Input> {

-    #[cfg(test)]

     fn new(input: Input) -> Self {
         Self {
             input: input.enumerate(),
     fn new(input: Input) -> Self {
         Self {
             input: input.enumerate(),


@@ -63,12 +59,10 @@ impl<Input: Iterator<Item = Result<String, std::io::Error>>> Iterator for Reader
     }
 }
 
     }
 }
 

-#[cfg(test)]

 fn read_rows(input: impl std::io::Read) -> impl Iterator<Item = Result<RowInput, std::io::Error>> {
     Reader::new(std::io::BufReader::new(input).lines())
 }
 
 fn read_rows(input: impl std::io::Read) -> impl Iterator<Item = Result<RowInput, std::io::Error>> {
     Reader::new(std::io::BufReader::new(input).lines())
 }
 

-#[cfg(test)]

 fn column_counts(rows: &[RowInput]) -> Vec<(usize, String)> {
     let mut counts: Vec<_> = rows
         .iter()
 fn column_counts(rows: &[RowInput]) -> Vec<(usize, String)> {
     let mut counts: Vec<_> = rows
         .iter()


@@ -86,8 +80,16 @@ fn column_counts(rows: &[RowInput]) -> Vec<(usize, String)> {
     counts
 }
 
     counts
 }
 

-pub fn tablify(_input: &impl std::io::Read) -> String {
-    String::from("Hello, world!")
+/// # Errors
+///
+/// Will return `Err` if
+///   * there's an i/o error while reading `input`
+///   * the log has invalid syntax:
+///     * an indented line with no preceding non-indented line
+pub fn tablify(input: impl std::io::Read) -> Result<String, std::io::Error> {
+    let rows = read_rows(input).collect::<Result<Vec<_>, _>>()?;
+    let _columns = column_counts(&rows);
+    Ok(String::from("Hello, world!"))

 }
 
 #[cfg(test)]
 }
 
 #[cfg(test)]

diff --git a/src/main.rs b/src/main.rs
index 95f468f340062c024fee774b0fbe7d97794d4120..8cf48593c2ce89971951551dbfdba31bd0ade0df 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,3 +1,3 @@
 fn main() {
 fn main() {

-    print!("{}", tablify::tablify(&std::io::stdin()));
+    print!("{}", tablify::tablify(std::io::stdin()).unwrap());

 }
 }