From 858543aca14b788d10ce3407b4ddecd568ac1ddf Mon Sep 17 00:00:00 2001 From: Graham Esau Date: Thu, 24 Sep 2020 20:42:26 +0100 Subject: [PATCH] Revert buggy refactor --- schemars/src/visit.rs | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/schemars/src/visit.rs b/schemars/src/visit.rs index af595bd..182b572 100644 --- a/schemars/src/visit.rs +++ b/schemars/src/visit.rs @@ -141,21 +141,21 @@ impl Visitor for ReplaceBoolSchemas { } fn visit_schema_object(&mut self, schema: &mut SchemaObject) { - if !self.skip_additional_properties { - visit_schema_object(self, schema); + if self.skip_additional_properties { + if let Some(obj) = &mut schema.object { + if let Some(ap) = &obj.additional_properties { + if let Schema::Bool(_) = ap.as_ref() { + let additional_properties = obj.additional_properties.take(); + visit_schema_object(self, schema); + schema.object().additional_properties = additional_properties; - return; - } - - if let Some(obj) = &mut schema.object { - if let Some(ap) = &obj.additional_properties { - if let Schema::Bool(_) = ap.as_ref() { - let additional_properties = obj.additional_properties.take(); - visit_schema_object(self, schema); - schema.object().additional_properties = additional_properties; + return; + } } } } + + visit_schema_object(self, schema); } }