about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFelix S. Klock II <pnkfelix@pnkfx.org>2015-03-30 20:20:35 +0200
committerFelix S. Klock II <pnkfelix@pnkfx.org>2015-04-01 02:55:13 +0200
commit0b57df77b3f7181a4dfb282dc8c4526846a9dddd (patch)
treee739f654fa44afc4437a4c5fa0d30c082195dfd7
parent36b6d0ecdc7cced17e1b7341883a33e42e03b7b2 (diff)
downloadrust-0b57df77b3f7181a4dfb282dc8c4526846a9dddd.tar.gz
rust-0b57df77b3f7181a4dfb282dc8c4526846a9dddd.zip
fix post rebase.
-rw-r--r--src/librustc/middle/ty.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc/middle/ty.rs b/src/librustc/middle/ty.rs
index c40f31d837a..2130ec4eb63 100644
--- a/src/librustc/middle/ty.rs
+++ b/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,
         }
     }