Skip to content

Commit 5e73056

Browse files
committed
---
yaml --- r: 11864 b: refs/heads/master c: 8f84d4c h: refs/heads/master v: v3
1 parent 46459b5 commit 5e73056

File tree

10 files changed

+113
-308
lines changed

10 files changed

+113
-308
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: 83c9f585342d6974c5f1847f18ab2b6322b1ea42
2+
refs/heads/master: 8f84d4c8b6305c960cf51c35a5ea38697d7fa530
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
55
refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rustc/metadata/encoder.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,9 @@ fn encode_info_for_item(ecx: @encode_ctxt, ebml_w: ebml::writer, item: @item,
429429
encode_family(ebml_w, 'f');
430430
encode_type_param_bounds(ebml_w, ecx, tps);
431431
encode_type(ecx, ebml_w, fn_ty);
432-
encode_symbol(ecx, ebml_w, ctor_id);
432+
if tps.len() == 0u {
433+
encode_symbol(ecx, ebml_w, ctor_id);
434+
}
433435
encode_path(ebml_w, path, ast_map::path_name(item.ident));
434436
ebml_w.end_tag();
435437
}
@@ -447,7 +449,6 @@ fn encode_info_for_item(ecx: @encode_ctxt, ebml_w: ebml::writer, item: @item,
447449
}
448450
alt ifce {
449451
some(t) {
450-
encode_symbol(ecx, ebml_w, item.id);
451452
let i_ty = alt check t.node {
452453
ty_path(_, id) { ty::node_id_to_type(tcx, id) }
453454
};

0 commit comments

Comments
 (0)