auto merge of #20760 : alexcrichton/rust/rollup, r=alexcrichton

1 files changed, 3 insertions, 3 deletions

diff --git a/src/test/compile-fail/trait-impl-method-mismatch.rs b/src/test/compile-fail/trait-impl-method-mismatch.rs
index 73224c7b45c..4e2eb224213 100644
--- a/src/test/compile-fail/trait-impl-method-mismatch.rs
+++ b/src/test/compile-fail/trait-impl-method-mismatch.rs
@@ -10,12 +10,12 @@
 
 
 trait Mumbo {
-    fn jumbo(&self, x: &uint) -> uint;
+    fn jumbo(&self, x: &usize) -> usize;
 }
 
-impl Mumbo for uint {
+impl Mumbo for usize {
     // Cannot have a larger effect than the trait:
-    unsafe fn jumbo(&self, x: &uint) { *self + *x; }
+    unsafe fn jumbo(&self, x: &usize) { *self + *x; }
     //~^ ERROR expected normal fn, found unsafe fn
 }