fix post rebase.

pnkfelix · pnkfelix · commit 0b57df77b3f7 · 2015-04-01T02:55:13.000+02:00
diff --git 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,
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -5509,12 +5509,12 @@ impl IntTypeExt for attr::IntType {`
`5509`	`5509`	`SignedInt(ast::TyI16) => cx.types.i16,`
`5510`	`5510`	`SignedInt(ast::TyI32) => cx.types.i32,`
`5511`	`5511`	`SignedInt(ast::TyI64) => cx.types.i64,`
`5512`		`- SignedInt(ast::TyIs) => cx.types.int,`
	`5512`	`+ SignedInt(ast::TyIs) => cx.types.isize,`
`5513`	`5513`	`UnsignedInt(ast::TyU8) => cx.types.u8,`
`5514`	`5514`	`UnsignedInt(ast::TyU16) => cx.types.u16,`
`5515`	`5515`	`UnsignedInt(ast::TyU32) => cx.types.u32,`
`5516`	`5516`	`UnsignedInt(ast::TyU64) => cx.types.u64,`
`5517`		`- UnsignedInt(ast::TyUs) => cx.types.uint,`
	`5517`	`+ UnsignedInt(ast::TyUs) => cx.types.usize,`
`5518`	`5518`	`}`
`5519`	`5519`	`}`
`5520`	`5520`