---

yaml
---
r: 143059
b: refs/heads/try2
c: b52eb4a
h: refs/heads/master
i:
  143057: 712be43
  143055: 42cda62
v: v3

Author: michaelwoerister

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 6aa43c77d4eaf72e673f060ed07bce7f8fc5757d
+refs/heads/try2: b52eb4a0ffbb5be156a0d71dc37f74c3f92e315e
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/trans/debuginfo.rs

@@ -1225,8 +1225,8 @@ fn type_metadata(cx: &mut CrateContext,
 
     debug!("type_metadata: %?", ty::get(t));
 
-    let sty = copy ty::get(t).sty;
-    let type_metadata = match sty {
+    let sty = &ty::get(t).sty;
+    let type_metadata = match *sty {
         ty::ty_nil      |
         ty::ty_bot      |
         ty::ty_bool     |

branches/try2/src/librustc/middle/ty.rs

@@ -3694,7 +3694,7 @@ fn struct_ctor_id(cx: ctxt, struct_did: ast::def_id) -> Option<ast::def_id> {
 
 // Enum information
 #[deriving(Clone)]
-pub struct VariantInfo_ {
+pub struct VariantInfo {
     args: ~[t],
     arg_names: Option<~[ast::ident]>,
     ctor_ty: t,

branches/try2/src/rustllvm/rustllvm.def.in

@@ -608,3 +608,6 @@ LLVMDIBuilderCreateSubroutineType
 LLVMDIBuilderGetOrCreateArray
 LLVMDIBuilderInsertDeclareAtEnd
 LLVMDIBuilderInsertDeclareBefore
+LLVMDIBuilderCreateEnumerator
+LLVMDIBuilderCreateEnumerationType
+LLVMDIBuilderCreateUnionType