Revert buggy refactor

This commit is contained in:
Graham Esau 2020-09-24 20:42:26 +01:00
parent 460976e765
commit 858543aca1

View file

@ -141,22 +141,22 @@ impl Visitor for ReplaceBoolSchemas {
} }
fn visit_schema_object(&mut self, schema: &mut SchemaObject) { fn visit_schema_object(&mut self, schema: &mut SchemaObject) {
if !self.skip_additional_properties { if self.skip_additional_properties {
visit_schema_object(self, schema);
return;
}
if let Some(obj) = &mut schema.object { if let Some(obj) = &mut schema.object {
if let Some(ap) = &obj.additional_properties { if let Some(ap) = &obj.additional_properties {
if let Schema::Bool(_) = ap.as_ref() { if let Schema::Bool(_) = ap.as_ref() {
let additional_properties = obj.additional_properties.take(); let additional_properties = obj.additional_properties.take();
visit_schema_object(self, schema); visit_schema_object(self, schema);
schema.object().additional_properties = additional_properties; schema.object().additional_properties = additional_properties;
return;
} }
} }
} }
} }
visit_schema_object(self, schema);
}
} }
/// This visitor will restructure JSON Schema objects so that the `$ref` property will never appear alongside any other properties. /// This visitor will restructure JSON Schema objects so that the `$ref` property will never appear alongside any other properties.