---

yaml
---
r: 3460
b: refs/heads/master
c: 5b2c17f
h: refs/heads/master
v: v3

Author: graydon

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 750dcc05e441e9e958012155902ce841e1ef1ed2
+refs/heads/master: 5b2c17fba51b868c1a9b6de0bd0f3941eb87249c

trunk/src/comp/metadata/encoder.rs

@@ -280,10 +280,11 @@ fn encode_info_for_item(@crate_ctxt cx, &ebml::writer ebml_w,
                                     tps);
         }
         case (item_res(_, _, ?tps, ?ctor_id)) {
-            auto fn_ty = node_id_type(cx, item.id);
+
+            auto fn_ty = node_id_type(cx, ctor_id);
 
             ebml::start_tag(ebml_w, tag_items_data_item);
-            encode_def_id(ebml_w, local_def(item.id));
+            encode_def_id(ebml_w, local_def(ctor_id));
             encode_kind(ebml_w, 'y' as u8);
             encode_type_param_count(ebml_w, tps);
             encode_type(cx, ebml_w, ty::ty_fn_ret(cx.tcx, fn_ty));

trunk/src/comp/middle/typeck.rs

@@ -742,6 +742,7 @@ mod collect {
                                         t_res, ast::return, []);
                 auto t_dtor = ty::mk_fn(cx.tcx, ast::proto_fn, [t_arg],
                                         ty::mk_nil(cx.tcx), ast::return, []);
+                write::ty_only(cx.tcx, it.id, t_res);
                 write::ty_only(cx.tcx, ctor_id, t_ctor);
                 cx.tcx.tcache.insert(local_def(ctor_id),
                                      tup(vec::len(tps), t_ctor));