Unit variant errors in the hot loop

frost/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "frost"
-version = "0.4.0"
+version = "0.4.1"
 edition = "2021"
 rust-version = "1.65"
 build = "build.rs"

frost/benches/construct.rs

@@ -14,14 +14,15 @@ const COMPRESSED_LZ4: &[u8] = include_bytes!("../tests/fixtures/compressed_lz4.b
 #[cfg(test)]
 mod tests {
     use super::*;
-    use frost::{query::Query, BagMetadata};
+    use frost::{query::Query, DecompressedBag};
     use test::Bencher;
 
     #[bench]
     fn bench_from_bytes(b: &mut Bencher) {
         b.iter(|| {
             for _i in 0..1000 {
-                let mut _bag = hint::black_box(BagMetadata::from_bytes(COMPRESSED_LZ4).unwrap());
+                let mut _bag =
+                    hint::black_box(DecompressedBag::from_bytes(COMPRESSED_LZ4).unwrap());
             }
         });
     }
@@ -30,14 +31,14 @@ mod tests {
     fn bench_from_file(b: &mut Bencher) {
         b.iter(|| {
             for _i in 0..1000 {
-                let mut _bag = hint::black_box(BagMetadata::from_file(BAG_PATH).unwrap());
+                let mut _bag = hint::black_box(DecompressedBag::from_file(BAG_PATH).unwrap());
             }
         });
     }
 
     #[bench]
     fn bench_iterate_from_bytes(b: &mut Bencher) {
-        let bag = BagMetadata::from_bytes(COMPRESSED_LZ4).unwrap();
+        let bag = DecompressedBag::from_bytes(COMPRESSED_LZ4).unwrap();
         let query = Query::all();
 
         b.iter(|| {
@@ -51,7 +52,7 @@ mod tests {
 
     #[bench]
     fn bench_iterate_from_file(b: &mut Bencher) {
-        let bag = BagMetadata::from_file(BAG_PATH).unwrap();
+        let bag = DecompressedBag::from_file(BAG_PATH).unwrap();
         let query = Query::all();
 
         b.iter(|| {

frost/src/errors.rs

@@ -1,4 +1,3 @@
-use std::borrow::Cow;
 use std::error;
 use std::fmt;
 use std::io;
@@ -19,11 +18,10 @@ impl Error {
 #[derive(Debug)]
 pub enum ErrorKind {
     NotARosbag,
-    UnindexedBag,
-    InvalidBag(Cow<'static, str>),
     Deserialization(serde_rosmsg::Error),
     Decompression(lz4_flex::block::DecompressError),
     Io(io::Error),
+    Parse(ParseError),
 }
 
 impl fmt::Display for Error {
@@ -33,10 +31,9 @@ impl fmt::Display for Error {
                 write!(f, "invalid rosbag v2 header")
             }
             ErrorKind::Io(ref e) => e.fmt(f),
-            ErrorKind::UnindexedBag => write!(f, "unindexed bag"),
-            ErrorKind::InvalidBag(ref cow) => write!(f, "invalid bag: {cow}"),
             ErrorKind::Deserialization(ref e) => e.fmt(f),
             ErrorKind::Decompression(ref e) => e.fmt(f),
+            ErrorKind::Parse(ref e) => e.fmt(f),
         }
     }
 }
@@ -66,3 +63,34 @@ impl From<lz4_flex::block::DecompressError> for Error {
         }
     }
 }
+
+impl From<ParseError> for Error {
+    fn from(e: ParseError) -> Error {
+        Error {
+            kind: ErrorKind::Parse(e),
+        }
+    }
+}
+
+#[derive(Debug)]
+pub enum ParseError {
+    MissingRecord,
+    MissingFieldSeparator,
+    MissingHeaderOp,
+    InvalidOpCode,
+    BufferTooSmall,
+    UnexpectedEOF,
+    UnexpectedField,
+    UnexpectedOpCode,
+    MissingField,
+    InvalidBag,
+    UnindexedBag,
+}
+
+impl std::fmt::Display for ParseError {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "Error: {:?}", self)
+    }
+}
+
+impl std::error::Error for ParseError {}