chore: Make Debug implementation for SchemaNode opaque

Signed-off-by: Dmitry Dygalo <[email protected]>
Stranger6667 · Sep 16, 2024 · f9bb59f · f9bb59f
1 parent aa295e7
commit f9bb59f
Show file tree

Hide file tree

Showing 41 changed files with 32 additions and 768 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+### Changed
+
+- Make `Debug` implementation for `SchemaNode` opaque.
+
 ## [0.19.1] - 2024-09-15
 
 ### Fixed

diff --git a/crates/jsonschema/src/keywords/additional_items.rs b/crates/jsonschema/src/keywords/additional_items.rs
@@ -5,7 +5,7 @@ use crate::{
     paths::{JSONPointer, JsonPointerNode},
     primitive_type::{PrimitiveType, PrimitiveTypesBitMap},
     schema_node::SchemaNode,
-    validator::{format_validators, Validate},
+    validator::Validate,
 };
 use serde_json::{Map, Value};
 
@@ -59,16 +59,6 @@ impl Validate for AdditionalItemsObjectValidator {
     }
 }
 
-impl core::fmt::Display for AdditionalItemsObjectValidator {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(
-            f,
-            "additionalItems: {}",
-            format_validators(self.node.validators())
-        )
-    }
-}
-
 pub(crate) struct AdditionalItemsBooleanValidator {
     items_count: usize,
     schema_path: JSONPointer,
@@ -113,11 +103,6 @@ impl Validate for AdditionalItemsBooleanValidator {
         no_error()
     }
 }
-impl core::fmt::Display for AdditionalItemsBooleanValidator {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        "additionalItems: false".fmt(f)
-    }
-}
 
 #[inline]
 pub(crate) fn compile<'a>(

diff --git a/crates/jsonschema/src/keywords/additional_properties.rs b/crates/jsonschema/src/keywords/additional_properties.rs
@@ -14,7 +14,7 @@ use crate::{
     paths::{AbsolutePath, JSONPointer, JsonPointerNode},
     properties::*,
     schema_node::SchemaNode,
-    validator::{format_validators, PartialApplication, Validate},
+    validator::{PartialApplication, Validate},
 };
 use serde_json::{Map, Value};
 
@@ -138,16 +138,6 @@ impl Validate for AdditionalPropertiesValidator {
     }
 }
 
-impl core::fmt::Display for AdditionalPropertiesValidator {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(
-            f,
-            "additionalProperties: {}",
-            format_validators(self.node.validators())
-        )
-    }
-}
-
 /// # Schema example
 ///
 /// ```json
@@ -196,11 +186,6 @@ impl Validate for AdditionalPropertiesFalseValidator {
         no_error()
     }
 }
-impl core::fmt::Display for AdditionalPropertiesFalseValidator {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        "additionalProperties: false".fmt(f)
-    }
-}
 
 /// # Schema example
 ///
@@ -445,16 +430,6 @@ impl<M: PropertiesValidatorsMap> Validate for AdditionalPropertiesNotEmptyValida
     }
 }
 
-impl<M: PropertiesValidatorsMap> core::fmt::Display for AdditionalPropertiesNotEmptyValidator<M> {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(
-            f,
-            "additionalProperties: {}",
-            format_validators(self.node.validators())
-        )
-    }
-}
-
 /// # Schema example
 ///
 /// ```json
@@ -595,16 +570,6 @@ impl Validate for AdditionalPropertiesWithPatternsValidator {
     }
 }
 
-impl core::fmt::Display for AdditionalPropertiesWithPatternsValidator {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(
-            f,
-            "additionalProperties: {}",
-            format_validators(self.node.validators())
-        )
-    }
-}
-
 /// # Schema example
 ///
 /// ```json
@@ -748,12 +713,6 @@ impl Validate for AdditionalPropertiesWithPatternsFalseValidator {
     }
 }
 
