Convert required suffixes into a use of `as`.

7 files changed, 20 insertions, 19 deletions

diff --git a/src/test/compile-fail/asm-in-bad-modifier.rs b/src/test/compile-fail/asm-in-bad-modifier.rs
index ffbb25e266a..01481af817b 100644
--- a/src/test/compile-fail/asm-in-bad-modifier.rs
+++ b/src/test/compile-fail/asm-in-bad-modifier.rs
@@ -20,8 +20,8 @@ pub fn main() {
     let x: isize;
     let y: isize;
     unsafe {
-        asm!("mov $1, $0" : "=r"(x) : "=r"(5us)); //~ ERROR input operand constraint contains '='
-        asm!("mov $1, $0" : "=r"(y) : "+r"(5us)); //~ ERROR input operand constraint contains '+'
+        asm!("mov $1, $0" : "=r"(x) : "=r"(5_usize)); //~ ERROR operand constraint contains '='
+        asm!("mov $1, $0" : "=r"(y) : "+r"(5_usize)); //~ ERROR operand constraint contains '+'
     }
     foo(x);
     foo(y);
diff --git a/src/test/compile-fail/asm-misplaced-option.rs b/src/test/compile-fail/asm-misplaced-option.rs
index 8bc6f206dec..a29ead02b61 100644
--- a/src/test/compile-fail/asm-misplaced-option.rs
+++ b/src/test/compile-fail/asm-misplaced-option.rs
@@ -21,7 +21,7 @@ pub fn main() {
     let mut x: isize = 0;
     unsafe {
         // extra colon
-        asm!("mov $1, $0" : "=r"(x) : "r"(5us), "0"(x) : : "cc");
+        asm!("mov $1, $0" : "=r"(x) : "r"(5_usize), "0"(x) : : "cc");
         //~^ WARNING unrecognized option
     }
     assert_eq!(x, 5);
diff --git a/src/test/compile-fail/asm-out-assign-imm.rs b/src/test/compile-fail/asm-out-assign-imm.rs
index 9ad5d7e9f09..ff56fb14f7d 100644
--- a/src/test/compile-fail/asm-out-assign-imm.rs
+++ b/src/test/compile-fail/asm-out-assign-imm.rs
@@ -21,7 +21,8 @@ pub fn main() {
     x = 1; //~ NOTE prior assignment occurs here
     foo(x);
     unsafe {
-        asm!("mov $1, $0" : "=r"(x) : "r"(5us)); //~ ERROR re-assignment of immutable variable `x`
+        asm!("mov $1, $0" : "=r"(x) : "r"(5_usize));
+        //~^ ERROR re-assignment of immutable variable `x`
     }
     foo(x);
 }
diff --git a/src/test/compile-fail/asm-out-no-modifier.rs b/src/test/compile-fail/asm-out-no-modifier.rs
index b58d41e1d82..17c19c77ab9 100644
--- a/src/test/compile-fail/asm-out-no-modifier.rs
+++ b/src/test/compile-fail/asm-out-no-modifier.rs
@@ -19,7 +19,7 @@ fn foo(x: isize) { println!("{}", x); }
 pub fn main() {
     let x: isize;
     unsafe {
-        asm!("mov $1, $0" : "r"(x) : "r"(5us)); //~ ERROR output operand constraint lacks '='
+        asm!("mov $1, $0" : "r"(x) : "r"(5_usize)); //~ ERROR output operand constraint lacks '='
     }
     foo(x);
 }
diff --git a/src/test/compile-fail/issue-13058.rs b/src/test/compile-fail/issue-13058.rs
index 61b50ef705f..06f14158b91 100644
--- a/src/test/compile-fail/issue-13058.rs
+++ b/src/test/compile-fail/issue-13058.rs
@@ -34,7 +34,7 @@ fn check<'r, I: Iterator<Item=usize>, T: Itble<'r, usize, I>>(cont: &T) -> bool
 }
 
 fn main() {
-    check((3us, 5us));
+    check((3_usize, 5_usize));
 //~^ ERROR mismatched types
 //~| expected `&_`
 //~| found `(usize, usize)`
diff --git a/src/test/pretty/issue-4264.pp b/src/test/pretty/issue-4264.pp
index ffe45c0ac46..b817371b870 100644
--- a/src/test/pretty/issue-4264.pp
+++ b/src/test/pretty/issue-4264.pp
@@ -23,7 +23,7 @@ extern crate "std" as std;
 pub fn foo(_: [i32; (3 as usize)]) { }
 
 pub fn bar() {
-    const FOO: usize = ((5us as usize) - (4us as usize) as usize);
+    const FOO: usize = ((5usize as usize) - (4usize as usize) as usize);
     let _: [(); (FOO as usize)] = ([(() as ())] as [(); 1]);
 
     let _: [(); (1us as usize)] = ([(() as ())] as [(); 1]);
diff --git a/src/test/run-pass/numeric-method-autoexport.rs b/src/test/run-pass/numeric-method-autoexport.rs
index fec4a806b43..c414d735f7c 100644
--- a/src/test/run-pass/numeric-method-autoexport.rs
+++ b/src/test/run-pass/numeric-method-autoexport.rs
@@ -21,22 +21,22 @@ use std::num::ToPrimitive;
 pub fn main() {
 // ints
     // num
-    assert_eq!(15is.add(6is), 21is);
-    assert_eq!(15i8.add(6i8), 21i8);
-    assert_eq!(15i16.add(6i16), 21i16);
-    assert_eq!(15i32.add(6i32), 21i32);
-    assert_eq!(15i64.add(6i64), 21i64);
+    assert_eq!(15_isize.add(6_isize), 21_isize);
+    assert_eq!(15_i8.add(6i8), 21_i8);
+    assert_eq!(15_i16.add(6i16), 21_i16);
+    assert_eq!(15_i32.add(6i32), 21_i32);
+    assert_eq!(15_i64.add(6i64), 21_i64);
 
 // uints
     // num
-    assert_eq!(15us.add(6us), 21us);
-    assert_eq!(15u8.add(6u8), 21u8);
-    assert_eq!(15u16.add(6u16), 21u16);
-    assert_eq!(15u32.add(6u32), 21u32);
-    assert_eq!(15u64.add(6u64), 21u64);
+    assert_eq!(15_usize.add(6us), 21_usize);
+    assert_eq!(15_u8.add(6u8), 21_u8);
+    assert_eq!(15_u16.add(6u16), 21_u16);
+    assert_eq!(15_u32.add(6u32), 21_u32);
+    assert_eq!(15_u64.add(6u64), 21_u64);
 
 // floats
     // num
-    assert_eq!(10f32.to_i32().unwrap(), 10);
-    assert_eq!(10f64.to_i32().unwrap(), 10);
+    assert_eq!(10_f32.to_i32().unwrap(), 10);
+    assert_eq!(10_f64.to_i32().unwrap(), 10);
 }