Update graphviz tests to accommodate new isize/usize types and is/us suffixes.

27 files changed, 87 insertions, 87 deletions

diff --git a/src/test/run-make/graphviz-flowgraph/f01.rs b/src/test/run-make/graphviz-flowgraph/f01.rs
index f1f1a1d5472..27b19807865 100644
--- a/src/test/run-make/graphviz-flowgraph/f01.rs
+++ b/src/test/run-make/graphviz-flowgraph/f01.rs
@@ -9,5 +9,5 @@
 // except according to those terms.
 
 pub fn lit_1() {
-    1i;
+    1is;
 }
diff --git a/src/test/run-make/graphviz-flowgraph/f02.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f02.dot-expected.dot
index 230dcbaeb98..1f4a58ba0a3 100644
--- a/src/test/run-make/graphviz-flowgraph/f02.dot-expected.dot
+++ b/src/test/run-make/graphviz-flowgraph/f02.dot-expected.dot
@@ -2,8 +2,8 @@ digraph block {
     N0[label="entry"];
     N1[label="exit"];
     N2[label="local _x"];
-    N3[label="stmt let _x: int;"];
-    N4[label="block { let _x: int; }"];
+    N3[label="stmt let _x: isize;"];
+    N4[label="block { let _x: isize; }"];
     N0 -> N2;
     N2 -> N3;
     N3 -> N4;
diff --git a/src/test/run-make/graphviz-flowgraph/f02.rs b/src/test/run-make/graphviz-flowgraph/f02.rs
index 3cdd73a49e1..f7fe1266198 100644
--- a/src/test/run-make/graphviz-flowgraph/f02.rs
+++ b/src/test/run-make/graphviz-flowgraph/f02.rs
@@ -9,5 +9,5 @@
 // except according to those terms.
 
 pub fn decl_x_2() {
-    let _x : int;
+    let _x : isize;
 }
diff --git a/src/test/run-make/graphviz-flowgraph/f03.rs b/src/test/run-make/graphviz-flowgraph/f03.rs
index 051409a49b1..c95dbcbb31c 100644
--- a/src/test/run-make/graphviz-flowgraph/f03.rs
+++ b/src/test/run-make/graphviz-flowgraph/f03.rs
@@ -9,5 +9,5 @@
 // except according to those terms.
 
 pub fn expr_add_3() {
-    3i + 4;
+    3is + 4;
 }
diff --git a/src/test/run-make/graphviz-flowgraph/f04.rs b/src/test/run-make/graphviz-flowgraph/f04.rs
index ed2f7e25dae..552cb24c750 100644
--- a/src/test/run-make/graphviz-flowgraph/f04.rs
+++ b/src/test/run-make/graphviz-flowgraph/f04.rs
@@ -9,5 +9,5 @@
 // except according to those terms.
 
 pub fn pat_id_4() {
-    let _x = 4i;
+    let _x = 4is;
 }
diff --git a/src/test/run-make/graphviz-flowgraph/f05.rs b/src/test/run-make/graphviz-flowgraph/f05.rs
index b2591bdd08a..09a45c9bd21 100644
--- a/src/test/run-make/graphviz-flowgraph/f05.rs
+++ b/src/test/run-make/graphviz-flowgraph/f05.rs
@@ -9,5 +9,5 @@
 // except according to those terms.
 
 pub fn pat_tup_5() {
-    let (_x, _y) = (5i, 55i);
+    let (_x, _y) = (5is, 55is);
 }
diff --git a/src/test/run-make/graphviz-flowgraph/f06.rs b/src/test/run-make/graphviz-flowgraph/f06.rs
index c914409629c..538ef2af898 100644
--- a/src/test/run-make/graphviz-flowgraph/f06.rs
+++ b/src/test/run-make/graphviz-flowgraph/f06.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-struct S6 { val: int }
+struct S6 { val: isize }
 pub fn pat_struct_6() {
     let S6 { val: _x } = S6{ val: 6 };
 }
diff --git a/src/test/run-make/graphviz-flowgraph/f07.rs b/src/test/run-make/graphviz-flowgraph/f07.rs
index fb3f2d24cdd..8334f81c080 100644
--- a/src/test/run-make/graphviz-flowgraph/f07.rs
+++ b/src/test/run-make/graphviz-flowgraph/f07.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 pub fn pat_vec_7() {
-    match [7i, 77i, 777i, 7777i] {
+    match [7is, 77is, 777is, 7777is] {
         [x, y, ..] => x + y
     };
 }
diff --git a/src/test/run-make/graphviz-flowgraph/f08.rs b/src/test/run-make/graphviz-flowgraph/f08.rs
index 5d166e5ffcd..ad96f30073b 100644
--- a/src/test/run-make/graphviz-flowgraph/f08.rs
+++ b/src/test/run-make/graphviz-flowgraph/f08.rs
@@ -9,8 +9,8 @@
 // except according to those terms.
 
 pub fn expr_if_onearm_8() {
-    let x = 8i; let _y;
-    if x > 88i {
-        _y = 888i;
+    let x = 8is; let _y;
+    if x > 88is {
+        _y = 888is;
     }
 }
diff --git a/src/test/run-make/graphviz-flowgraph/f10.rs b/src/test/run-make/graphviz-flowgraph/f10.rs
index af263f0cf10..456f740d468 100644
--- a/src/test/run-make/graphviz-flowgraph/f10.rs
+++ b/src/test/run-make/graphviz-flowgraph/f10.rs
@@ -9,8 +9,8 @@
 // except according to those terms.
 
 pub fn expr_while_10() {
-    let mut x = 10i;
-    while x > 0i {
-        x -= 1i;
+    let mut x = 10is;
+    while x > 0is {
+        x -= 1is;
     }
 }
diff --git a/src/test/run-make/graphviz-flowgraph/f11.rs b/src/test/run-make/graphviz-flowgraph/f11.rs
index 95260c608ec..65262f249bc 100644
--- a/src/test/run-make/graphviz-flowgraph/f11.rs
+++ b/src/test/run-make/graphviz-flowgraph/f11.rs
@@ -10,9 +10,9 @@
 
 #[allow(unreachable_code)]
 pub fn expr_loop_11() {
-    let mut _x = 11i;
+    let mut _x = 11is;
     loop {
-        _x -= 1i;
+        _x -= 1is;
     }
     "unreachable";
 }
diff --git a/src/test/run-make/graphviz-flowgraph/f12.rs b/src/test/run-make/graphviz-flowgraph/f12.rs
index 625dd8cb03e..5651d73baff 100644
--- a/src/test/run-make/graphviz-flowgraph/f12.rs
+++ b/src/test/run-make/graphviz-flowgraph/f12.rs
@@ -10,9 +10,9 @@
 
 #[allow(unreachable_code)]
 pub fn expr_loop_12() {
-    let mut x = 12i;
+    let mut x = 12is;
     loop {
-        x -= 1i;
-        if x == 2i { break; "unreachable"; }
+        x -= 1is;
+        if x == 2is { break; "unreachable"; }
     }
 }
diff --git a/src/test/run-make/graphviz-flowgraph/f13.rs b/src/test/run-make/graphviz-flowgraph/f13.rs
index fdda50b4312..babb283c734 100644
--- a/src/test/run-make/graphviz-flowgraph/f13.rs
+++ b/src/test/run-make/graphviz-flowgraph/f13.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-enum E13 { E13a, E13b(int) }
+enum E13 { E13a, E13b(isize) }
 pub fn expr_match_13() {
     let x = E13::E13b(13); let _y;
     match x {
diff --git a/src/test/run-make/graphviz-flowgraph/f14.rs b/src/test/run-make/graphviz-flowgraph/f14.rs
index 72616f31594..adb7b193d16 100644
--- a/src/test/run-make/graphviz-flowgraph/f14.rs
+++ b/src/test/run-make/graphviz-flowgraph/f14.rs
@@ -10,8 +10,8 @@
 
 #[allow(unreachable_code)]
 pub fn expr_ret_14() {
-    let x = 14i;
-    if x > 1i {
+    let x = 14is;
+    if x > 1is {
         return;
         "unreachable";
     }
diff --git a/src/test/run-make/graphviz-flowgraph/f15.rs b/src/test/run-make/graphviz-flowgraph/f15.rs
index 62233dcb7d8..a1141eb6768 100644
--- a/src/test/run-make/graphviz-flowgraph/f15.rs
+++ b/src/test/run-make/graphviz-flowgraph/f15.rs
@@ -10,21 +10,21 @@
 
 #[allow(unreachable_code)]
 pub fn expr_break_label_15() {
-    let mut x = 15i;
-    let mut y = 151i;
+    let mut x = 15is;
+    let mut y = 151is;
     'outer: loop {
         'inner: loop {
-            if x == 1i {
+            if x == 1is {
                 break 'outer;
                 "unreachable";
             }
-            if y >= 2i {
+            if y >= 2is {
                 break;
                 "unreachable";
             }
-            y -= 3i;
+            y -= 3is;
         }
-        y -= 4i;
-        x -= 5i;
+        y -= 4is;
+        x -= 5is;
     }
 }
diff --git a/src/test/run-make/graphviz-flowgraph/f16.rs b/src/test/run-make/graphviz-flowgraph/f16.rs
index 2683d8bd06b..5d0e9f963a0 100644
--- a/src/test/run-make/graphviz-flowgraph/f16.rs
+++ b/src/test/run-make/graphviz-flowgraph/f16.rs
@@ -10,22 +10,22 @@
 
 #[allow(unreachable_code)]
 pub fn expr_continue_label_16() {
-    let mut x = 16i;
-    let mut y = 16i;
+    let mut x = 16is;
+    let mut y = 16is;
     'outer: loop {
         'inner: loop {
-            if x == 1i {
+            if x == 1is {
                 continue 'outer;
                 "unreachable";
             }
-            if y >= 1i {
+            if y >= 1is {
                 break;
                 "unreachable";
             }
-            y -= 1i;
+            y -= 1is;
         }
-        y -= 1i;
-        x -= 1i;
+        y -= 1is;
+        x -= 1is;
     }
     "unreachable";
 }
diff --git a/src/test/run-make/graphviz-flowgraph/f17.rs b/src/test/run-make/graphviz-flowgraph/f17.rs
index 23ce212c0af..de9b3bd5676 100644
--- a/src/test/run-make/graphviz-flowgraph/f17.rs
+++ b/src/test/run-make/graphviz-flowgraph/f17.rs
@@ -9,5 +9,5 @@
 // except according to those terms.
 
 pub fn expr_vec_17() {
-    let _v = [1i, 7i, 17i];
+    let _v = [1is, 7is, 17is];
 }
diff --git a/src/test/run-make/graphviz-flowgraph/f18.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f18.dot-expected.dot
index c4a39a519ed..78120e9009e 100644
--- a/src/test/run-make/graphviz-flowgraph/f18.dot-expected.dot
+++ b/src/test/run-make/graphviz-flowgraph/f18.dot-expected.dot
@@ -1,14 +1,14 @@
 digraph block {
     N0[label="entry"];
     N1[label="exit"];
-    N2[label="stmt fn inner(x: int) -> int { x + x }"];
+    N2[label="stmt fn inner(x: isize) -> isize { x + x }"];
     N3[label="expr inner"];
     N4[label="expr inner"];
     N5[label="expr 18"];
     N6[label="expr inner(18)"];
     N7[label="expr inner(inner(18))"];
     N8[label="stmt inner(inner(18));"];
-    N9[label="block {\l    fn inner(x: int) -> int { x + x }\l    inner(inner(18));\l}\l"];
+    N9[label="block {\l    fn inner(x: isize) -> isize { x + x }\l    inner(inner(18));\l}\l"];
     N0 -> N2;
     N2 -> N3;
     N3 -> N4;
diff --git a/src/test/run-make/graphviz-flowgraph/f18.rs b/src/test/run-make/graphviz-flowgraph/f18.rs
index 0ace542b8f5..cbf8aa5db43 100644
--- a/src/test/run-make/graphviz-flowgraph/f18.rs
+++ b/src/test/run-make/graphviz-flowgraph/f18.rs
@@ -9,6 +9,6 @@
 // except according to those terms.
 
 pub fn expr_call_18() {
-    fn inner(x:int) -> int { x + x }
+    fn inner(x:isize) -> isize { x + x }
     inner(inner(18));
 }
diff --git a/src/test/run-make/graphviz-flowgraph/f19.dot-expected.dot b/src/test/run-make/graphviz-flowgraph/f19.dot-expected.dot
index 8d21ef80917..4752eac3e28 100644
--- a/src/test/run-make/graphviz-flowgraph/f19.dot-expected.dot
+++ b/src/test/run-make/graphviz-flowgraph/f19.dot-expected.dot
@@ -1,7 +1,7 @@
 digraph block {
     N0[label="entry"];
     N1[label="exit"];
-    N2[label="stmt struct S19 {\l    x: int,\l}\l"];
+    N2[label="stmt struct S19 {\l    x: isize,\l}\l"];
     N3[label="stmt impl S19 {\l    fn inner(self) -> S19 { S19{x: self.x + self.x,} }\l}\l"];
     N4[label="expr 19"];
     N5[label="expr S19{x: 19,}"];
@@ -11,7 +11,7 @@ digraph block {
     N9[label="expr s.inner()"];
     N10[label="expr s.inner().inner()"];
     N11[label="stmt s.inner().inner();"];
-    N12[label="block {\l    struct S19 {\l        x: int,\l    }\l    impl S19 {\l        fn inner(self) -> S19 { S19{x: self.x + self.x,} }\l    }\l    let s = S19{x: 19,};\l    s.inner().inner();\l}\l"];
+    N12[label="block {\l    struct S19 {\l        x: isize,\l    }\l    impl S19 {\l        fn inner(self) -> S19 { S19{x: self.x + self.x,} }\l    }\l    let s = S19{x: 19,};\l    s.inner().inner();\l}\l"];
     N0 -> N2;
     N2 -> N3;
     N3 -> N4;
diff --git a/src/test/run-make/graphviz-flowgraph/f19.rs b/src/test/run-make/graphviz-flowgraph/f19.rs
index 092f6890a15..78c15dd64ad 100644
--- a/src/test/run-make/graphviz-flowgraph/f19.rs
+++ b/src/test/run-make/graphviz-flowgraph/f19.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 pub fn expr_method_call_19() {
-    struct S19 { x: int }
+    struct S19 { x: isize }
     impl S19 { fn inner(self) -> S19 { S19 { x: self.x + self.x } } }
     let s = S19 { x: 19 };
     s.inner().inner();
diff --git a/src/test/run-make/graphviz-flowgraph/f20.rs b/src/test/run-make/graphviz-flowgraph/f20.rs
index 7110ebe2b54..3ca55cb521b 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 = [2u, 0u, 20u];
-    v[20u];
+    let v = [2us, 0us, 20us];
+    v[20us];
 }
diff --git a/src/test/run-make/graphviz-flowgraph/f21.rs b/src/test/run-make/graphviz-flowgraph/f21.rs
index bff2da25061..25e93f65110 100644
--- a/src/test/run-make/graphviz-flowgraph/f21.rs
+++ b/src/test/run-make/graphviz-flowgraph/f21.rs
@@ -10,20 +10,20 @@
 
 #[allow(unreachable_code)]
 pub fn expr_break_label_21() {
-    let mut x = 15i;
-    let mut y = 151i;
+    let mut x = 15is;
+    let mut y = 151is;
     'outer: loop {
         'inner: loop {
-            if x == 1i {
+            if x == 1is {
                 break 'outer;
                 "unreachable";
             }
-            if y >= 2i {
+            if y >= 2is {
                 return;
                 "unreachable";
             }
-            y -= 3i;
-            x -= 5i;
+            y -= 3is;
+            x -= 5is;
         }
         "unreachable";
     }
diff --git a/src/test/run-make/graphviz-flowgraph/f22.rs b/src/test/run-make/graphviz-flowgraph/f22.rs
index a6e3d571deb..6de703a42f6 100644
--- a/src/test/run-make/graphviz-flowgraph/f22.rs
+++ b/src/test/run-make/graphviz-flowgraph/f22.rs
@@ -10,20 +10,20 @@
 
 #[allow(unreachable_code)]
 pub fn expr_break_label_21() {
-    let mut x = 15i;
-    let mut y = 151i;
+    let mut x = 15is;
+    let mut y = 151is;
     'outer: loop {
         'inner: loop {
-            if x == 1i {
+            if x == 1is {
                 continue 'outer;
                 "unreachable";
             }
-            if y >= 2i {
+            if y >= 2is {
                 return;
                 "unreachable";
             }
-            x -= 1i;
-            y -= 3i;
+            x -= 1is;
+            y -= 3is;
         }
         "unreachable";
     }
diff --git a/src/test/run-make/graphviz-flowgraph/f23.rs b/src/test/run-make/graphviz-flowgraph/f23.rs
index 73bcc288ca7..6ffa1838903 100644
--- a/src/test/run-make/graphviz-flowgraph/f23.rs
+++ b/src/test/run-make/graphviz-flowgraph/f23.rs
@@ -10,19 +10,19 @@
 
 #[allow(unreachable_code)]
 pub fn expr_while_23() {
-    let mut x = 23i;
-    let mut y = 23i;
-    let mut z = 23i;
+    let mut x = 23is;
+    let mut y = 23is;
+    let mut z = 23is;
 
-    while x > 0i {
-        x -= 1i;
+    while x > 0is {
+        x -= 1is;
 
-        while y > 0i {
-            y -= 1i;
+        while y > 0is {
+            y -= 1is;
 
-            while z > 0i { z -= 1i; }
+            while z > 0is { z -= 1is; }
 
-            if x > 10i {
+            if x > 10is {
                 return;
                 "unreachable";
             }
diff --git a/src/test/run-make/graphviz-flowgraph/f24.rs b/src/test/run-make/graphviz-flowgraph/f24.rs
index afba1d202c9..ebaf7f28101 100644
--- a/src/test/run-make/graphviz-flowgraph/f24.rs
+++ b/src/test/run-make/graphviz-flowgraph/f24.rs
@@ -10,24 +10,24 @@
 
 #[allow(unreachable_code)]
 pub fn expr_while_24() {
-    let mut x = 24i;
-    let mut y = 24i;
-    let mut z = 24i;
+    let mut x = 24is;
+    let mut y = 24is;
+    let mut z = 24is;
 
     loop {
-        if x == 0i { break; "unreachable"; }
-        x -= 1i;
+        if x == 0is { break; "unreachable"; }
+        x -= 1is;
 
         loop {
-            if y == 0i { break; "unreachable"; }
-            y -= 1i;
+            if y == 0is { break; "unreachable"; }
+            y -= 1is;
 
             loop {
-                if z == 0i { break; "unreachable"; }
-                z -= 1i;
+                if z == 0is { break; "unreachable"; }
+                z -= 1is;
             }
 
-            if x > 10i {
+            if x > 10is {
                 return;
                 "unreachable";
             }
diff --git a/src/test/run-make/graphviz-flowgraph/f25.rs b/src/test/run-make/graphviz-flowgraph/f25.rs
index 933f95f228c..8896a854787 100644
--- a/src/test/run-make/graphviz-flowgraph/f25.rs
+++ b/src/test/run-make/graphviz-flowgraph/f25.rs
@@ -10,24 +10,24 @@
 
 #[allow(unreachable_code)]
 pub fn expr_while_25() {
-    let mut x = 25i;
-    let mut y = 25i;
-    let mut z = 25i;
+    let mut x = 25is;
+    let mut y = 25is;
+    let mut z = 25is;
 
     'a: loop {
-        if x == 0i { break; "unreachable"; }
-        x -= 1i;
+        if x == 0is { break; "unreachable"; }
+        x -= 1is;
 
         'a: loop {
-            if y == 0i { break; "unreachable"; }
-            y -= 1i;
+            if y == 0is { break; "unreachable"; }
+            y -= 1is;
 
             'a: loop {
-                if z == 0i { break; "unreachable"; }
-                z -= 1i;
+                if z == 0is { break; "unreachable"; }
+                z -= 1is;
             }
 
-            if x > 10i {
+            if x > 10is {
                 continue 'a;
                 "unreachable";
             }