From 58a8103df9077d581a7b17824a7a4b9be695ec5f Mon Sep 17 00:00:00 2001 From: Flavio Percoco Date: Tue, 27 Jan 2015 00:35:03 +0100 Subject: [PATCH] Fix rustdoc fallout --- src/librustdoc/doctree.rs | 8 ++++++++ src/librustdoc/visit_ast.rs | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/src/librustdoc/doctree.rs b/src/librustdoc/doctree.rs index ba5df56f4fb5..555e66e3a1e4 100644 --- a/src/librustdoc/doctree.rs +++ b/src/librustdoc/doctree.rs @@ -39,6 +39,7 @@ pub struct Module { pub vis: ast::Visibility, pub stab: Option, pub impls: Vec, + pub def_traits: Vec, pub foreigns: Vec, pub macros: Vec, pub is_crate: bool, @@ -65,6 +66,7 @@ impl Module { constants : Vec::new(), traits : Vec::new(), impls : Vec::new(), + def_traits : Vec::new(), foreigns : Vec::new(), macros : Vec::new(), is_crate : false, @@ -196,6 +198,12 @@ pub struct Impl { pub id: ast::NodeId, } +pub struct DefaultTrait { + pub unsafety: ast::Unsafety, + pub trait_: ast::TraitRef, + pub id: ast::NodeId, +} + pub struct Macro { pub name: Ident, pub id: ast::NodeId, diff --git a/src/librustdoc/visit_ast.rs b/src/librustdoc/visit_ast.rs index c52b0bab1fa8..e77510785e9b 100644 --- a/src/librustdoc/visit_ast.rs +++ b/src/librustdoc/visit_ast.rs @@ -358,6 +358,14 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> { }; om.impls.push(i); }, + ast::ItemDefTrait(unsafety, ref trait_ref) => { + let i = DefaultTrait { + unsafety: unsafety, + trait_: trait_ref.clone(), + id: item.id + }; + om.def_traits.push(i); + } ast::ItemForeignMod(ref fm) => { om.foreigns.push(fm.clone()); }