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

1 files changed, 6 insertions, 6 deletions

diff --git a/src/test/compile-fail/trait-impl-of-supertrait-has-wrong-lifetime-parameters.rs b/src/test/compile-fail/trait-impl-of-supertrait-has-wrong-lifetime-parameters.rs
index 716362415a6..44c53e70f86 100644
--- a/src/test/compile-fail/trait-impl-of-supertrait-has-wrong-lifetime-parameters.rs
+++ b/src/test/compile-fail/trait-impl-of-supertrait-has-wrong-lifetime-parameters.rs
@@ -13,26 +13,26 @@
 // an impl of T1<'a>, but we have an impl of T1<'b>.
 
 trait T1<'x> {
-    fn x(&self) -> &'x int;
+    fn x(&self) -> &'x isize;
 }
 
 trait T2<'x, 'y> : T1<'x> {
-    fn y(&self) -> &'y int;
+    fn y(&self) -> &'y isize;
 }
 
 struct S<'a, 'b> {
-    a: &'a int,
-    b: &'b int
+    a: &'a isize,
+    b: &'b isize
 }
 
 impl<'a,'b> T1<'b> for S<'a, 'b> {
-    fn x(&self) -> &'b int {
+    fn x(&self) -> &'b isize {
         self.b
     }
 }
 
 impl<'a,'b> T2<'a, 'b> for S<'a, 'b> { //~ ERROR cannot infer an appropriate lifetime
-    fn y(&self) -> &'b int {
+    fn y(&self) -> &'b isize {
         self.b
     }
 }