Address CR comments

Signed-off-by: Gaurang Tapase <gtapase@ddn.com>

Author: gaurangtapase

lustre-collector/src/lib.rs

@@ -63,7 +63,7 @@ pub fn parse_lctl_output(lctl_output: &[u8]) -> Result<Vec<Record>, LustreCollec
 pub fn parse_mgs_fs_output(mgs_fs_output: &[u8]) -> Result<Vec<Record>, LustreCollectorError> {
     let mgs_fs = str::from_utf8(mgs_fs_output)?;
 
-    let (mgs_fs_record, state) = mgs::mgs_fs_parser::parse()
+    let (mgs_fs_record, state) = parser::parse()
         .easy_parse(mgs_fs)
         .map_err(|err| err.map_position(|p| p.translate_position(mgs_fs)))?;
 
@@ -78,7 +78,7 @@ pub fn parse_recovery_status_output(
     let recovery_status = str::from_utf8(recovery_status_output)?;
     let recovery_status = recovery_status.trim();
 
-    let (recovery_statuses, state) = recovery_status_parser::parse()
+    let (recovery_statuses, state) = parser::parse()
         .easy_parse(recovery_status)
         .map_err(|err| err.map_position(|p| p.translate_position(recovery_status)))?;
 
@@ -89,39 +89,30 @@ pub fn parse_recovery_status_output(
 
 #[cfg(test)]
 mod tests {
-    use crate::{Record, parse_lctl_output, parse_recovery_status_output};
+    use crate::{parse_lctl_output, parse_recovery_status_output};
 
     #[test]
     fn ex8761_job_stats() {
         let xs = include_bytes!("./fixtures/valid/ex8761-lctl.txt");
         let expected = parse_lctl_output(xs).unwrap();
 
-        let y = serde_json::to_string(&expected).unwrap();
-        let z: Vec<Record> = serde_json::from_str(&y).unwrap();
-
-        assert_eq!(expected, z);
+        insta::assert_debug_snapshot!(expected);
     }
 
     #[test]
     fn test_parse_recovery_status_output() {
         let xs = include_bytes!("./fixtures/recovery-multiple.txt");
         let expected = parse_recovery_status_output(xs).unwrap();
 
-        let y = serde_json::to_string(&expected).unwrap();
-        let z: Vec<Record> = serde_json::from_str(&y).unwrap();
-
-        assert_eq!(expected, z);
+        insta::assert_debug_snapshot!(expected);
     }
 
     #[test]
     fn es_6_2_0_job_stats_unhealthy() {
         let xs = include_bytes!("./fixtures/valid/params-6.2.0-r9.txt");
         let expected = parse_lctl_output(xs).unwrap();
 
-        let y = serde_json::to_string(&expected).unwrap();
-        let z: Vec<Record> = serde_json::from_str(&y).unwrap();
-
-        assert_eq!(expected, z);
+        insta::assert_debug_snapshot!(expected);
     }
 
     #[test]

lustre-collector/src/recovery_status_parser.rs

@@ -229,14 +229,11 @@ where
     I: Stream<Token = char>,
     I::Error: ParseError<I::Token, I::Range, I::Position>,
 {
-    many1(
-        (
-            target_status(),
-            skip_until(attempt(ost_or_mdt().map(drop)).or(eof())),
-        )
-            .map(|(x, _)| x),
+    (
+        target_status(),
+        skip_until(attempt(ost_or_mdt().map(drop)).or(eof())),
     )
-    .map(|xs: Vec<Vec<TargetStats>>| xs.into_iter().flatten().map(Record::Target).collect())
+        .map(|(x, _)| x.into_iter().map(Record::Target).collect())
 }
 
 #[cfg(test)]