---

nikomatsakis · nikomatsakis · commit 3e66f9db285c · 2014-11-07T15:51:30.000-05:00
yaml --- r: 158924 b: refs/heads/master c: 3112771 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 244231720d29db856c5a28c0dda6c2efd7c9219a
+refs/heads/master: 3112771001e0e7e9b068ba0bb0ca45c3e8f0f72a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: f89e975685a3a9f258c996865cdd144a0f30f83c
 refs/heads/try: f58aad6dce273570fb130b4df008ef9acd5a5be2
diff --git a/trunk/src/test/compile-fail/regions-name-duplicated.rs b/trunk/src/test/compile-fail/regions-name-duplicated.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 struct Foo<'a, 'a> { //~ ERROR lifetime name `'a` declared twice
-//~^ ERROR lifetime name `'a` declared twice
     x: &'a int
 }
 
diff --git a/trunk/src/test/compile-fail/regions-name-static.rs b/trunk/src/test/compile-fail/regions-name-static.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 struct Foo<'static> { //~ ERROR illegal lifetime parameter name: `'static`
-//~^ ERROR illegal lifetime parameter name: `'static`
     x: &'static int
 }
 

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`	`// except according to those terms.`
`10`	`10`
`11`	`11`	struct Foo<'a, 'a> { //~ ERROR lifetime name `'a` declared twice
`12`		-//~^ ERROR lifetime name `'a` declared twice
`13`	`12`	`x: &'a int`
`14`	`13`	`}`
`15`	`14`