-impl core::fmt::Display for AdditionalPropertiesWithPatternsFalseValidator {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        "additionalProperties: false".fmt(f)
-    }
-}
-
 /// # Schema example
 ///
 /// ```json
@@ -935,17 +894,6 @@ impl<M: PropertiesValidatorsMap> Validate for AdditionalPropertiesWithPatternsNo
         }
     }
 }
-impl<M: PropertiesValidatorsMap> core::fmt::Display
-    for AdditionalPropertiesWithPatternsNotEmptyValidator<M>
-{
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(
-            f,
-            "additionalProperties: {}",
-            format_validators(self.node.validators())
-        )
-    }
-}
 
 /// # Schema example
 ///

diff --git a/crates/jsonschema/src/keywords/all_of.rs b/crates/jsonschema/src/keywords/all_of.rs
@@ -5,7 +5,7 @@ use crate::{
     paths::{JSONPointer, JsonPointerNode},
     primitive_type::PrimitiveType,
     schema_node::SchemaNode,
-    validator::{format_iter_of_validators, format_validators, PartialApplication, Validate},
+    validator::{PartialApplication, Validate},
 };
 use serde_json::{Map, Value};
 
@@ -64,15 +64,6 @@ impl Validate for AllOfValidator {
     }
 }
 
-impl core::fmt::Display for AllOfValidator {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(
-            f,
-            "allOf: [{}]",
-            format_iter_of_validators(self.schemas.iter().map(SchemaNode::validators))
-        )
-    }
-}
 pub(crate) struct SingleValueAllOfValidator {
     node: SchemaNode,
 }
@@ -112,11 +103,6 @@ impl Validate for SingleValueAllOfValidator {
     }
 }
 
-impl core::fmt::Display for SingleValueAllOfValidator {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "allOf: [{}]", format_validators(self.node.validators()))
-    }
-}
 #[inline]
 pub(crate) fn compile<'a>(
     _: &'a Map<String, Value>,

diff --git a/crates/jsonschema/src/keywords/any_of.rs b/crates/jsonschema/src/keywords/any_of.rs
@@ -4,7 +4,7 @@ use crate::{
     paths::JsonPointerNode,
     primitive_type::PrimitiveType,
     schema_node::SchemaNode,
-    validator::{format_iter_of_validators, PartialApplication, Validate},
+    validator::{PartialApplication, Validate},
 };
 use serde_json::{Map, Value};
 
@@ -89,15 +89,6 @@ impl Validate for AnyOfValidator {
     }
 }
 
-impl core::fmt::Display for AnyOfValidator {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(
-            f,
-            "anyOf: [{}]",
-            format_iter_of_validators(self.schemas.iter().map(SchemaNode::validators))
-        )
-    }
-}
 #[inline]
 pub(crate) fn compile<'a>(
     _: &'a Map<String, Value>,

diff --git a/crates/jsonschema/src/keywords/boolean.rs b/crates/jsonschema/src/keywords/boolean.rs
@@ -34,12 +34,6 @@ impl Validate for FalseValidator {
     }
 }
 
-impl core::fmt::Display for FalseValidator {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        "false".fmt(f)
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use crate::tests_util;

diff --git a/crates/jsonschema/src/keywords/const_.rs b/crates/jsonschema/src/keywords/const_.rs
@@ -49,19 +49,6 @@ impl Validate for ConstArrayValidator {
         }
     }
 }
-impl core::fmt::Display for ConstArrayValidator {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(
-            f,
-            "const: [{}]",
-            self.value
-                .iter()
-                .map(ToString::to_string)
-                .collect::<Vec<_>>()
-                .join(", ")
-        )
-    }
-}
 
 struct ConstBooleanValidator {
     value: bool,
@@ -101,11 +88,6 @@ impl Validate for ConstBooleanValidator {
         }
     }
 }
