X-Git-Url: http://git.scottworley.com/tablify/blobdiff_plain/a411a19d502a2ee8ce16c0cd7f447dac3293cee4..1df4654a9fff0f0a1e146c681dc05af7c3e460fe:/src/lib.rs?ds=sidebyside diff --git a/src/lib.rs b/src/lib.rs index af582d4..e20d23d 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -17,6 +17,11 @@ impl Config { .map_err(|e| std::io::Error::new(std::io::ErrorKind::InvalidInput, e))?; } else if let Some(col) = cmd.strip_prefix("col ") { self.static_columns.push(col.to_owned()); + } else { + return Err(std::io::Error::new( + std::io::ErrorKind::InvalidInput, + format!("Unknown command: {cmd}"), + )); } Ok(()) } @@ -169,7 +174,7 @@ impl<'cfg, Input: Iterator>> Iterator InputLine::Entry(col, instance) => match &mut self.row { None => { return Some(Err(std::io::Error::other(format!( - "{}: Entry with no header", + "line {}: Entry with no header", n + 1 )))) } @@ -498,11 +503,11 @@ mod tests { let bad = read_rows(&b" foo"[..]); assert!(bad.is_err()); - assert!(format!("{bad:?}").contains("1: Entry with no header")); + assert!(format!("{bad:?}").contains("line 1: Entry with no header")); let bad2 = read_rows(&b"foo\n\n bar"[..]); assert!(bad2.is_err()); - assert!(format!("{bad2:?}").contains("3: Entry with no header")); + assert!(format!("{bad2:?}").contains("line 3: Entry with no header")); } #[test] @@ -518,6 +523,10 @@ mod tests { vec!["foo".to_owned()] ); + let bad_command = read_config(&b"!no such command"[..]); + assert!(bad_command.is_err()); + assert!(format!("{bad_command:?}").contains("Unknown command")); + let bad_num = read_config(&b"!col_threshold foo"[..]); assert!(bad_num.is_err()); assert!(format!("{bad_num:?}").contains("Parse"));