Skip to content

Commit b52eb4a

Browse files
debuginfo: Fixed some merge fallout
1 parent 6aa43c7 commit b52eb4a

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

src/librustc/middle/trans/debuginfo.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1225,8 +1225,8 @@ fn type_metadata(cx: &mut CrateContext,
12251225

12261226
debug!("type_metadata: %?", ty::get(t));
12271227

1228-
let sty = copy ty::get(t).sty;
1229-
let type_metadata = match sty {
1228+
let sty = &ty::get(t).sty;
1229+
let type_metadata = match *sty {
12301230
ty::ty_nil |
12311231
ty::ty_bot |
12321232
ty::ty_bool |

src/librustc/middle/ty.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3694,7 +3694,7 @@ fn struct_ctor_id(cx: ctxt, struct_did: ast::def_id) -> Option<ast::def_id> {
36943694

36953695
// Enum information
36963696
#[deriving(Clone)]
3697-
pub struct VariantInfo_ {
3697+
pub struct VariantInfo {
36983698
args: ~[t],
36993699
arg_names: Option<~[ast::ident]>,
37003700
ctor_ty: t,

src/rustllvm/rustllvm.def.in

+3
Original file line numberDiff line numberDiff line change
@@ -608,3 +608,6 @@ LLVMDIBuilderCreateSubroutineType
608608
LLVMDIBuilderGetOrCreateArray
609609
LLVMDIBuilderInsertDeclareAtEnd
610610
LLVMDIBuilderInsertDeclareBefore
611+
LLVMDIBuilderCreateEnumerator
612+
LLVMDIBuilderCreateEnumerationType
613+
LLVMDIBuilderCreateUnionType

0 commit comments

Comments
 (0)