---

yaml
---
r: 42286
b: refs/heads/master
c: 6d5428c
h: refs/heads/master
v: v3

Author: sanxiyn

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 6105f09cc163ab728ff0ef18d4f817ad1a34bfb3
+refs/heads/master: 6d5428cb4ee9117f16d3a5c7f36def4c60b364ed
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
 refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650

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

@@ -42,7 +42,7 @@ use syntax::parse::token::special_idents;
 
 fn abi_info(arch: session::arch) -> cabi::ABIInfo {
     return match arch {
-        arch_x86_64 | arch_arm => x86_64_abi_info(),
+        arch_x86_64 => x86_64_abi_info(),
         _ => cabi::llvm_abi_info()
     }
 }

trunk/src/librustc/middle/ty.rs

@@ -2435,7 +2435,7 @@ pub fn type_structurally_contains_uniques(cx: ctxt, ty: t) -> bool {
 
 pub fn type_is_integral(ty: t) -> bool {
     match get(ty).sty {
-      ty_infer(IntVar(_)) | ty_int(_) | ty_uint(_) | ty_bool => true,
+      ty_infer(IntVar(_)) | ty_int(_) | ty_uint(_) => true,
       _ => false
     }
 }

trunk/src/test/compile-fail/unop-neg-bool.rs

@@ -0,0 +1,3 @@
+fn main() {
+    -true; //~ ERROR cannot apply unary operator `-` to type `bool`
+}