save-analysis: some refinements to JSON data

nrc · nrc · commit c28374ef0b1b · 2016-06-11T12:23:57.000+02:00
Split variable and function kinds to give more information. Give children for methods, structs, enums, and traits.
diff --git a/src/librustc_save_analysis/data.rs b/src/librustc_save_analysis/data.rs
@@ -102,6 +102,8 @@ pub struct EnumData {
     pub qualname: String,
     pub span: Span,
     pub scope: NodeId,
+    pub variants: Vec<NodeId>,
+
 }
 
 /// Data for extern crates.
@@ -223,6 +225,7 @@ pub struct ModData {
     pub span: Span,
     pub scope: NodeId,
     pub filename: String,
+    pub items: Vec<NodeId>,
 }
 
 /// Data for a reference to a module.
@@ -242,7 +245,8 @@ pub struct StructData {
     pub ctor_id: NodeId,
     pub qualname: String,
     pub scope: NodeId,
-    pub value: String
+    pub value: String,
+    pub fields: Vec<NodeId>,
 }
 
 #[derive(Debug, RustcEncodable)]
@@ -263,7 +267,8 @@ pub struct TraitData {
     pub name: String,
     pub qualname: String,
     pub scope: NodeId,
-    pub value: String
+    pub value: String,
+    pub items: Vec<NodeId>,
 }
 
 #[derive(Debug, RustcEncodable)]
