---

nikomatsakis · nikomatsakis · commit 8c70f150037b · 2016-03-25T15:14:45.000-04:00
yaml --- r: 271571 b: refs/heads/auto c: 2536ae5 h: refs/heads/master i: 271569: faa408b 271567: a8b7dc0
diff --git a/[refs] b/[refs]
@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 944dc4aa654633c0b027fa6fe30f5ed0690a73b9
+refs/heads/auto: 2536ae55a4fe3bb9d96ddd53e790631e76a6a11b
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
 refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1
diff --git a/branches/auto/src/test/compile-fail/rfc1445/match-forbidden-without-eq.rs b/branches/auto/src/test/compile-fail/rfc1445/match-forbidden-without-eq.rs
@@ -24,7 +24,7 @@ fn main() {
     let y = Foo { x: 1 };
     match y {
         FOO => { }
-        //~^ ERROR must be annotated with `#[derive(Eq)]`
+        //~^ ERROR must be annotated with `#[derive(PartialEq, Eq)]`
         //~| WARNING will become a hard error
         _ => { }
     }

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ fn main() {`
`24`	`24`	`let y = Foo { x: 1 };`
`25`	`25`	`match y {`
`26`	`26`	`FOO => { }`
`27`		- //~^ ERROR must be annotated with `#[derive(Eq)]`
	`27`	+ //~^ ERROR must be annotated with `#[derive(PartialEq, Eq)]`
`28`	`28`	`//~\| WARNING will become a hard error`
`29`	`29`	`_ => { }`
`30`	`30`	`}`