Merge #54

54: Don't loop{} on errors during suggestion parsing r=killercup a=oli-obk

Author: bors[bot]

src/lib.rs

@@ -7,14 +7,16 @@ use std::collections::HashSet;
 pub mod diagnostics;
 use diagnostics::{Diagnostic, DiagnosticSpan};
 
-pub fn get_suggestions_from_json<S: ::std::hash::BuildHasher>(input: &str, only: &HashSet<String, S>) -> Vec<Suggestion> {
-    serde_json::Deserializer::from_str(input)
-        .into_iter::<Diagnostic>()
-        // eat parsing errors
-        .flat_map(|line| line.ok())
+pub fn get_suggestions_from_json<S: ::std::hash::BuildHasher>(
+    input: &str,
+    only: &HashSet<String, S>,
+) -> serde_json::error::Result<Vec<Suggestion>> {
+    let mut result = Vec::new();
+    for cargo_msg in serde_json::Deserializer::from_str(input).into_iter::<Diagnostic>() {
         // One diagnostic line might have multiple suggestions
-        .filter_map(|cargo_msg| collect_suggestions(&cargo_msg, only))
-        .collect()
+        result.extend(collect_suggestions(&cargo_msg?, only));
+    }
+    Ok(result)
 }
 
 #[derive(Debug, Copy, Clone, Hash, PartialEq)]

tests/everything.rs

@@ -125,7 +125,7 @@ fn test_rustfix_with_file<P: AsRef<Path>>(file: P) -> Result<(), Box<Error>> {
     debug!("next up: {:?}", file);
     let code = read_file(file)?;
     let errors = compile_and_get_json_errors(file)?;
-    let suggestions = rustfix::get_suggestions_from_json(&errors, &HashSet::new());
+    let suggestions = rustfix::get_suggestions_from_json(&errors, &HashSet::new()).expect("could not load suggestions");
 
     if std::env::var("RUSTFIX_TEST_RECORD_JSON").is_ok() {
         use std::io::Write;
@@ -134,7 +134,7 @@ fn test_rustfix_with_file<P: AsRef<Path>>(file: P) -> Result<(), Box<Error>> {
     }
 
     let expected_json = read_file(&json_file)?;
-    let expected_suggestions = rustfix::get_suggestions_from_json(&expected_json, &HashSet::new());
+    let expected_suggestions = rustfix::get_suggestions_from_json(&expected_json, &HashSet::new()).expect("could not load expected suggesitons");
     assert_eq!(
         expected_suggestions,
         suggestions,