From: Scott Worley Date: Mon, 19 Aug 2024 17:49:44 +0000 (-0700) Subject: Line numbers in error messages X-Git-Tag: v0.2.0~17 X-Git-Url: http://git.scottworley.com/tablify/commitdiff_plain/8110b492cfa41fd99bfb639d7491b4e075fa9385?hp=1f6bd845277daaea2513cc3dc19a0907fe9f6d6c Line numbers in error messages --- diff --git a/src/lib.rs b/src/lib.rs index 72a3add..56a2b6d 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -10,13 +10,16 @@ struct RowInput { } struct Reader>> { - input: Input, + input: std::iter::Enumerate, row: Option, } impl>> Reader { #[cfg(test)] fn new(input: Input) -> Self { - Self { input, row: None } + Self { + input: input.enumerate(), + row: None, + } } } impl>> Iterator for Reader { @@ -26,19 +29,24 @@ impl>> Iterator for Reader match self .input .next() - .map(|r| r.map(|line| String::from(line.trim_end()))) + .map(|(n, r)| (n, r.map(|line| String::from(line.trim_end())))) { None => return Ok(std::mem::take(&mut self.row)).transpose(), - Some(Err(e)) => return Some(Err(e)), - Some(Ok(line)) if line.is_empty() && self.row.is_some() => { + Some((_, Err(e))) => return Some(Err(e)), + Some((_, Ok(line))) if line.is_empty() && self.row.is_some() => { return Ok(std::mem::take(&mut self.row)).transpose() } - Some(Ok(line)) if line.is_empty() => {} - Some(Ok(line)) if line.starts_with(' ') => match &mut self.row { - None => return Some(Err(std::io::Error::other("Entry with no header"))), + Some((_, Ok(line))) if line.is_empty() => {} + Some((n, Ok(line))) if line.starts_with(' ') => match &mut self.row { + None => { + return Some(Err(std::io::Error::other(format!( + "{}: Entry with no header", + n + 1 + )))) + } Some(ref mut row) => row.entries.push(String::from(line.trim())), }, - Some(Ok(line)) => { + Some((_, Ok(line))) => { let prev = std::mem::take(&mut self.row); self.row = Some(RowInput { label: line, @@ -153,10 +161,10 @@ mod tests { let bad = read_rows(&b" foo"[..]).next().unwrap(); assert!(bad.is_err()); - assert!(format!("{bad:?}").contains("Entry with no header")); + assert!(format!("{bad:?}").contains("1: Entry with no header")); let bad2 = read_rows(&b"foo\n\n bar"[..]).nth(1).unwrap(); assert!(bad2.is_err()); - assert!(format!("{bad2:?}").contains("Entry with no header")); + assert!(format!("{bad2:?}").contains("3: Entry with no header")); } }