Skip to content

Commit 22fa1d4

Browse files
committed
---
yaml --- r: 185291 b: refs/heads/master c: 58a8103 h: refs/heads/master i: 185289: 8079f9c 185287: dc3b09f v: v3
1 parent 4887190 commit 22fa1d4

File tree

3 files changed

+17
-1
lines changed

3 files changed

+17
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 7ae8889286535446f9a7c0d4c3e214b55d7063e6
2+
refs/heads/master: 58a8103df9077d581a7b17824a7a4b9be695ec5f
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 3a96d6a9818fe2affc98a187fb1065120458cee9
55
refs/heads/try: ccf8fedf1cffcb8f6f3581d53d220039e192fe77

trunk/src/librustdoc/doctree.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ pub struct Module {
3939
pub vis: ast::Visibility,
4040
pub stab: Option<attr::Stability>,
4141
pub impls: Vec<Impl>,
42+
pub def_traits: Vec<DefaultTrait>,
4243
pub foreigns: Vec<ast::ForeignMod>,
4344
pub macros: Vec<Macro>,
4445
pub is_crate: bool,
@@ -65,6 +66,7 @@ impl Module {
6566
constants : Vec::new(),
6667
traits : Vec::new(),
6768
impls : Vec::new(),
69+
def_traits : Vec::new(),
6870
foreigns : Vec::new(),
6971
macros : Vec::new(),
7072
is_crate : false,
@@ -196,6 +198,12 @@ pub struct Impl {
196198
pub id: ast::NodeId,
197199
}
198200

201+
pub struct DefaultTrait {
202+
pub unsafety: ast::Unsafety,
203+
pub trait_: ast::TraitRef,
204+
pub id: ast::NodeId,
205+
}
206+
199207
pub struct Macro {
200208
pub name: Ident,
201209
pub id: ast::NodeId,

trunk/src/librustdoc/visit_ast.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,14 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
358358
};
359359
om.impls.push(i);
360360
},
361+
ast::ItemDefTrait(unsafety, ref trait_ref) => {
362+
let i = DefaultTrait {
363+
unsafety: unsafety,
364+
trait_: trait_ref.clone(),
365+
id: item.id
366+
};
367+
om.def_traits.push(i);
368+
}
361369
ast::ItemForeignMod(ref fm) => {
362370
om.foreigns.push(fm.clone());
363371
}

0 commit comments

Comments
 (0)