Skip to content

Commit 0281c80

Browse files
committed
---
yaml --- r: 118353 b: refs/heads/try c: 24cbe38 h: refs/heads/master i: 118351: e2bddf5 v: v3
1 parent d1329bf commit 0281c80

File tree

4 files changed

+15
-2
lines changed

4 files changed

+15
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 3770c42a4959cbabc73da52abc7e3db96657974e
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: d6736a1440d42f6af967a8a20ab8d73522112b72
5-
refs/heads/try: 14668f2791c4893b84ae4111c52dee07c79faac7
5+
refs/heads/try: 24cbe384236b28512f0b8bc22343fbe4c4481c62
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/librustc/metadata/csearch.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,3 +321,8 @@ pub fn get_reachable_extern_fns(cstore: &cstore::CStore, cnum: ast::CrateNum)
321321
let cdata = cstore.get_crate_data(cnum);
322322
decoder::get_reachable_extern_fns(&*cdata)
323323
}
324+
325+
pub fn is_typedef(cstore: &cstore::CStore, did: ast::DefId) -> bool {
326+
let cdata = cstore.get_crate_data(did.krate);
327+
decoder::is_typedef(&*cdata, did.node)
328+
}

branches/try/src/librustc/metadata/decoder.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1339,3 +1339,11 @@ pub fn get_reachable_extern_fns(cdata: Cmd) -> Vec<ast::DefId> {
13391339
});
13401340
return ret;
13411341
}
1342+
1343+
pub fn is_typedef(cdata: Cmd, id: ast::NodeId) -> bool {
1344+
let item_doc = lookup_item(id, cdata.data());
1345+
match item_family(item_doc) {
1346+
Type => true,
1347+
_ => false,
1348+
}
1349+
}

branches/try/src/librustdoc/clean/inline.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ fn build_struct(tcx: &ty::ctxt, did: ast::DefId) -> clean::Struct {
203203
fn build_type(tcx: &ty::ctxt, did: ast::DefId) -> clean::ItemEnum {
204204
let t = ty::lookup_item_type(tcx, did);
205205
match ty::get(t.ty).sty {
206-
ty::ty_enum(edid, _) => {
206+
ty::ty_enum(edid, _) if !csearch::is_typedef(&tcx.sess.cstore, did) => {
207207
return clean::EnumItem(clean::Enum {
208208
generics: t.generics.clean(),
209209
variants_stripped: false,

0 commit comments

Comments
 (0)