@@ -289,52 +289,51 @@ impl Schema {
289
289
"integer" => Def :: Int ( Int {
290
290
null : self . nullable ,
291
291
} ) ,
292
- "object" => {
293
- self . additional_properties
294
- . clone ( )
295
- . map ( |additional_properties| {
296
- Def :: Map ( Box :: new ( Map {
297
- key : Desc :: Def ( Def :: Str ( Str {
298
- null : self . nullable ,
299
- } ) ) ,
300
- val : additional_properties. desc ( name. clone ( ) , context) ,
292
+ "object" => self
293
+ . additional_properties
294
+ . clone ( )
295
+ . map ( |additional_properties| {
296
+ Def :: Map ( Box :: new ( Map {
297
+ key : Desc :: Def ( Def :: Str ( Str {
301
298
null : self . nullable ,
302
- } ) )
303
- } )
304
- . unwrap_or ( {
305
- let mut vars: HashMap < _ , _ > = self
306
- . properties
307
- . iter ( )
308
- . map ( |( n, schema) | {
309
- (
310
- n. clone ( ) ,
311
- Box :: new ( Var {
312
- desc : schema. clone ( ) . desc ( n. clone ( ) , context) ,
313
- opt : !self . required . contains ( n) ,
314
- } ) ,
315
- )
316
- } )
317
- . collect ( ) ;
318
- self . discriminator . iter ( ) . for_each ( |discriminator| {
319
- vars. insert (
320
- discriminator. property_name . clone ( ) ,
299
+ } ) ) ,
300
+ val : additional_properties. desc ( name. clone ( ) , context) ,
301
+ null : self . nullable ,
302
+ } ) )
303
+ } )
304
+ . unwrap_or ( {
305
+ let mut vars: HashMap < _ , _ > = self
306
+ . properties
307
+ . iter ( )
308
+ . map ( |( n, schema) | {
309
+ (
310
+ n. clone ( ) ,
321
311
Box :: new ( Var {
322
- desc : Desc :: Def ( Def :: Str ( Str {
323
- null : self . nullable ,
324
- } ) ) ,
325
- opt : false ,
312
+ desc : schema. clone ( ) . desc ( n. clone ( ) , context) ,
313
+ opt : !self . required . contains ( n) ,
326
314
} ) ,
327
- ) ;
328
- } ) ;
329
- Def :: Obj ( Obj {
330
- ext : None ,
331
- mix : Vec :: new ( ) ,
332
- vars : vars,
333
- adt : self . adt ( name. clone ( ) , context) ,
334
- null : self . nullable ,
315
+ )
335
316
} )
317
+ . collect ( ) ;
318
+ self . discriminator . iter ( ) . for_each ( |discriminator| {
319
+ vars. insert (
320
+ discriminator. property_name . clone ( ) ,
321
+ Box :: new ( Var {
322
+ desc : Desc :: Def ( Def :: Str ( Str {
323
+ null : self . nullable ,
324
+ } ) ) ,
325
+ opt : false ,
326
+ } ) ,
327
+ ) ;
328
+ } ) ;
329
+ Def :: Obj ( Obj {
330
+ ext : None ,
331
+ mix : Vec :: new ( ) ,
332
+ vars : vars,
333
+ adt : self . adt ( name. clone ( ) , context) ,
334
+ null : self . nullable ,
336
335
} )
337
- }
336
+ } ) ,
338
337
"string" => {
339
338
if self . r#enum . is_empty ( ) {
340
339
Def :: Str ( Str {
0 commit comments