---

yaml
---
r: 195511
b: refs/heads/master
c: 0b57df7
h: refs/heads/master
i:
  195509: adfaf83
  195507: 47e9325
  195503: 58ddf8a
v: v3

Author: pnkfelix

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 36b6d0ecdc7cced17e1b7341883a33e42e03b7b2
+refs/heads/master: 0b57df77b3f7181a4dfb282dc8c4526846a9dddd
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: b3317d68910900f135f9f38e43a7a699bc736b4a
 refs/heads/try: 961e0358e1a5c0faaef606e31e9965742c1643bf

trunk/src/librustc/middle/ty.rs

@@ -5509,12 +5509,12 @@ impl IntTypeExt for attr::IntType {
             SignedInt(ast::TyI16)     => cx.types.i16,
             SignedInt(ast::TyI32)     => cx.types.i32,
             SignedInt(ast::TyI64)     => cx.types.i64,
-            SignedInt(ast::TyIs)   => cx.types.int,
+            SignedInt(ast::TyIs)   => cx.types.isize,
             UnsignedInt(ast::TyU8)    => cx.types.u8,
             UnsignedInt(ast::TyU16)   => cx.types.u16,
             UnsignedInt(ast::TyU32)   => cx.types.u32,
             UnsignedInt(ast::TyU64)   => cx.types.u64,
-            UnsignedInt(ast::TyUs) => cx.types.uint,
+            UnsignedInt(ast::TyUs) => cx.types.usize,
         }
     }