---

yaml
---
r: 12874
b: refs/heads/master
c: 19ec5a4
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: f1a46914c4241c05a5b44f6f8dad4630a150e292
+refs/heads/master: 19ec5a41ed98df980357a93d6938dc253106fd9d
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

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

@@ -2620,11 +2620,16 @@ fn float_cast(bcx: block, lldsttype: TypeRef, llsrctype: TypeRef,
 enum cast_kind { cast_pointer, cast_integral, cast_float,
                 cast_enum, cast_other, }
 fn cast_type_kind(t: ty::t) -> cast_kind {
-    if ty::type_is_fp(t) { cast_float }
-    else if ty::type_is_unsafe_ptr(t) { cast_pointer }
-    else if ty::type_is_integral(t) { cast_integral }
-    else if ty::type_is_enum(t) { cast_enum }
-    else { cast_other }
+    alt ty::get(t).struct {
+      ty::ty_float(*)   {cast_float}
+      ty::ty_ptr(*)     {cast_pointer}
+      ty::ty_rptr(*)    {cast_pointer}
+      ty::ty_int(*)     {cast_integral}
+      ty::ty_uint(*)    {cast_integral}
+      ty::ty_bool       {cast_integral}
+      ty::ty_enum(*)    {cast_enum}
+      _                 {cast_other}
+    }
 }
 
 

trunk/src/test/run-pass/cast-region-to-uint.rs

@@ -0,0 +1,4 @@
+fn main() {
+    let x = 3;
+    #debug["&x=%x", &x as uint];
+}