Update suffixes en masse in tests using `perl -p -i -e`

6 files changed, 18 insertions, 18 deletions

diff --git a/src/test/run-make/graphviz-flowgraph/f20.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f20.dot-expected.dot
index c9e4b41c812..b4ec986ef25 100644
--- a/src/test/run-make/graphviz-flowgraph/f20.dot-expected.dot
+++ b/src/test/run-make/graphviz-flowgraph/f20.dot-expected.dot
@@ -1,17 +1,17 @@
 digraph block {
     N0[label="entry"];
     N1[label="exit"];
-    N2[label="expr 2us"];
-    N3[label="expr 0us"];
-    N4[label="expr 20us"];
-    N5[label="expr [2us, 0us, 20us]"];
+    N2[label="expr 2usize"];
+    N3[label="expr 0usize"];
+    N4[label="expr 20usize"];
+    N5[label="expr [2usize, 0usize, 20usize]"];
     N6[label="local v"];
-    N7[label="stmt let v = [2us, 0us, 20us];"];
+    N7[label="stmt let v = [2usize, 0usize, 20usize];"];
     N8[label="expr v"];
-    N9[label="expr 20us"];
-    N10[label="expr v[20us]"];
-    N11[label="stmt v[20us];"];
-    N12[label="block { let v = [2us, 0us, 20us]; v[20us]; }"];
+    N9[label="expr 20usize"];
+    N10[label="expr v[20usize]"];
+    N11[label="stmt v[20usize];"];
+    N12[label="block { let v = [2usize, 0usize, 20usize]; v[20usize]; }"];
     N0 -> N2;
     N2 -> N3;
     N3 -> N4;
diff --git a/src/test/run-make/graphviz-flowgraph/f20.rs b/src/test/run-make/graphviz-flowgraph/f20.rs
index 3ca55cb521b..d65de18b547 100644
--- a/src/test/run-make/graphviz-flowgraph/f20.rs
+++ b/src/test/run-make/graphviz-flowgraph/f20.rs
@@ -9,6 +9,6 @@
 // except according to those terms.
 
 pub fn expr_index_20() {
-    let v = [2us, 0us, 20us];
-    v[20us];
+    let v = [2_usize, 0_usize, 20_usize];
+    v[20_usize];
 }
diff --git a/src/test/run-make/save-analysis/foo.rs b/src/test/run-make/save-analysis/foo.rs
index 9fb2c6aa67a..db70a245232 100644
--- a/src/test/run-make/save-analysis/foo.rs
+++ b/src/test/run-make/save-analysis/foo.rs
@@ -45,11 +45,11 @@ fn test_alias<I: Iterator>(i: Option<<I as Iterator>::Item>) {
     fn foo(x: &Float) {}
     let _: Option<u8> = from_i32(45);
 
-    let x = 42us;
+    let x = 42_usize;
 
     myflate::deflate_bytes(&[]);
 
-    let x = (3, 4us);
+    let x = (3, 4_usize);
     let y = x.1;
 }
 
diff --git a/src/test/run-make/symbols-are-reasonable/lib.rs b/src/test/run-make/symbols-are-reasonable/lib.rs
index 7cfebb31b22..1e0570c95ac 100644
--- a/src/test/run-make/symbols-are-reasonable/lib.rs
+++ b/src/test/run-make/symbols-are-reasonable/lib.rs
@@ -16,5 +16,5 @@ impl Foo for uint {}
 
 pub fn dummy() {
     // force the vtable to be created
-    let _x = &1u as &Foo;
+    let _x = &1_usize as &Foo;
 }
diff --git a/src/test/run-make/unicode-input/multiple_files.rs b/src/test/run-make/unicode-input/multiple_files.rs
index 759a1d4aff9..ce3e69918ff 100644
--- a/src/test/run-make/unicode-input/multiple_files.rs
+++ b/src/test/run-make/unicode-input/multiple_files.rs
@@ -43,11 +43,11 @@ fn main() {
             .write_str("mod unicode_input_multiple_files_chars;");
     }
 
-    for _ in 0u..100 {
+    for _ in 0..100 {
         {
             let randoms = tmpdir.join("unicode_input_multiple_files_chars.rs");
             let mut w = File::create(&randoms).unwrap();
-            for _ in 0u..30 {
+            for _ in 0..30 {
                 let _ = w.write_char(random_char());
             }
         }
diff --git a/src/test/run-make/unicode-input/span_length.rs b/src/test/run-make/unicode-input/span_length.rs
index 5dee9104b0f..ef6c799336b 100644
--- a/src/test/run-make/unicode-input/span_length.rs
+++ b/src/test/run-make/unicode-input/span_length.rs
@@ -38,8 +38,8 @@ fn main() {
     let tmpdir = Path::new(&args[2]);
     let main_file = tmpdir.join("span_main.rs");
 
-    for _ in 0u..100 {
-        let n = thread_rng().gen_range(3u, 20);
+    for _ in 0..100 {
+        let n = thread_rng().gen_range(3, 20);
 
         {
             let _ = write!(&mut File::create(&main_file).unwrap(),