-impl core::fmt::Display for ConstBooleanValidator {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "const: {}", self.value)
-    }
-}
 
 struct ConstNullValidator {
     schema_path: JSONPointer,
@@ -139,11 +121,6 @@ impl Validate for ConstNullValidator {
         instance.is_null()
     }
 }
-impl core::fmt::Display for ConstNullValidator {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "const: {}", Value::Null)
-    }
-}
 
 struct ConstNumberValidator {
     // This is saved in order to ensure that the error message is not altered by precision loss
@@ -192,12 +169,6 @@ impl Validate for ConstNumberValidator {
     }
 }
 
-impl core::fmt::Display for ConstNumberValidator {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "const: {}", self.original_value)
-    }
-}
-
 pub(crate) struct ConstObjectValidator {
     value: Map<String, Value>,
     schema_path: JSONPointer,
@@ -243,20 +214,6 @@ impl Validate for ConstObjectValidator {
     }
 }
 
-impl core::fmt::Display for ConstObjectValidator {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(
-            f,
-            "const: {{{}}}",
-            self.value
-                .iter()
-                .map(|(key, value)| format!(r#""{}":{}"#, key, value))
-                .collect::<Vec<_>>()
-                .join(", ")
-        )
-    }
-}
-
 pub(crate) struct ConstStringValidator {
     value: String,
     schema_path: JSONPointer,
@@ -299,12 +256,6 @@ impl Validate for ConstStringValidator {
     }
 }
 
-impl core::fmt::Display for ConstStringValidator {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "const: {}", self.value)
-    }
-}
-
 #[inline]
 pub(crate) fn compile<'a>(
     _: &'a Map<String, Value>,

diff --git a/crates/jsonschema/src/keywords/contains.rs b/crates/jsonschema/src/keywords/contains.rs
@@ -4,7 +4,7 @@ use crate::{
     keywords::CompilationResult,
     paths::{JSONPointer, JsonPointerNode},
     schema_node::SchemaNode,
-    validator::{format_validators, PartialApplication, Validate},
+    validator::{PartialApplication, Validate},
     Draft,
 };
 use serde_json::{Map, Value};
@@ -96,12 +96,6 @@ impl Validate for ContainsValidator {
     }
 }
 
-impl core::fmt::Display for ContainsValidator {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "contains: {}", format_validators(self.node.validators()))
-    }
-}
-
 /// `minContains` validation. Used only if there is no `maxContains` present.
 ///
 /// Docs: <https://json-schema.org/draft/2019-09/json-schema-validation.html#rfc.section.6.4.5>
@@ -189,17 +183,6 @@ impl Validate for MinContainsValidator {
     }
 }
 
-impl core::fmt::Display for MinContainsValidator {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(
-            f,
-            "minContains: {}, contains: {}",
-            self.min_contains,
-            format_validators(self.node.validators())
-        )
-    }
-}
-
 /// `maxContains` validation. Used only if there is no `minContains` present.
 ///
 /// Docs: <https://json-schema.org/draft/2019-09/json-schema-validation.html#rfc.section.6.4.4>
@@ -293,17 +276,6 @@ impl Validate for MaxContainsValidator {
     }
 }
 
-impl core::fmt::Display for MaxContainsValidator {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(
-            f,
-            "maxContains: {}, contains: {}",
-            self.max_contains,
-            format_validators(self.node.validators())
-        )
-    }
-}
-
 /// `maxContains` & `minContains` validation combined.
 ///
 /// Docs:
@@ -395,18 +367,6 @@ impl Validate for MinMaxContainsValidator {
     }
 }
 
-impl core::fmt::Display for MinMaxContainsValidator {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(
-            f,
-            "minContains: {}, maxContains: {}, contains: {}",
-            self.min_contains,
-            self.max_contains,
-            format_validators(self.node.validators())
-        )
-    }
-}
-
 #[inline]
 pub(crate) fn compile<'a>(
     parent: &'a Map<String, Value>,