1 files changed, 15 insertions, 15 deletions
diff --git a/src/test/run-pass/enum-null-pointer-opt.rs b/src/test/run-pass/enum-null-pointer-opt.rs
index b8819ab61e8..9fc799a97f6 100644
--- a/src/test/run-pass/enum-null-pointer-opt.rs
+++ b/src/test/run-pass/enum-null-pointer-opt.rs
@@ -23,13 +23,13 @@ trait Trait { fn dummy(&self) { } }
 
 fn main() {
     // Functions
-    assert_eq!(size_of::<fn(int)>(), size_of::<Option<fn(int)>>());
-    assert_eq!(size_of::<extern "C" fn(int)>(), size_of::<Option<extern "C" fn(int)>>());
+    assert_eq!(size_of::<fn(isize)>(), size_of::<Option<fn(isize)>>());
+    assert_eq!(size_of::<extern "C" fn(isize)>(), size_of::<Option<extern "C" fn(isize)>>());
 
     // Slices - &str / &[T] / &mut [T]
     assert_eq!(size_of::<&str>(), size_of::<Option<&str>>());
-    assert_eq!(size_of::<&[int]>(), size_of::<Option<&[int]>>());
-    assert_eq!(size_of::<&mut [int]>(), size_of::<Option<&mut [int]>>());
+    assert_eq!(size_of::<&[isize]>(), size_of::<Option<&[isize]>>());
+    assert_eq!(size_of::<&mut [isize]>(), size_of::<Option<&mut [isize]>>());
 
     // Traits - Box<Trait> / &Trait / &mut Trait
     assert_eq!(size_of::<Box<Trait>>(), size_of::<Option<Box<Trait>>>());
@@ -37,33 +37,33 @@ fn main() {
     assert_eq!(size_of::<&mut Trait>(), size_of::<Option<&mut Trait>>());
 
     // Pointers - Box<T>
-    assert_eq!(size_of::<Box<int>>(), size_of::<Option<Box<int>>>());
+    assert_eq!(size_of::<Box<isize>>(), size_of::<Option<Box<isize>>>());
 
     // The optimization can't apply to raw pointers
-    assert!(size_of::<Option<*const int>>() != size_of::<*const int>());
-    assert!(Some(0 as *const int).is_some()); // Can't collapse None to null
+    assert!(size_of::<Option<*const isize>>() != size_of::<*const isize>());
+    assert!(Some(0 as *const isize).is_some()); // Can't collapse None to null
 
     struct Foo {
-        _a: Box<int>
+        _a: Box<isize>
     }
-    struct Bar(Box<int>);
+    struct Bar(Box<isize>);
 
     // Should apply through structs
     assert_eq!(size_of::<Foo>(), size_of::<Option<Foo>>());
     assert_eq!(size_of::<Bar>(), size_of::<Option<Bar>>());
     // and tuples
-    assert_eq!(size_of::<(u8, Box<int>)>(), size_of::<Option<(u8, Box<int>)>>());
+    assert_eq!(size_of::<(u8, Box<isize>)>(), size_of::<Option<(u8, Box<isize>)>>());
     // and fixed-size arrays
-    assert_eq!(size_of::<[Box<int>; 1]>(), size_of::<Option<[Box<int>; 1]>>());
+    assert_eq!(size_of::<[Box<isize>; 1]>(), size_of::<Option<[Box<isize>; 1]>>());
 
     // Should apply to NonZero
-    assert_eq!(size_of::<NonZero<uint>>(), size_of::<Option<NonZero<uint>>>());
+    assert_eq!(size_of::<NonZero<usize>>(), size_of::<Option<NonZero<usize>>>());
     assert_eq!(size_of::<NonZero<*mut i8>>(), size_of::<Option<NonZero<*mut i8>>>());
 
     // Should apply to types that use NonZero internally
-    assert_eq!(size_of::<Vec<int>>(), size_of::<Option<Vec<int>>>());
-    assert_eq!(size_of::<Arc<int>>(), size_of::<Option<Arc<int>>>());
-    assert_eq!(size_of::<Rc<int>>(), size_of::<Option<Rc<int>>>());
+    assert_eq!(size_of::<Vec<isize>>(), size_of::<Option<Vec<isize>>>());
+    assert_eq!(size_of::<Arc<isize>>(), size_of::<Option<Arc<isize>>>());
+    assert_eq!(size_of::<Rc<isize>>(), size_of::<Option<Rc<isize>>>());
 
     // Should apply to types that have NonZero transitively
     assert_eq!(size_of::<String>(), size_of::<Option<String>>());