---

yaml
---
r: 63583
b: refs/heads/snap-stage3
c: 273f905
h: refs/heads/master
i:
  63581: beb78a8
  63579: bfe5041
  63575: c2fadaf
  63567: af8b7c3
  63551: 4cf0159
v: v3

Author: Blei

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 8bf00333455a572bc4c48f947777ed2e7b57af09
+refs/heads/snap-stage3: 273f90566c26309c13ebe10278f8745e978250b2
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/middle/trans/type_.rs

@@ -189,8 +189,7 @@ impl Type {
             None => ()
         }
 
-        // Bit of a kludge: pick the fn typeref out of the tydesc..
-        let ty = cx.tydesc_type.get_field(abi::tydesc_field_drop_glue);
+        let ty = Type::glue_fn(cx.tydesc_type).ptr_to();
         cx.tn.associate_type("glue_fn", &ty);
 
         return ty;
@@ -269,10 +268,6 @@ impl Type {
         cx.int_type
     }
 
-    pub fn captured_tydescs(ctx: &CrateContext, num: uint) -> Type {
-        Type::struct_(vec::from_elem(num, ctx.tydesc_type.ptr_to()), false)
-    }
-
     pub fn opaque_trait(ctx: &CrateContext, store: ty::TraitStore) -> Type {
         let tydesc_ptr = ctx.tydesc_type.ptr_to();
         match store {

branches/snap-stage3/src/librustc/middle/ty.rs

@@ -4453,8 +4453,8 @@ pub fn get_tydesc_ty(tcx: ctxt) -> t {
 }
 
 pub fn get_opaque_ty(tcx: ctxt) -> t {
-    let tydesc_lang_item = tcx.lang_items.opaque();
-    tcx.intrinsic_defs.find_copy(&tydesc_lang_item)
+    let opaque_lang_item = tcx.lang_items.opaque();
+    tcx.intrinsic_defs.find_copy(&opaque_lang_item)
         .expect("Failed to resolve Opaque")
 }