user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge VariantData and VariantData_

Browse source
This commit is contained in:
Vadim Petrochenkov 2015-10-10 03:28:40 +03:00
parent a5225cbe92
commit 46750d0409
28 changed files with 141 additions and 161 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/librustdoc/clean/mod.rs
View file

@ -1853,7 +1853,7 @@ impl Clean<Item> for doctree::Variant {
source: self.whence.clean(cx),
visibility: None,
stability: self.stab.clean(cx),
def_id: cx.map.local_def_id(self.def.id),
def_id: cx.map.local_def_id(self.def.id()),
inner: VariantItem(Variant {
kind: struct_def_to_variant_kind(&self.def, cx),
}),

2
src/librustdoc/visit_ast.rs
View file

@ -111,7 +111,7 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
variants: def.variants.iter().map(|v| Variant {
name: v.node.name,
attrs: v.node.attrs.clone(),
stab: self.stability(v.node.data.id),
stab: self.stability(v.node.data.id()),
def: v.node.data.clone(),
whence: v.span,
}).collect(),