---

steveklabnik · steveklabnik · commit e3b44a09bcf8 · 2014-07-20T04:57:49.000-07:00
yaml --- r: 125693 b: refs/heads/try c: 343a52f h: refs/heads/master i: 125691: 0c63c23 v: v3
diff --git a/[refs] b/[refs]
@@ -2,7 +2,7 @@
 refs/heads/master: f2fa55903e378368ed9173560f03a0ef16e371c2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 9fc8394d3bce22ab483f98842434c84c396212ae
-refs/heads/try: 4f55b52b1ad9f24c91864ed261b9629c08a46086
+refs/heads/try: 343a52f6b5e567516abeb2af500ed8933dcb6085
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
diff --git a/branches/try/src/test/compile-fail/lifetime-elision-return-type-requires-explicit-lifetime.rs b/branches/try/src/test/compile-fail/lifetime-elision-return-type-requires-explicit-lifetime.rs
@@ -22,7 +22,7 @@ struct Foo<'a> {
     x: &'a int,
 }
 
-// Lifetime annotation needed because we have two lifetime: one as a parameter
+// Lifetime annotation needed because we have two lifetimes: one as a parameter
 // and one on the reference.
 fn h(_: &Foo) -> &int { //~ ERROR missing lifetime specifier
     fail!()

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ struct Foo<'a> {`
`22`	`22`	`x: &'a int,`
`23`	`23`	`}`
`24`	`24`
`25`		`-// Lifetime annotation needed because we have two lifetime: one as a parameter`
	`25`	`+// Lifetime annotation needed because we have two lifetimes: one as a parameter`
`26`	`26`	`// and one on the reference.`
`27`	`27`	`fn h(_: &Foo) -> &int { //~ ERROR missing lifetime specifier`
`28`	`28`	`fail!()`