---

yaml
---
r: 66133
b: refs/heads/master
c: 0b0c756
h: refs/heads/master
i:
  66131: 2d7ce7e
v: v3

Author: James Miller

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 81cf72c264efae4a16616ba6fc998ae862068d8b
+refs/heads/master: 0b0c756c9cbef3a0d42de4cee0ada34638ba7b04
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 18e3db7392d2d0697b7e27d6d986139960144d85
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9

trunk/src/librustc/lib/llvm.rs

@@ -13,9 +13,7 @@ use core::prelude::*;
 use core::hashmap::HashMap;
 use core::libc::{c_uint, c_ushort};
 use core::option;
-use core::ptr;
 use core::str;
-use core::vec;
 
 use middle::trans::type_::Type;
 

trunk/src/librustc/middle/trans/base.rs

@@ -30,7 +30,7 @@ use back::{link, abi};
 use driver::session;
 use driver::session::Session;
 use lib::llvm::{ContextRef, ModuleRef, ValueRef, BasicBlockRef};
-use lib::llvm::{llvm, True, False};
+use lib::llvm::{llvm, True};
 use lib;
 use metadata::common::LinkMeta;
 use metadata::{csearch, cstore, encoder};
@@ -1462,7 +1462,7 @@ pub fn zero_mem(cx: block, llptr: ValueRef, t: ty::t) {
 // allocation for large data structures, and the generated code will be
 // awful. (A telltale sign of this is large quantities of
 // `mov [byte ptr foo],0` in the generated code.)
-pub fn memzero(cx: block, llptr: ValueRef, llty: TypeRef) {
+pub fn memzero(cx: block, llptr: ValueRef, ty: Type) {
     let _icx = cx.insn_ctxt("memzero");
     let ccx = cx.ccx();
 
@@ -1493,7 +1493,7 @@ pub fn alloca(cx: block, ty: Type) -> ValueRef {
     alloca_maybe_zeroed(cx, ty, false)
 }
 
-pub fn alloca_maybe_zeroed(cx: block, t: TypeRef, zero: bool) -> ValueRef {
+pub fn alloca_maybe_zeroed(cx: block, ty: Type, zero: bool) -> ValueRef {
     let _icx = cx.insn_ctxt("alloca");
     if cx.unreachable {
         unsafe {
@@ -1506,7 +1506,7 @@ pub fn alloca_maybe_zeroed(cx: block, t: TypeRef, zero: bool) -> ValueRef {
     p
 }
 
-pub fn arrayalloca(cx: block, t: TypeRef, v: ValueRef) -> ValueRef {
+pub fn arrayalloca(cx: block, ty: Type, v: ValueRef) -> ValueRef {
     let _icx = cx.insn_ctxt("arrayalloca");
     if cx.unreachable {
         unsafe {
@@ -2885,8 +2885,7 @@ pub fn write_metadata(cx: &mut CrateContext, crate: &ast::crate) {
 
 // Writes the current ABI version into the crate.
 pub fn write_abi_version(ccx: &mut CrateContext) {
-    mk_global(ccx, "rust_abi_version", C_uint(ccx, abi::abi_version),
-                     false);
+    mk_global(ccx, "rust_abi_version", C_uint(ccx, abi::abi_version), false);
 }
 
 pub fn trans_crate(sess: session::Session,

trunk/src/librustc/middle/trans/build.rs

@@ -22,8 +22,8 @@ use syntax::codemap::span;
 use middle::trans::type_::Type;
 
 use core::cast;
-use core::hashmap::HashMap;
 use core::libc::{c_uint, c_ulonglong, c_char};
+use core::hashmap::HashMap;
 use core::str;
 use core::vec;
 
@@ -619,15 +619,12 @@ pub fn GEPi(cx: block, base: ValueRef, ixs: &[uint]) -> ValueRef {
     return InBoundsGEP(cx, base, v);
 }
 
-pub fn InBoundsGEP(cx: block, Pointer: ValueRef, Indices: &[ValueRef]) ->
-   ValueRef {
+pub fn InBoundsGEP(cx: block, Pointer: ValueRef, Indices: &[ValueRef]) -> ValueRef {
     unsafe {
         if cx.unreachable { return llvm::LLVMGetUndef(Type::nil().ptr_to().to_ref()); }
         count_insn(cx, "inboundsgep");
-        return llvm::LLVMBuildInBoundsGEP(B(cx), Pointer,
-                                           vec::raw::to_ptr(Indices),
-                                           Indices.len() as c_uint,
-                                           noname());
+        return llvm::LLVMBuildInBoundsGEP(
+            B(cx), Pointer, vec::raw::to_ptr(Indices), Indices.len() as c_uint, noname());
     }
 }
 
@@ -1077,8 +1074,7 @@ pub fn Trap(cx: block) {
         assert!((T as int != 0));
         let Args: ~[ValueRef] = ~[];
         count_insn(cx, "trap");
-        llvm::LLVMBuildCall(b, T, vec::raw::to_ptr(Args),
-                            Args.len() as c_uint, noname());
+        llvm::LLVMBuildCall(b, T, vec::raw::to_ptr(Args), Args.len() as c_uint, noname());
     }
 }
 
@@ -1088,8 +1084,8 @@ pub fn LandingPad(cx: block, Ty: Type, PersFn: ValueRef,
         check_not_terminated(cx);
         assert!(!cx.unreachable);
         count_insn(cx, "landingpad");
-        return llvm::LLVMBuildLandingPad(B(cx), Ty.to_ref(), PersFn,
-                                      NumClauses as c_uint, noname());
+        return llvm::LLVMBuildLandingPad(
+            B(cx), Ty.to_ref(), PersFn, NumClauses as c_uint, noname());
     }
 }
 

trunk/src/librustc/middle/trans/cabi_arm.rs

@@ -10,7 +10,6 @@
 
 use lib::llvm::{llvm, Integer, Pointer, Float, Double, Struct, Array};
 use lib::llvm::{Attribute, StructRetAttribute};
-use lib::llvm::True;
 use middle::trans::cabi::{ABIInfo, FnType, LLVMType};
 
 use middle::trans::type_::Type;
@@ -116,14 +115,12 @@ fn classify_arg_ty(ty: Type) -> (LLVMType, Option<Attribute>) {
 }
 
 fn is_reg_ty(ty: Type) -> bool {
-    unsafe {
-        match ty.kind() {
-            Integer
-            | Pointer
-            | Float
-            | Double => true,
-            _ => false
-        }
+    match ty.kind() {
+        Integer
+        | Pointer
+        | Float
+        | Double => true,
+        _ => false
     }
 }
 

trunk/src/librustc/middle/trans/cabi_mips.rs

@@ -11,14 +11,11 @@
 use core::prelude::*;
 
 use core::libc::c_uint;
-use core::ptr;
 use core::uint;
 use core::vec;
 use lib::llvm::{llvm, Integer, Pointer, Float, Double, Struct, Array};
 use lib::llvm::{Attribute, StructRetAttribute};
-use lib::llvm::True;
 use middle::trans::context::task_llcx;
-use middle::trans::common::*;
 use middle::trans::cabi::*;
 
 use middle::trans::type_::Type;
@@ -122,15 +119,13 @@ fn classify_arg_ty(ty: Type, offset: &mut uint) -> (LLVMType, Option<Attribute>)
 }
 
 fn is_reg_ty(ty: Type) -> bool {
-    unsafe {
-        return match ty.kind() {
-            Integer
-            | Pointer
-            | Float
-            | Double => true,
-            _ => false
-        };
-    }
+    return match ty.kind() {
+        Integer
+        | Pointer
+        | Float
+        | Double => true,
+        _ => false
+    };
 }
 
 fn padding_ty(align: uint, offset: uint) -> Option<Type> {

trunk/src/librustc/middle/trans/cabi_x86.rs

@@ -12,7 +12,6 @@ use core::prelude::*;
 
 use driver::session::{os_win32, os_macos};
 use lib::llvm::*;
-use lib::llvm::llvm::*;
 use super::cabi::*;
 use super::common::*;
 use super::machine::*;
@@ -43,7 +42,7 @@ impl ABIInfo for X86_ABIInfo {
         // http://www.angelcode.com/dev/callconv/callconv.html
         // Clang's ABI handling is in lib/CodeGen/TargetInfo.cpp
         let sret = {
-            let returning_a_struct = unsafe { rty.kind() == Struct && ret_def };
+            let returning_a_struct = rty.kind() == Struct && ret_def;
             let big_struct = match self.ccx.sess.targ_cfg.os {
                 os_win32 | os_macos => llsize_of_alloc(self.ccx, rty) > 8,
                 _ => true