---

pcwalton · pcwalton · commit 5ad483deda63 · 2013-03-26T23:31:56.000-07:00
yaml --- r: 51022 b: refs/heads/try c: 2888563 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -2,7 +2,7 @@
 refs/heads/master: 5f13e9ccc2e3328d4cd8ca49f84e6840dd998346
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: f7a2371c176663d59062ec5158f39faecba45768
-refs/heads/try: b07b36bbf30c9b7c9120e34b518d47244e981019
+refs/heads/try: 28885635108c6def3c2503cbcaeba90fbd011f90
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
diff --git a/branches/try/src/test/compile-fail/regions-in-structs.rs b/branches/try/src/test/compile-fail/regions-in-structs.rs
@@ -17,7 +17,7 @@ struct yes1<'self> {
 }
 
 struct yes2<'self> {
-  x: &'foo uint, //~ ERROR Illegal lifetime 'foo: this lifetime must be declared
+  x: &'foo uint, //~ ERROR Illegal lifetime 'foo: only 'self is allowed
 }
 
 fn main() {}

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ struct yes1<'self> {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`struct yes2<'self> {`
`20`		`- x: &'foo uint, //~ ERROR Illegal lifetime 'foo: this lifetime must be declared`
	`20`	`+ x: &'foo uint, //~ ERROR Illegal lifetime 'foo: only 'self is allowed`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`fn main() {}`