Friendlier error message to serde

Kuadrant · Aug 31, 2022 · 5349bb1 · 5349bb1
1 parent 4be66cc
commit 5349bb1
Showing 1 changed file with 5 additions and 14 deletions.
diff --git a/limitador/src/limit.rs b/limitador/src/limit.rs
@@ -61,11 +61,7 @@ pub struct ConditionParsingError {
 
 impl Display for ConditionParsingError {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        write!(
-            f,
-            "Invalid condition: \"{}\"\n └ {}",
-            self.condition, self.error
-        )
+        write!(f, "{} of condition \"{}\"", self.error, self.condition)
     }
 }
 
@@ -908,15 +904,10 @@ mod tests {
     }
 
     #[test]
-    fn invalid_predicate_condition_parsing() {
-        let result = serde_json::from_str::<Condition>(r#""x != 5""#)
+    fn invalid_deprecated_condition_parsing() {
+        let _result = serde_json::from_str::<Condition>(r#""x == 5""#)
             .err()
-            .expect("should fail parsing");
-        assert_eq!(
-            result.to_string(),
-            "Invalid condition: \"x != 5\"\n └ SyntaxError: Invalid character `!` at offset 3"
-                .to_string()
-        );
+            .expect("Should fail!");
     }
 
     #[test]
@@ -926,7 +917,7 @@ mod tests {
             .expect("should fail parsing");
         assert_eq!(
             result.to_string(),
-            "Invalid condition: \"x != 5 && x > 12\"\n └ SyntaxError: Invalid character `!` at offset 3"
+            "SyntaxError: Invalid character `!` at offset 3 of condition \"x != 5 && x > 12\""
                 .to_string()
         );
     }