---

yaml
---
r: 69103
b: refs/heads/auto
c: 0d04aa7
h: refs/heads/master
i:
  69101: 42128f2
  69099: 1696375
  69095: bdb2573
  69087: 8a32483
v: v3

Author: bors

[refs]

@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: b52eb4a0ffbb5be156a0d71dc37f74c3f92e315e
+refs/heads/auto: 0d04aa78e5e8a7e3c48141028137c1a69e7e32ee
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/configure

@@ -921,9 +921,6 @@ do
         esac
         need_ok "LLVM configure failed"
 
-        # Hack the tools Makefile to turn off the clang build
-        sed -i 's/clang//g' tools/Makefile
-
         cd $CFG_BUILD_DIR
     fi
 

branches/auto/src/librustc/lib/llvm.rs

@@ -1635,14 +1635,6 @@ pub mod llvm {
         #[fast_ffi]
         pub unsafe fn LLVMABIAlignmentOfType(TD: TargetDataRef,
                                   Ty: TypeRef) -> c_uint;
-
-        /** Computes the byte offset of the indexed struct element for a target. */
-        #[fast_ffi]
-        pub unsafe fn LLVMOffsetOfElement(TD: TargetDataRef,
-                                          StructTy: TypeRef,
-                                          Element: c_uint)
-                                       -> c_ulonglong;
-
         /**
          * Returns the minimum alignment of a type when part of a call frame.
          */
@@ -2097,37 +2089,6 @@ pub mod llvm {
             Val: ValueRef,
             VarInfo: DIVariable,
             InsertBefore: ValueRef) -> ValueRef;
-
-        #[fast_ffi]
-        pub unsafe fn LLVMDIBuilderCreateEnumerator(
-            Builder: DIBuilderRef,
-            Name: *c_char,
-            Val: c_ulonglong) -> ValueRef;
-
-        #[fast_ffi]
-        pub unsafe fn LLVMDIBuilderCreateEnumerationType(
-            Builder: DIBuilderRef,
-            Scope: ValueRef,
-            Name: *c_char,
-            File: ValueRef,
-            LineNumber: c_uint,
-            SizeInBits: c_ulonglong,
-            AlignInBits: c_ulonglong,
-            Elements: ValueRef,
-            ClassType: ValueRef) -> ValueRef;
-
-        #[fast_ffi]
-        pub unsafe fn LLVMDIBuilderCreateUnionType(
-            Builder: DIBuilderRef,
-            Scope: ValueRef,
-            Name: *c_char,
-            File: ValueRef,
-            LineNumber: c_uint,
-            SizeInBits: c_ulonglong,
-            AlignInBits: c_ulonglong,
-            Flags: c_uint ,
-            Elements: ValueRef,
-            RunTimeLang: c_uint) -> ValueRef;
     }
 }
 

branches/auto/src/librustc/metadata/csearch.rs

@@ -90,7 +90,7 @@ pub fn maybe_get_item_ast(tcx: ty::ctxt, def: ast::def_id,
 }
 
 pub fn get_enum_variants(tcx: ty::ctxt, def: ast::def_id)
-                      -> ~[@ty::VariantInfo] {
+                      -> ~[ty::VariantInfo] {
     let cstore = tcx.cstore;
     let cdata = cstore::get_crate_data(cstore, def.crate);
     return decoder::get_enum_variants(cstore.intr, cdata, def.node, tcx)

branches/auto/src/librustc/metadata/decoder.rs

@@ -733,11 +733,11 @@ pub fn maybe_get_item_ast(cdata: cmd, tcx: ty::ctxt,
 }
 
 pub fn get_enum_variants(intr: @ident_interner, cdata: cmd, id: ast::node_id,
-                     tcx: ty::ctxt) -> ~[@ty::VariantInfo] {
+                     tcx: ty::ctxt) -> ~[ty::VariantInfo] {
     let data = cdata.data;
     let items = reader::get_doc(reader::Doc(data), tag_items);
     let item = find_item(id, items);
-    let mut infos: ~[@ty::VariantInfo] = ~[];
+    let mut infos: ~[ty::VariantInfo] = ~[];
     let variant_ids = enum_variant_ids(item, cdata);
     let mut disr_val = 0;
     for variant_ids.iter().advance |did| {
@@ -753,16 +753,11 @@ pub fn get_enum_variants(intr: @ident_interner, cdata: cmd, id: ast::node_id,
           Some(val) => { disr_val = val; }
           _         => { /* empty */ }
         }
-        infos.push(@ty::VariantInfo{
-            args: arg_tys,
-            arg_names: None,
-            ctor_ty: ctor_ty,
-            name: name,
-            // I'm not even sure if we encode visibility
-            // for variants -- TEST -- tjc
-            id: *did,
-            disr_val: disr_val,
-            vis: ast::inherited});
+        infos.push(@ty::VariantInfo_{args: arg_tys,
+                       ctor_ty: ctor_ty, name: name,
+                  // I'm not even sure if we encode visibility
+                  // for variants -- TEST -- tjc
+                  id: *did, disr_val: disr_val, vis: ast::inherited});
         disr_val += 1;
     }
     return infos;