---

yaml
---
r: 83106
b: refs/heads/auto
c: 420b426
h: refs/heads/master
v: v3

Author: thestinger

[refs]

@@ -13,7 +13,7 @@ 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: 1252ad409258c2d3a2595f8a77dc7b84491cca77
+refs/heads/auto: 420b4260b4000af2b1ffb579fb7df5e437e0faa2
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/librustc/middle/trans/intrinsic.rs

@@ -222,11 +222,6 @@ pub fn trans_intrinsic(ccx: @mut CrateContext,
     }
 
     match name {
-        "abort" => {
-            let llfn = bcx.ccx().intrinsics.get_copy(&("llvm.trap"));
-            Call(bcx, llfn, [], []);
-            RetVoid(bcx);
-        }
         "size_of" => {
             let tp_ty = substs.tys[0];
             let lltp_ty = type_of::type_of(ccx, tp_ty);

branches/auto/src/librustc/middle/typeck/check/mod.rs

@@ -3585,7 +3585,6 @@ pub fn check_intrinsic_type(ccx: @mut CrateCtxt, it: @ast::foreign_item) {
 
     } else {
         match name {
-            "abort"  => (0, ~[], ty::mk_bot()),
             "size_of" |
             "pref_align_of" | "min_align_of" => (1u, ~[], ty::mk_uint()),
             "init" => (1u, ~[], param(ccx, 0u)),

branches/auto/src/libstd/unstable/intrinsics.rs

@@ -171,9 +171,6 @@ pub trait TyVisitor {
 }
 
 extern "rust-intrinsic" {
-    /// Abort the execution of the process.
-    #[cfg(not(stage0))]
-    pub fn abort() -> !;
 
     /// Atomic compare and exchange, sequentially consistent.
     pub fn atomic_cxchg(dst: &mut int, old: int, src: int) -> int;

branches/auto/src/libstd/unstable/lang.rs

@@ -25,7 +25,7 @@ pub fn fail_(expr: *c_char, file: *c_char, line: size_t) -> ! {
 pub fn fail_bounds_check(file: *c_char, line: size_t,
                          index: size_t, len: size_t) {
     let msg = format!("index out of bounds: the len is {} but the index is {}",
-                      len as int, index as int);
+                      len as uint, index as uint);
     do msg.with_c_str |buf| {
         fail_(buf, file, line);
     }