Remove resources

Also fixed shapes for classes with dtors, as well as handling
offsets for classes with dtors correctly in take glue.

Closes #2485

3 files changed, 0 insertions, 55 deletions

diff --git a/src/rustc/metadata/encoder.rs b/src/rustc/metadata/encoder.rs
index 62c4a078952..7f2474e57ca 100644
--- a/src/rustc/metadata/encoder.rs
+++ b/src/rustc/metadata/encoder.rs
@@ -186,17 +186,6 @@ fn encode_module_item_paths(ebml_w: ebml::writer, ecx: @encode_ctxt,
               encode_name_and_def_id(ebml_w, it.ident, it.id);
             }
           }
-          item_res(_, tps, _, _, ctor_id, _) {
-            ebml_w.wr_tag(tag_paths_data_item) {||
-                encode_name_and_def_id(ebml_w, it.ident, ctor_id);
-            }
-            // The same ident has to be added twice (with different positions)
-            // because it's for both the ctor and the dtor.
-            add_to_index(ebml_w, path, index, it.ident);
-            ebml_w.wr_tag(tag_paths_data_item) {||
-                encode_name_and_def_id(ebml_w, it.ident, it.id);
-            }
-          }
           item_class(_, _, items, ctor, m_dtor, _) {
             ebml_w.wr_tag(tag_paths_data_item) {||
                 encode_name_and_def_id(ebml_w, it.ident, it.id);
@@ -698,34 +687,6 @@ fn encode_info_for_item(ecx: @encode_ctxt, ebml_w: ebml::writer, item: @item,
         encode_index(ebml_w, bkts, write_int);
         ebml_w.end_tag();
       }
-      item_res(_, tps, _, _, ctor_id, rp) {
-        add_to_index();
-        let fn_ty = node_id_to_type(tcx, ctor_id);
-
-        ebml_w.start_tag(tag_items_data_item);
-        encode_def_id(ebml_w, local_def(ctor_id));
-        encode_family(ebml_w, 'y');
-        encode_type_param_bounds(ebml_w, ecx, tps);
-        encode_type(ecx, ebml_w, ty::ty_fn_ret(fn_ty));
-        encode_name(ebml_w, item.ident);
-        ecx.encode_inlined_item(ecx, ebml_w, path, ii_item(item));
-        if (tps.len() == 0u) {
-            encode_symbol(ecx, ebml_w, item.id);
-        }
-        encode_path(ebml_w, path, ast_map::path_name(item.ident));
-        encode_region_param(ebml_w, rp);
-        ebml_w.end_tag();
-
-        *index += [{val: ctor_id, pos: ebml_w.writer.tell()}];
-        ebml_w.start_tag(tag_items_data_item);
-        encode_def_id(ebml_w, local_def(ctor_id));
-        encode_family(ebml_w, 'f');
-        encode_type_param_bounds(ebml_w, ecx, tps);
-        encode_type(ecx, ebml_w, fn_ty);
-        encode_parent_item(ebml_w, local_def(item.id));
-        encode_path(ebml_w, path, ast_map::path_name(item.ident));
-        ebml_w.end_tag();
-      }
       item_impl(tps, rp, ifce, _, methods) {
         add_to_index();
         ebml_w.start_tag(tag_items_data_item);
diff --git a/src/rustc/metadata/tydecode.rs b/src/rustc/metadata/tydecode.rs
index f7c4628e51c..794af5577e7 100644
--- a/src/rustc/metadata/tydecode.rs
+++ b/src/rustc/metadata/tydecode.rs
@@ -338,14 +338,6 @@ fn parse_ty(st: @pstate, conv: conv_did) -> ty::t {
       'f' {
         parse_ty_rust_fn(st, conv)
       }
-      'r' {
-        assert next(st) == '[';
-        let def = parse_def(st, conv);
-        let inner = parse_ty(st, conv);
-        let substs = parse_substs(st, conv);
-        assert next(st) == ']';
-        ret ty::mk_res(st.tcx, def, inner, substs);
-      }
       'X' {
         ret ty::mk_var(st.tcx, ty::tv_vid(parse_int(st) as uint));
       }
diff --git a/src/rustc/metadata/tyencode.rs b/src/rustc/metadata/tyencode.rs
index f21b3850a98..dc1cbac434b 100644
--- a/src/rustc/metadata/tyencode.rs
+++ b/src/rustc/metadata/tyencode.rs
@@ -265,14 +265,6 @@ fn enc_sty(w: io::writer, cx: @ctxt, st: ty::sty) {
       ty::ty_fn(f) {
         enc_ty_fn(w, cx, f);
       }
-      ty::ty_res(def, ty, substs) {
-        w.write_str("r["/&);
-        w.write_str(cx.ds(def));
-        w.write_char('|');
-        enc_ty(w, cx, ty);
-        enc_substs(w, cx, substs);
-        w.write_char(']');
-      }
       ty::ty_var(id) {
         w.write_char('X');
         w.write_uint(id.to_uint());