@@ -317,6 +322,7 @@ pub struct UseGlobData {
 #[derive(Debug, RustcEncodable)]
 pub struct VariableData {
     pub id: NodeId,
+    pub kind: VariableKind,
     pub name: String,
     pub qualname: String,
     pub span: Span,
@@ -325,6 +331,14 @@ pub struct VariableData {
     pub type_value: String,
 }
 
+#[derive(Debug, RustcEncodable)]
+pub enum VariableKind {
+    Static,
+    Const,
+    Local,
+    Field,
+}
+
 /// Data for the use of some item (e.g., the use of a local variable, which
 /// will refer to that variables declaration (by ref_id)).
 #[derive(Debug, RustcEncodable)]
diff --git a/src/librustc_save_analysis/dump_visitor.rs b/src/librustc_save_analysis/dump_visitor.rs
@@ -356,6 +356,7 @@ impl<'l, 'tcx: 'l, 'll, D: Dump + 'll> DumpVisitor<'l, 'tcx, 'll, D> {
                 if !self.span.filter_generated(sub_span, p.span) {
                     self.dumper.variable(VariableData {
                         id: id,
+                        kind: VariableKind::Local,
                         span: sub_span.expect("No span found for variable"),
                         name: path_to_string(p),
                         qualname: format!("{}::{}", qualname, path_to_string(p)),
@@ -519,6 +520,7 @@ impl<'l, 'tcx: 'l, 'll, D: Dump + 'll> DumpVisitor<'l, 'tcx, 'll, D> {
         if !self.span.filter_generated(sub_span, span) {
             self.dumper.variable(VariableData {
                 span: sub_span.expect("No span found for variable"),
+                kind: VariableKind::Const,
                 id: id,
                 name: name.to_string(),
                 qualname: qualname,
@@ -542,17 +544,18 @@ impl<'l, 'tcx: 'l, 'll, D: Dump + 'll> DumpVisitor<'l, 'tcx, 'll, D> {
         let qualname = format!("::{}", self.tcx.node_path_str(item.id));
 
         let sub_span = self.span.sub_span_after_keyword(item.span, keywords::Struct);
-        let val = if let ast::ItemKind::Struct(ast::VariantData::Struct(ref fields, _), _) =
-                    item.node {
+        let (val, fields) =
+            if let ast::ItemKind::Struct(ast::VariantData::Struct(ref fields, _), _) = item.node
+        {
             let fields_str = fields.iter()
                                    .enumerate()
                                    .map(|(i, f)| f.ident.map(|i| i.to_string())
                                                   .unwrap_or(i.to_string()))
                                    .collect::<Vec<_>>()
                                    .join(", ");
-            format!("{} {{ {} }}", name, fields_str)
+            (format!("{} {{ {} }}", name, fields_str), fields.iter().map(|f| f.id).collect())
         } else {
-            String::new()
+            (String::new(), vec![])
         };
 
         if !self.span.filter_generated(sub_span, item.span) {
@@ -563,7 +566,8 @@ impl<'l, 'tcx: 'l, 'll, D: Dump + 'll> DumpVisitor<'l, 'tcx, 'll, D> {
                 ctor_id: def.id(),
                 qualname: qualname.clone(),
                 scope: self.cur_scope,
-                value: val
+                value: val,
+                fields: fields,
             }.lower(self.tcx));
         }
 
@@ -718,7 +722,8 @@ impl<'l, 'tcx: 'l, 'll, D: Dump + 'll> DumpVisitor<'l, 'tcx, 'll, D> {
                 name: name,
                 qualname: qualname.clone(),
                 scope: self.cur_scope,
-                value: val
+                value: val,
+                items: methods.iter().map(|i| i.id).collect(),
             }.lower(self.tcx));
         }
 
@@ -958,6 +963,7 @@ impl<'l, 'tcx: 'l, 'll, D: Dump + 'll> DumpVisitor<'l, 'tcx, 'll, D> {
             if !self.span.filter_generated(sub_span, p.span) {
                 self.dumper.variable(VariableData {
                     span: sub_span.expect("No span found for variable"),
+                    kind: VariableKind::Local,
                     id: id,
                     name: path_to_string(p),
                     qualname: format!("{}${}", path_to_string(p), id),
@@ -1366,6 +1372,7 @@ impl<'v, 'l, 'tcx: 'l, 'll, D: Dump +'ll> Visitor<'v> for DumpVisitor<'l, 'tcx,
                     if !self.span.filter_generated(Some(p.span), p.span) {
                         self.dumper.variable(VariableData {
                             span: p.span,
+                            kind: VariableKind::Local,
                             id: id,
                             name: path_to_string(p),
                             qualname: format!("{}${}", path_to_string(p), id),
diff --git a/src/librustc_save_analysis/external_data.rs b/src/librustc_save_analysis/external_data.rs
@@ -14,7 +14,7 @@ use rustc::ty::TyCtxt;
 use syntax::ast::{CrateNum, NodeId};
 use syntax::codemap::{Span, CodeMap};
 
-use super::data;
+use data;
 
 // FIXME: this should be pub(crate), but the current snapshot doesn't allow it yet
 pub trait Lower {
@@ -90,6 +90,7 @@ pub struct EnumData {
     pub qualname: String,
     pub span: SpanData,
     pub scope: DefId,
+    pub variants: Vec<DefId>
 }
 
 impl Lower for data::EnumData {
@@ -103,6 +104,7 @@ impl Lower for data::EnumData {
             qualname: self.qualname,
             span: SpanData::from_span(self.span, tcx.sess.codemap()),
             scope: make_def_id(self.scope, &tcx.map),
+            variants: self.variants.into_iter().map(|id| make_def_id(id, &tcx.map)).collect(),
         }
     }
 }
@@ -345,6 +347,7 @@ pub struct ModData {
     pub span: SpanData,
     pub scope: DefId,
     pub filename: String,
+    pub items: Vec<DefId>,
 }
 
 impl Lower for data::ModData {
@@ -358,6 +361,7 @@ impl Lower for data::ModData {
             span: SpanData::from_span(self.span, tcx.sess.codemap()),
             scope: make_def_id(self.scope, &tcx.map),
             filename: self.filename,
+            items: self.items.into_iter().map(|id| make_def_id(id, &tcx.map)).collect(),
         }
     }
 }
@@ -392,7 +396,8 @@ pub struct StructData {
     pub ctor_id: DefId,
     pub qualname: String,
     pub scope: DefId,
-    pub value: String
+    pub value: String,
+    pub fields: Vec<DefId>,
 }
 
 impl Lower for data::StructData {
@@ -406,7 +411,8 @@ impl Lower for data::StructData {
             ctor_id: make_def_id(self.ctor_id, &tcx.map),
             qualname: self.qualname,
             scope: make_def_id(self.scope, &tcx.map),
-            value: self.value
+            value: self.value,
+            fields: self.fields.into_iter().map(|id| make_def_id(id, &tcx.map)).collect(),
         }
     }
 }
@@ -445,7 +451,8 @@ pub struct TraitData {
     pub id: DefId,
     pub qualname: String,
     pub scope: DefId,
-    pub value: String
+    pub value: String,
+    pub items: Vec<DefId>,
 }
 
 impl Lower for data::TraitData {
@@ -459,6 +466,7 @@ impl Lower for data::TraitData {
             qualname: self.qualname,
             scope: make_def_id(self.scope, &tcx.map),
             value: self.value,
+            items: self.items.into_iter().map(|id| make_def_id(id, &tcx.map)).collect(),
         }
     }
 }
@@ -585,6 +593,7 @@ impl Lower for data::UseGlobData {
 pub struct VariableData {
     pub id: DefId,
     pub name: String,
+    pub kind: data::VariableKind,
     pub qualname: String,
     pub span: SpanData,
     pub scope: DefId,
@@ -598,6 +607,7 @@ impl Lower for data::VariableData {
     fn lower(self, tcx: TyCtxt) -> VariableData {
         VariableData {
             id: make_def_id(self.id, &tcx.map),
+            kind: self.kind,
             name: self.name,
             qualname: self.qualname,
             span: SpanData::from_span(self.span, tcx.sess.codemap()),
diff --git a/src/librustc_save_analysis/json_dumper.rs b/src/librustc_save_analysis/json_dumper.rs
@@ -13,8 +13,9 @@ use std::io::Write;
 use rustc::hir::def_id::DefId;
 use rustc_serialize::json::as_json;
 
-use super::external_data::*;
-use super::dump::Dump;
+use external_data::*;
+use data::VariableKind;
+use dump::Dump;
 
 pub struct JsonDumper<'b, W: Write + 'b> {
     output: &'b mut W,
@@ -180,6 +181,7 @@ struct Def {
     name: String,
     qualname: String,
     value: String,
+    children: Vec<Id>,
 }
 
 #[derive(Debug, RustcEncodable)]
@@ -194,14 +196,19 @@ enum DefKind {
     Trait,
     // value = type + generics
     Function,
+    // value = type + generics
+    Method,
     // No id, no value.
     Macro,
     // value = file_name
     Mod,
     // value = aliased type
     Type,
-    // value = type and init expression
-    Variable,
+    // value = type and init expression (for all variable kinds).
+    Local,
+    Static,
+    Const,
+    Field,
 }
 
 impl From<EnumData> for Def {
@@ -213,6 +220,7 @@ impl From<EnumData> for Def {
             name: data.name,
             qualname: data.qualname,
             value: data.value,
+            children: data.variants.into_iter().map(|id| From::from(id)).collect(),
         }
     }
 }
@@ -226,6 +234,7 @@ impl From<TupleVariantData> for Def {
             name: data.name,
             qualname: data.qualname,
             value: data.value,
+            children: vec![],
         }
     }
 }
@@ -238,6 +247,7 @@ impl From<StructVariantData> for Def {
             name: data.name,
             qualname: data.qualname,
             value: data.value,
+            children: vec![],
         }
     }
 }
@@ -250,6 +260,7 @@ impl From<StructData> for Def {
             name: data.name,
             qualname: data.qualname,
             value: data.value,
+            children: data.fields.into_iter().map(|id| From::from(id)).collect(),
         }
     }
 }
@@ -262,6 +273,7 @@ impl From<TraitData> for Def {
             name: data.name,
             qualname: data.qualname,
             value: data.value,
+            children: data.items.into_iter().map(|id| From::from(id)).collect(),
         }
     }
 }
@@ -274,18 +286,20 @@ impl From<FunctionData> for Def {
             name: data.name,
             qualname: data.qualname,
             value: data.value,
+            children: vec![],
         }
     }
 }
 impl From<MethodData> for Def {
     fn from(data: MethodData) -> Def {
         Def {
-            kind: DefKind::Function,
+            kind: DefKind::Method,
             id: From::from(data.id),
             span: data.span,
             name: data.name,
             qualname: data.qualname,
             value: data.value,
+            children: vec![],
         }
     }
 }
@@ -298,6 +312,7 @@ impl From<MacroData> for Def {
             name: data.name,
             qualname: data.qualname,
             value: String::new(),
+            children: vec![],
         }
     }
 }
@@ -310,6 +325,7 @@ impl From<ModData> for Def {
             name: data.name,
             qualname: data.qualname,
             value: data.filename,
+            children: data.items.into_iter().map(|id| From::from(id)).collect(),
         }
     }
 }
@@ -322,18 +338,25 @@ impl From<TypeDefData> for Def {
             name: data.name,
             qualname: data.qualname,
             value: data.value,
+            children: vec![],
         }
     }
 }
 impl From<VariableData> for Def {
     fn from(data: VariableData) -> Def {
         Def {
-            kind: DefKind::Variable,
+            kind: match data.kind {
+                VariableKind::Static => DefKind::Static,
+                VariableKind::Const => DefKind::Const,
+                VariableKind::Local => DefKind::Local,
+                VariableKind::Field => DefKind::Field,
+            },
             id: From::from(data.id),
             span: data.span,
             name: data.name,
             qualname: data.qualname,
             value: data.value,
+            children: vec![],
         }
     }
 }
diff --git a/src/librustc_save_analysis/lib.rs b/src/librustc_save_analysis/lib.rs

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ use rustc::ty::TyCtxt;`
`14`	`14`	`use syntax::ast::{CrateNum, NodeId};`
`15`	`15`	`use syntax::codemap::{Span, CodeMap};`
`16`	`16`
`17`		`-use super::data;`
	`17`	`+use data;`
`18`	`18`
`19`	`19`	`// FIXME: this should be pub(crate), but the current snapshot doesn't allow it yet`
`20`	`20`	`pub trait Lower {`
`@@ -90,6 +90,7 @@ pub struct EnumData {`
`90`	`90`	`pub qualname: String,`
`91`	`91`	`pub span: SpanData,`
`92`	`92`	`pub scope: DefId,`
	`93`	`+ pub variants: Vec<DefId>`
`93`	`94`	`}`
`94`	`95`
`95`	`96`	`impl Lower for data::EnumData {`
`@@ -103,6 +104,7 @@ impl Lower for data::EnumData {`
`103`	`104`	`qualname: self.qualname,`
`104`	`105`	`span: SpanData::from_span(self.span, tcx.sess.codemap()),`
`105`	`106`	`scope: make_def_id(self.scope, &tcx.map),`
	`107`	`+ variants: self.variants.into_iter().map(\|id\| make_def_id(id, &tcx.map)).collect(),`
`106`	`108`	`}`
`107`	`109`	`}`
`108`	`110`	`}`
`@@ -345,6 +347,7 @@ pub struct ModData {`
`345`	`347`	`pub span: SpanData,`
`346`	`348`	`pub scope: DefId,`
`347`	`349`	`pub filename: String,`
	`350`	`+ pub items: Vec<DefId>,`
`348`	`351`	`}`
`349`	`352`
`350`	`353`	`impl Lower for data::ModData {`
`@@ -358,6 +361,7 @@ impl Lower for data::ModData {`
`358`	`361`	`span: SpanData::from_span(self.span, tcx.sess.codemap()),`
`359`	`362`	`scope: make_def_id(self.scope, &tcx.map),`
`360`	`363`	`filename: self.filename,`
	`364`	`+ items: self.items.into_iter().map(\|id\| make_def_id(id, &tcx.map)).collect(),`
`361`	`365`	`}`
`362`	`366`	`}`
`363`	`367`	`}`
`@@ -392,7 +396,8 @@ pub struct StructData {`
`392`	`396`	`pub ctor_id: DefId,`
`393`	`397`	`pub qualname: String,`
`394`	`398`	`pub scope: DefId,`
`395`		`- pub value: String`
	`399`	`+ pub value: String,`
	`400`	`+ pub fields: Vec<DefId>,`
`396`	`401`	`}`
`397`	`402`
`398`	`403`	`impl Lower for data::StructData {`
`@@ -406,7 +411,8 @@ impl Lower for data::StructData {`
`406`	`411`	`ctor_id: make_def_id(self.ctor_id, &tcx.map),`
`407`	`412`	`qualname: self.qualname,`
`408`	`413`	`scope: make_def_id(self.scope, &tcx.map),`
`409`		`- value: self.value`
	`414`	`+ value: self.value,`
	`415`	`+ fields: self.fields.into_iter().map(\|id\| make_def_id(id, &tcx.map)).collect(),`
`410`	`416`	`}`
`411`	`417`	`}`
`412`	`418`	`}`
`@@ -445,7 +451,8 @@ pub struct TraitData {`
`445`	`451`	`pub id: DefId,`
`446`	`452`	`pub qualname: String,`
`447`	`453`	`pub scope: DefId,`
`448`		`- pub value: String`
	`454`	`+ pub value: String,`
	`455`	`+ pub items: Vec<DefId>,`
`449`	`456`	`}`
`450`	`457`
`451`	`458`	`impl Lower for data::TraitData {`
`@@ -459,6 +466,7 @@ impl Lower for data::TraitData {`
`459`	`466`	`qualname: self.qualname,`
`460`	`467`	`scope: make_def_id(self.scope, &tcx.map),`
`461`	`468`	`value: self.value,`
	`469`	`+ items: self.items.into_iter().map(\|id\| make_def_id(id, &tcx.map)).collect(),`
`462`	`470`	`}`
`463`	`471`	`}`
`464`	`472`	`}`
`@@ -585,6 +593,7 @@ impl Lower for data::UseGlobData {`
`585`	`593`	`pub struct VariableData {`
`586`	`594`	`pub id: DefId,`
`587`	`595`	`pub name: String,`
	`596`	`+ pub kind: data::VariableKind,`
`588`	`597`	`pub qualname: String,`
`589`	`598`	`pub span: SpanData,`
`590`	`599`	`pub scope: DefId,`
`@@ -598,6 +607,7 @@ impl Lower for data::VariableData {`
`598`	`607`	`fn lower(self, tcx: TyCtxt) -> VariableData {`
`599`	`608`	`VariableData {`
`600`	`609`	`id: make_def_id(self.id, &tcx.map),`
	`610`	`+ kind: self.kind,`
`601`	`611`	`name: self.name,`
`602`	`612`	`qualname: self.qualname,`
`603`	`613`	`span: SpanData::from_span(self.span, tcx.sess.codemap()),`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,9 @@ use std::io::Write;`
`13`	`13`	`use rustc::hir::def_id::DefId;`
`14`	`14`	`use rustc_serialize::json::as_json;`
`15`	`15`
`16`		`-use super::external_data::*;`
`17`		`-use super::dump::Dump;`
	`16`	`+use external_data::*;`
	`17`	`+use data::VariableKind;`
	`18`	`+use dump::Dump;`
`18`	`19`
`19`	`20`	`pub struct JsonDumper<'b, W: Write + 'b> {`
`20`	`21`	`output: &'b mut W,`
`@@ -180,6 +181,7 @@ struct Def {`
`180`	`181`	`name: String,`
`181`	`182`	`qualname: String,`
`182`	`183`	`value: String,`
	`184`	`+ children: Vec<Id>,`
`183`	`185`	`}`
`184`	`186`
`185`	`187`	`#[derive(Debug, RustcEncodable)]`
`@@ -194,14 +196,19 @@ enum DefKind {`
`194`	`196`	`Trait,`
`195`	`197`	`// value = type + generics`
`196`	`198`	`Function,`
	`199`	`+ // value = type + generics`
	`200`	`+ Method,`
`197`	`201`	`// No id, no value.`
`198`	`202`	`Macro,`
`199`	`203`	`// value = file_name`
`200`	`204`	`Mod,`
`201`	`205`	`// value = aliased type`
`202`	`206`	`Type,`
`203`		`- // value = type and init expression`
`204`		`- Variable,`
	`207`	`+ // value = type and init expression (for all variable kinds).`
	`208`	`+ Local,`
	`209`	`+ Static,`
	`210`	`+ Const,`
	`211`	`+ Field,`
`205`	`212`	`}`
`206`	`213`
`207`	`214`	`impl From<EnumData> for Def {`
`@@ -213,6 +220,7 @@ impl From<EnumData> for Def {`
`213`	`220`	`name: data.name,`
`214`	`221`	`qualname: data.qualname,`
`215`	`222`	`value: data.value,`
	`223`	`+ children: data.variants.into_iter().map(\|id\| From::from(id)).collect(),`
`216`	`224`	`}`
`217`	`225`	`}`
`218`	`226`	`}`
`@@ -226,6 +234,7 @@ impl From<TupleVariantData> for Def {`
`226`	`234`	`name: data.name,`
`227`	`235`	`qualname: data.qualname,`
`228`	`236`	`value: data.value,`
	`237`	`+ children: vec![],`
`229`	`238`	`}`
`230`	`239`	`}`
`231`	`240`	`}`
`@@ -238,6 +247,7 @@ impl From<StructVariantData> for Def {`
`238`	`247`	`name: data.name,`
`239`	`248`	`qualname: data.qualname,`
`240`	`249`	`value: data.value,`
	`250`	`+ children: vec![],`
`241`	`251`	`}`
`242`	`252`	`}`
`243`	`253`	`}`
`@@ -250,6 +260,7 @@ impl From<StructData> for Def {`
`250`	`260`	`name: data.name,`
`251`	`261`	`qualname: data.qualname,`
`252`	`262`	`value: data.value,`
	`263`	`+ children: data.fields.into_iter().map(\|id\| From::from(id)).collect(),`
`253`	`264`	`}`
`254`	`265`	`}`
`255`	`266`	`}`
`@@ -262,6 +273,7 @@ impl From<TraitData> for Def {`
`262`	`273`	`name: data.name,`
`263`	`274`	`qualname: data.qualname,`
`264`	`275`	`value: data.value,`
	`276`	`+ children: data.items.into_iter().map(\|id\| From::from(id)).collect(),`
`265`	`277`	`}`
`266`	`278`	`}`
`267`	`279`	`}`
`@@ -274,18 +286,20 @@ impl From<FunctionData> for Def {`
`274`	`286`	`name: data.name,`
`275`	`287`	`qualname: data.qualname,`
`276`	`288`	`value: data.value,`
	`289`	`+ children: vec![],`
`277`	`290`	`}`
`278`	`291`	`}`
`279`	`292`	`}`
`280`	`293`	`impl From<MethodData> for Def {`
`281`	`294`	`fn from(data: MethodData) -> Def {`
`282`	`295`	`Def {`
`283`		`- kind: DefKind::Function,`
	`296`	`+ kind: DefKind::Method,`
`284`	`297`	`id: From::from(data.id),`
`285`	`298`	`span: data.span,`
`286`	`299`	`name: data.name,`
`287`	`300`	`qualname: data.qualname,`
`288`	`301`	`value: data.value,`
	`302`	`+ children: vec![],`
`289`	`303`	`}`
`290`	`304`	`}`
`291`	`305`	`}`
`@@ -298,6 +312,7 @@ impl From<MacroData> for Def {`
`298`	`312`	`name: data.name,`
`299`	`313`	`qualname: data.qualname,`
`300`	`314`	`value: String::new(),`
	`315`	`+ children: vec![],`
`301`	`316`	`}`
`302`	`317`	`}`
`303`	`318`	`}`
`@@ -310,6 +325,7 @@ impl From<ModData> for Def {`
`310`	`325`	`name: data.name,`
`311`	`326`	`qualname: data.qualname,`
`312`	`327`	`value: data.filename,`
	`328`	`+ children: data.items.into_iter().map(\|id\| From::from(id)).collect(),`
`313`	`329`	`}`
`314`	`330`	`}`
`315`	`331`	`}`
`@@ -322,18 +338,25 @@ impl From<TypeDefData> for Def {`
`322`	`338`	`name: data.name,`
`323`	`339`	`qualname: data.qualname,`
`324`	`340`	`value: data.value,`
	`341`	`+ children: vec![],`
`325`	`342`	`}`
`326`	`343`	`}`
`327`	`344`	`}`
`328`	`345`	`impl From<VariableData> for Def {`
`329`	`346`	`fn from(data: VariableData) -> Def {`
`330`	`347`	`Def {`
`331`		`- kind: DefKind::Variable,`
	`348`	`+ kind: match data.kind {`
	`349`	`+ VariableKind::Static => DefKind::Static,`
	`350`	`+ VariableKind::Const => DefKind::Const,`
	`351`	`+ VariableKind::Local => DefKind::Local,`
	`352`	`+ VariableKind::Field => DefKind::Field,`
	`353`	`+ },`
`332`	`354`	`id: From::from(data.id),`
`333`	`355`	`span: data.span,`
`334`	`356`	`name: data.name,`
`335`	`357`	`qualname: data.qualname,`
`336`	`358`	`value: data.value,`
	`359`	`+ children: vec![],`
`337`	`360`	`}`
`338`	`361`	`}`
`339`	`362`	`}`