Update compile fail tests to use usize.

Author: huonw

src/test/compile-fail/assign-to-method.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 struct cat {
-  meows : uint,
+  meows : usize,
 
   how_hungry : isize,
 }
@@ -18,7 +18,7 @@ impl cat {
     pub fn speak(&self) { self.meows += 1u; }
 }
 
-fn cat(in_x : uint, in_y : isize) -> cat {
+fn cat(in_x : usize, in_y : isize) -> cat {
     cat {
         meows: in_x,
         how_hungry: in_y

src/test/compile-fail/associated-types-eq-2.rs

@@ -19,8 +19,8 @@ pub trait Foo {
 struct Bar;
 
 impl Foo for isize {
-    type A = uint;
-    fn boo(&self) -> uint { 42 }
+    type A = usize;
+    fn boo(&self) -> usize { 42 }
 }
 
 fn baz<I: Foo>(x: &<I as Foo<A=Bar>>::A) {}

src/test/compile-fail/associated-types-eq-3.rs

@@ -19,8 +19,8 @@ pub trait Foo {
 struct Bar;
 
 impl Foo for isize {
-    type A = uint;
-    fn boo(&self) -> uint {
+    type A = usize;
+    fn boo(&self) -> usize {
         42
     }
 }

src/test/compile-fail/associated-types-eq-expr-path.rs

@@ -16,11 +16,11 @@ trait Foo {
 }
 
 impl Foo for isize {
-    type A = uint;
+    type A = usize;
     fn bar() -> isize { 42 }
 }
 
 pub fn main() {
-    let x: isize = Foo::<A=uint>::bar();
+    let x: isize = Foo::<A=usize>::bar();
     //~^ERROR unexpected binding of associated item in expression path
 }

src/test/compile-fail/associated-types-eq-hr.rs

@@ -33,9 +33,9 @@ struct UintStruct {
 }
 
 impl<'a> TheTrait<&'a isize> for UintStruct {
-    type A = &'a uint;
+    type A = &'a usize;
 
-    fn get(&self, t: &'a isize) -> &'a uint {
+    fn get(&self, t: &'a isize) -> &'a usize {
         panic!()
     }
 }
@@ -47,7 +47,7 @@ fn foo<T>()
 }
 
 fn bar<T>()
-    where T : for<'x> TheTrait<&'x isize, A = &'x uint>
+    where T : for<'x> TheTrait<&'x isize, A = &'x usize>
 {
     // ok for UintStruct, but not IntStruct
 }

src/test/compile-fail/associated-types-incomplete-object.rs

@@ -20,17 +20,17 @@ pub trait Foo {
 struct Bar;
 
 impl Foo for isize {
-    type A = uint;
+    type A = usize;
     type B = char;
-    fn boo(&self) -> uint {
+    fn boo(&self) -> usize {
         42
     }
 }
 
 pub fn main() {
-    let a = &42i as &Foo<A=uint, B=char>;
+    let a = &42i as &Foo<A=usize, B=char>;
 
-    let b = &42i as &Foo<A=uint>;
+    let b = &42i as &Foo<A=usize>;
     //~^ ERROR the value of the associated type `B` (from the trait `Foo`) must be specified
 
     let c = &42i as &Foo<B=char>;

src/test/compile-fail/associated-types-path-2.rs

@@ -15,7 +15,7 @@ pub trait Foo {
 }
 
 impl Foo for isize {
-    type A = uint;
+    type A = usize;
 }
 
 pub fn f1<T: Foo>(a: T, x: T::A) {}

src/test/compile-fail/associated-types-unconstrained.rs

@@ -16,7 +16,7 @@ trait Foo {
 }
 
 impl Foo for isize {
-    type A = uint;
+    type A = usize;
     fn bar() -> isize { 42 }
 }
 

src/test/compile-fail/bad-bang-ann-3.rs

@@ -10,7 +10,7 @@
 
 // Tests that a function with a ! annotation always actually fails
 
-fn bad_bang(i: uint) -> ! {
+fn bad_bang(i: usize) -> ! {
     return 7u; //~ ERROR `return` in a function declared as diverging [E0166]
 }
 

src/test/compile-fail/bad-bang-ann.rs

@@ -10,7 +10,7 @@
 
 // Tests that a function with a ! annotation always actually fails
 
-fn bad_bang(i: uint) -> ! { //~ ERROR computation may converge in a function marked as diverging
+fn bad_bang(i: usize) -> ! { //~ ERROR computation may converge in a function marked as diverging
     if i < 0u { } else { panic!(); }
 }
 

src/test/compile-fail/bad-method-typaram-kind.rs

@@ -16,7 +16,7 @@ trait bar {
     fn bar<T:Send>(&self);
 }
 
-impl bar for uint {
+impl bar for usize {
     fn bar<T:Send>(&self) {
     }
 }

src/test/compile-fail/borrow-immutable-upvar-mutation.rs

@@ -13,7 +13,7 @@
 // Tests that we can't assign to or mutably borrow upvars from `Fn`
 // closures (issue #17780)
 
-fn set(x: &mut uint) { *x = 5; }
+fn set(x: &mut usize) { *x = 5; }
 
 fn main() {
     // By-ref captures

src/test/compile-fail/borrowck-anon-fields-struct.rs

@@ -11,7 +11,7 @@
 // Tests that we are able to distinguish when loans borrow different
 // anonymous fields of a tuple vs the same anonymous field.
 
-struct Y(uint, uint);
+struct Y(usize, usize);
 
 fn distinct_variant() {
     let mut y = Y(1, 2);

src/test/compile-fail/borrowck-anon-fields-variant.rs

@@ -12,7 +12,7 @@
 // anonymous fields of an enum variant vs the same anonymous field.
 
 enum Foo {
-    X, Y(uint, uint)
+    X, Y(usize, usize)
 }
 
 fn distinct_variant() {

src/test/compile-fail/borrowck-autoref-3261.rs

@@ -10,10 +10,10 @@
 
 enum Either<T, U> { Left(T), Right(U) }
 
-struct X(Either<(uint,uint), fn()>);
+struct X(Either<(usize,usize), fn()>);
 
 impl X {
-    pub fn with<F>(&self, blk: F) where F: FnOnce(&Either<(uint, uint), fn()>) {
+    pub fn with<F>(&self, blk: F) where F: FnOnce(&Either<(usize, usize), fn()>) {
         let X(ref e) = *self;
         blk(e)
     }

src/test/compile-fail/borrowck-bad-nested-calls-free.rs

@@ -13,12 +13,12 @@
 
 #![feature(box_syntax)]
 
-fn rewrite(v: &mut Box<uint>) -> uint {
+fn rewrite(v: &mut Box<usize>) -> usize {
     *v = box 22;
     **v
 }
 
-fn add(v: &uint, w: uint) -> uint {
+fn add(v: &usize, w: usize) -> usize {
     *v + w
 }
 

src/test/compile-fail/borrowck-bad-nested-calls-move.rs

@@ -13,12 +13,12 @@
 
 #![feature(box_syntax)]
 
-fn rewrite(v: &mut Box<uint>) -> uint {
+fn rewrite(v: &mut Box<usize>) -> usize {
     *v = box 22;
     **v
 }
 
-fn add(v: &uint, w: Box<uint>) -> uint {
+fn add(v: &usize, w: Box<usize>) -> usize {
     *v + *w
 }
 

src/test/compile-fail/borrowck-borrowed-uniq-rvalue.rs

@@ -16,7 +16,7 @@ extern crate collections;
 use std::collections::HashMap;
 
 fn main() {
-    let mut buggy_map: HashMap<uint, &uint> = HashMap::new();
+    let mut buggy_map: HashMap<usize, &usize> = HashMap::new();
     buggy_map.insert(42, &*box 1); //~ ERROR borrowed value does not live long enough
 
     // but it is ok if we use a temporary

src/test/compile-fail/borrowck-lend-flow-loop.rs

@@ -113,8 +113,8 @@ fn while_aliased_mut_cond(cond: bool, cond2: bool) {
     }
 }
 
-fn loop_break_pops_scopes<'r, F>(_v: &'r mut [uint], mut f: F) where
-    F: FnMut(&'r mut uint) -> bool,
+fn loop_break_pops_scopes<'r, F>(_v: &'r mut [usize], mut f: F) where
+    F: FnMut(&'r mut usize) -> bool,
 {
     // Here we check that when you break out of an inner loop, the
     // borrows that go out of scope as you exit the inner loop are
@@ -123,21 +123,21 @@ fn loop_break_pops_scopes<'r, F>(_v: &'r mut [uint], mut f: F) where
     while cond() {
         while cond() {
             // this borrow is limited to the scope of `r`...
-            let r: &'r mut uint = produce();
+            let r: &'r mut usize = produce();
             if !f(&mut *r) {
                 break; // ...so it is not live as exit the `while` loop here
             }
         }
     }
 }
 
-fn loop_loop_pops_scopes<'r, F>(_v: &'r mut [uint], mut f: F) where F: FnMut(&'r mut uint) -> bool {
+fn loop_loop_pops_scopes<'r, F>(_v: &'r mut [usize], mut f: F) where F: FnMut(&'r mut usize) -> bool {
     // Similar to `loop_break_pops_scopes` but for the `loop` keyword
 
     while cond() {
         while cond() {
             // this borrow is limited to the scope of `r`...
-            let r: &'r mut uint = produce();
+            let r: &'r mut usize = produce();
             if !f(&mut *r) {
                 continue; // ...so it is not live as exit (and re-enter) the `while` loop here
             }

src/test/compile-fail/borrowck-loan-in-overloaded-op.rs

@@ -13,7 +13,7 @@
 use std::ops::Add;
 
 #[derive(Clone)]
-struct foo(Box<uint>);
+struct foo(Box<usize>);
 
 impl Add for foo {
     type Output = foo;

src/test/compile-fail/borrowck-overloaded-call.rs

@@ -38,8 +38,8 @@ struct SFnOnce {
     x: String,
 }
 
-impl FnOnce<(String,),uint> for SFnOnce {
-    extern "rust-call" fn call_once(self, (z,): (String,)) -> uint {
+impl FnOnce<(String,),usize> for SFnOnce {
+    extern "rust-call" fn call_once(self, (z,): (String,)) -> usize {
         self.x.len() + z.len()
     }
 }

src/test/compile-fail/borrowck-overloaded-index-2.rs

@@ -16,10 +16,10 @@ struct MyVec<T> {
     data: Vec<T>,
 }
 
-impl<T> Index<uint> for MyVec<T> {
+impl<T> Index<usize> for MyVec<T> {
     type Output = T;
 
-    fn index(&self, &i: &uint) -> &T {
+    fn index(&self, &i: &usize) -> &T {
         &self.data[i]
     }
 }

src/test/compile-fail/class-cast-to-trait.rs

@@ -15,7 +15,7 @@ trait noisy {
 }
 
 struct cat {
-  meows : uint,
+  meows : usize,
 
   how_hungry : isize,
   name : String,
@@ -50,7 +50,7 @@ impl cat {
     }
 }
 
-fn cat(in_x : uint, in_y : isize, in_name: String) -> cat {
+fn cat(in_x : usize, in_y : isize, in_name: String) -> cat {
     cat {
         meows: in_x,
         how_hungry: in_y,

src/test/compile-fail/class-implements-bad-trait.rs

@@ -10,8 +10,8 @@
 
 // error-pattern:nonexistent
 class cat : nonexistent {
-  let meows: uint;
-  new(in_x : uint) { self.meows = in_x; }
+  let meows: usize;
+  new(in_x : usize) { self.meows = in_x; }
 }
 
 fn main() {

src/test/compile-fail/class-method-missing.rs

@@ -13,14 +13,14 @@ trait animal {
 }
 
 struct cat {
-  meows: uint,
+  meows: usize,
 }
 
 impl animal for cat {
     //~^ ERROR not all trait items implemented, missing: `eat`
 }
 
-fn cat(in_x : uint) -> cat {
+fn cat(in_x : usize) -> cat {
     cat {
         meows: in_x
     }

src/test/compile-fail/class-missing-self.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 struct cat {
-  meows : uint,
+  meows : usize,
 }
 
 impl cat {

src/test/compile-fail/coherence-blanket-conflicts-with-blanket-implemented.rs

@@ -16,7 +16,7 @@ use std::default::Default;
 // for the same type (though this crate doesn't).
 
 trait MyTrait {
-    fn get(&self) -> uint;
+    fn get(&self) -> usize;
 }
 
 trait Even { }
@@ -25,14 +25,14 @@ trait Odd { }
 
 impl Even for isize { }
 
-impl Odd for uint { }
+impl Odd for usize { }
 
 impl<T:Even> MyTrait for T { //~ ERROR E0119
-    fn get(&self) -> uint { 0 }
+    fn get(&self) -> usize { 0 }
 }
 
 impl<T:Odd> MyTrait for T {
-    fn get(&self) -> uint { 0 }
+    fn get(&self) -> usize { 0 }
 }
 
 fn main() { }

src/test/compile-fail/coherence-blanket-conflicts-with-blanket-unimplemented.rs

@@ -16,19 +16,19 @@ use std::default::Default;
 // for the same type (though this crate doesn't implement them at all).
 
 trait MyTrait {
-    fn get(&self) -> uint;
+    fn get(&self) -> usize;
 }
 
 trait Even { }
 
 trait Odd { }
 
 impl<T:Even> MyTrait for T { //~ ERROR E0119
-    fn get(&self) -> uint { 0 }
+    fn get(&self) -> usize { 0 }
 }
 
 impl<T:Odd> MyTrait for T {
-    fn get(&self) -> uint { 0 }
+    fn get(&self) -> usize { 0 }
 }
 
 fn main() { }