Fix

raviqqe · raviqqe · Apr 28, 2024 · Apr 28, 2024 · Apr 28, 2024 · Apr 28, 2024
commit 87f351d94fcb73c21337d64c7c37d34fb1ff607d
diff --git a/profiler/src/lib.rs b/profiler/src/lib.rs
@@ -14,6 +14,7 @@ pub use collapse::collapse_stacks;
 pub use duration::calculate_durations;
 pub use error::Error;
 pub use flamegraph::calculate_flamegraph;
+pub use read::read_records;
 pub use record::{
     DurationRecord, ProcedureOperation, ProcedureRecord, Record, Stack, StackedRecord,
 };

diff --git a/profiler/src/read.rs b/profiler/src/read.rs
@@ -1,18 +1,22 @@
 use crate::Record;
 use core::str::FromStr;
-use std::io::BufRead;
+use std::io::{self, BufRead};
 
 pub fn read_records<R: Record>(
     reader: impl BufRead,
-) -> impl Iterator<Item = Result<R, <R as FromStr>::Err>> {
+) -> impl Iterator<Item = Result<R, <R as FromStr>::Err>>
+where
+    <R as FromStr>::Err: From<io::Error>,
+{
     reader.lines().map(|line| line?.parse())
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::ProcedureRecord;
+    use crate::{ProcedureOperation, ProcedureRecord};
     use indoc::indoc;
+    use pretty_assertions::assert_eq;
     use std::io::BufReader;
 
     #[test]
@@ -29,7 +33,23 @@ mod tests {
                 .as_bytes()
             ))
             .collect::<Vec<_>>(),
-            vec![]
+            vec![
+                ProcedureRecord::new(
+                    ProcedureOperation::Call,
+                    Stack::new(vec![Some("baz".into())]),
+                    0
+                ),
+                ProcedureRecord::new(
+                    ProcedureOperation::Return,
+                    Stack::new(vec![Some("baz".into())]),
+                    42
+                ),
+                ProcedureRecord::new(
+                    ProcedureOperation::ReturnCall,
+                    Stack::new(vec![None; 3]),
+                    2045
+                )
+            ]
         );
     }
 }