about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNiko Matsakis <niko@alum.mit.edu>2015-01-08 10:56:56 -0500
committerNiko Matsakis <niko@alum.mit.edu>2015-01-08 11:02:24 -0500
commitbf43e8315ec8ccc821c550e7367950a538bd6c9c (patch)
treed34a0bc59d6ab586bb2f77da7cbe5fdc316fd867
parent20744c6b855956eb3d39f5afda332480546f9e28 (diff)
downloadrust-bf43e8315ec8ccc821c550e7367950a538bd6c9c.tar.gz
rust-bf43e8315ec8ccc821c550e7367950a538bd6c9c.zip
Modify lifetime-infereence-give-expl-lifetime-param-3 to use a shorter
type name so that messages do not wrap.
-rw-r--r--src/test/compile-fail/lifetime-inference-give-expl-lifetime-param-3.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/test/compile-fail/lifetime-inference-give-expl-lifetime-param-3.rs b/src/test/compile-fail/lifetime-inference-give-expl-lifetime-param-3.rs
index 18ef30f5b28..04c5b223cb8 100644
--- a/src/test/compile-fail/lifetime-inference-give-expl-lifetime-param-3.rs
+++ b/src/test/compile-fail/lifetime-inference-give-expl-lifetime-param-3.rs
@@ -10,17 +10,17 @@
 
 // ignore-tidy-linelength
 
-struct Bar<'x, 'y, 'z> { bar: &'y isize, baz: isize }
-fn bar1<'a>(x: &Bar) -> (&'a isize, &'a isize, &'a isize) {
-//~^ HELP: consider using an explicit lifetime parameter as shown: fn bar1<'b, 'c, 'a>(x: &'a Bar<'b, 'a, 'c>) -> (&'a isize, &'a isize, &'a isize)
+struct Bar<'x, 'y, 'z> { bar: &'y i32, baz: i32 }
+fn bar1<'a>(x: &Bar) -> (&'a i32, &'a i32, &'a i32) {
+//~^ HELP: consider using an explicit lifetime parameter as shown: fn bar1<'b, 'c, 'a>(x: &'a Bar<'b, 'a, 'c>) -> (&'a i32, &'a i32, &'a i32)
     (x.bar, &x.baz, &x.baz)
     //~^ ERROR: cannot infer
     //~^^ ERROR: cannot infer
     //~^^^ ERROR: cannot infer
 }
 
-fn bar2<'a, 'b, 'c>(x: &Bar<'a, 'b, 'c>) -> (&'a isize, &'a isize, &'a isize) {
-//~^ HELP: consider using an explicit lifetime parameter as shown: fn bar2<'a, 'c>(x: &'a Bar<'a, 'a, 'c>) -> (&'a isize, &'a isize, &'a isize)
+fn bar2<'a, 'b, 'c>(x: &Bar<'a, 'b, 'c>) -> (&'a i32, &'a i32, &'a i32) {
+//~^ HELP: consider using an explicit lifetime parameter as shown: fn bar2<'a, 'c>(x: &'a Bar<'a, 'a, 'c>) -> (&'a i32, &'a i32, &'a i32)
     (x.bar, &x.baz, &x.baz)
     //~^ ERROR: cannot infer
     //~^^ ERROR: cannot infer