fmt

src/machine/lib_machine.rs

@@ -491,12 +491,8 @@ mod tests {
                 machine.consult_module_string("facts", code.to_string());
             } else if let Some(result) = block.strip_prefix("result") {
                 if let Some(Ok(ref last_result)) = last_result {
-                    assert_eq!(
+                    assert_eq!(last_result.to_string().trim(), result.to_string().trim(),)
-                        last_result.to_string().trim(),
-                        result.to_string().trim(),
-                    )
                 }
-                
             }
         }
     }
@@ -548,21 +544,13 @@ mod tests {
             ),
         );
 
-        let query =
+        let query = String::from(r#"property_resolve(C, "isLiked"), subject_class("Todo", C)."#);
-            String::from(r#"property_resolve(C, "isLiked"), subject_class("Todo", C)."#);
         let output = machine.run_query(query);
-        assert_eq!(
+        assert_eq!(output, Ok(QueryResolution::False));
-            output,
-            Ok(QueryResolution::False)
-        );
 
-        let query =
+        let query = String::from(r#"subject_class("Todo", C), property_resolve(C, "isLiked")."#);
-        String::from(r#"subject_class("Todo", C), property_resolve(C, "isLiked")."#);
         let output = machine.run_query(query);
-        assert_eq!(
+        assert_eq!(output, Ok(QueryResolution::False));
-            output,
-            Ok(QueryResolution::False)
-        );
     }
 
     #[test]
@@ -579,36 +567,20 @@ mod tests {
             ),
         );
 
-        let query =
+        let query = String::from(r#"a("true for a")."#);
-            String::from(r#"a("true for a")."#);
         let output = machine.run_query(query);
-        assert_eq!(
+        assert_eq!(output, Ok(QueryResolution::True));
-            output,
-            Ok(QueryResolution::True)
-        );
 
-        let query =
+        let query = String::from(r#"a("true for a"), b("true for b")."#);
-            String::from(r#"a("true for a"), b("true for b")."#);
         let output = machine.run_query(query);
-        assert_eq!(
+        assert_eq!(output, Ok(QueryResolution::True));
-            output,
-            Ok(QueryResolution::True)
-        );
 
-        let query =
+        let query = String::from(r#"a("true for b"), b("true for b")."#);
-            String::from(r#"a("true for b"), b("true for b")."#);
         let output = machine.run_query(query);
-        assert_eq!(
+        assert_eq!(output, Ok(QueryResolution::False));
-            output,
-            Ok(QueryResolution::False)
-        );
 
-        let query =
+        let query = String::from(r#"a("true for a"), b("true for a")."#);
-            String::from(r#"a("true for a"), b("true for a")."#);
         let output = machine.run_query(query);
-        assert_eq!(
+        assert_eq!(output, Ok(QueryResolution::False));
-            output,
-            Ok(QueryResolution::False)
-        );
     }
 }

src/machine/parsed_results.rs

@@ -19,19 +19,22 @@ pub fn prolog_value_to_json_tring(value: Value) -> String {
         Value::Float(f) => format!("{}", f),
         Value::Rational(r) => format!("{}", r),
         Value::Atom(a) => format!("{}", a.as_str()),
-        Value::String(s) => 
+        Value::String(s) => {
             if let Err(_e) = serde_json::from_str::<serde_json::Value>(s.as_str()) {
                 //treat as string literal
                 //escape double quotes
-                format!("\"{}\"", s
+                format!(
-                    .replace("\"", "\\\"")
+                    "\"{}\"",
+                    s.replace("\"", "\\\"")
                         .replace("\n", "\\n")
                         .replace("\t", "\\t")
-                    .replace("\r", "\\r"))
+                        .replace("\r", "\\r")
+                )
             } else {
                 //return valid json string
                 s
-            },
+            }
+        }
         Value::List(l) => {
             let mut string_result = "[".to_string();
             for (i, v) in l.iter().enumerate() {
@@ -64,7 +67,11 @@ fn prolog_match_to_json_string(query_match: &QueryMatch) -> String {
         if i > 0 {
             string_result.push_str(",");
         }
-        string_result.push_str(&format!("\"{}\":{}", k, prolog_value_to_json_tring(v.clone())));
+        string_result.push_str(&format!(
+            "\"{}\":{}",
+            k,
+            prolog_value_to_json_tring(v.clone())
+        ));
     }
     string_result.push_str("}");
     string_result