Add schema path in contains validator; apply proper formatting in pro…

…per commits
Stranger6667 · Jun 18, 2021 · 61fa7ab · 61fa7ab
1 parent b2a44a4
commit 61fa7ab
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/jsonschema/src/compilation/context.rs b/jsonschema/src/compilation/context.rs
@@ -44,7 +44,7 @@ impl<'a> CompilationContext<'a> {
             Ok(CompilationContext {
                 scope: Cow::Borrowed(self.scope.as_ref()),
                 config: Cow::Borrowed(&self.config),
-                schema_path: self.schema_path.clone()
+                schema_path: self.schema_path.clone(),
             })
         }
     }

diff --git a/jsonschema/src/keywords/all_of.rs b/jsonschema/src/keywords/all_of.rs
@@ -21,7 +21,9 @@ impl AllOfValidator {
     ) -> CompilationResult<'a> {
         let mut schemas = Vec::with_capacity(items.len());
         for item in items {
+            context.schema_path.push(item.to_string());
             let validators = compile_validators(item, context)?;
+            context.schema_path.pop();
             schemas.push(validators)
         }
         Ok(Box::new(AllOfValidator { schemas }))

diff --git a/jsonschema/src/keywords/contains.rs b/jsonschema/src/keywords/contains.rs
@@ -15,11 +15,12 @@ impl ContainsValidator {
     #[inline]
     pub(crate) fn compile<'a>(
         schema: &'a Value,
-        context: &CompilationContext,
+        context: &mut CompilationContext,
     ) -> CompilationResult<'a> {
-        Ok(Box::new(ContainsValidator {
-            validators: compile_validators(schema, context)?,
-        }))
+        context.schema_path.push(schema.to_string());
+        let validators = compile_validators(schema, context)?;
+        context.schema_path.pop();
+        Ok(Box::new(ContainsValidator { validators }))
     }
 }