rollup merge of #20754: nikomatsakis/int-feature

Conflicts:
	src/test/compile-fail/borrowck-move-out-of-overloaded-auto-deref.rs
	src/test/compile-fail/issue-2590.rs
	src/test/compile-fail/lint-stability.rs
	src/test/compile-fail/slice-mut-2.rs
	src/test/compile-fail/std-uncopyable-atomics.rs

1 files changed, 3 insertions, 3 deletions

diff --git a/src/test/compile-fail/class-method-missing.rs b/src/test/compile-fail/class-method-missing.rs
index 17cf36b73f6..3b921e07279 100644
--- a/src/test/compile-fail/class-method-missing.rs
+++ b/src/test/compile-fail/class-method-missing.rs
@@ -13,19 +13,19 @@ 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
     }
 }
 
 fn main() {
-  let nyan = cat(0u);
+  let nyan = cat(0us);
 }