---

Ariel Ben-Yehuda · Ariel Ben-Yehuda · commit 9e1b5de4f3b8 · 2015-05-27T20:31:56.000+03:00
yaml --- r: 218742 b: refs/heads/snap-stage3 c: c68e652 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,6 +1,6 @@
 ---
 refs/heads/master: c044791d80ea0dc5c4b57b6030a67b69f8510239
-refs/heads/snap-stage3: 65a3245319405e4dd53f10abdbc042502d184c93
+refs/heads/snap-stage3: c68e65251c86ffdb21aecec56ec45e303d952d79
 refs/heads/try: b53c0f93eedcdedd4fd89bccc5a3a09d1c5cd23e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
diff --git a/branches/snap-stage3/src/test/compile-fail/assoc-inherent.rs b/branches/snap-stage3/src/test/compile-fail/assoc-inherent.rs
@@ -13,7 +13,7 @@
 struct Foo;
 
 impl Foo {
-    type Bar = isize; //~ERROR associated items are not allowed in inherent impls
+    type Bar = isize; //~ERROR associated types are not allowed in inherent impls
 }
 
 fn main() {}
diff --git a/branches/snap-stage3/src/test/compile-fail/issue-22673.rs b/branches/snap-stage3/src/test/compile-fail/issue-22673.rs
@@ -10,7 +10,7 @@
 
 trait Expr : PartialEq<Self::Item> {
     //~^ ERROR: unsupported cyclic reference between types/traits detected
-    type Item = Expr;
+    type Item;
 }
 
 fn main() {}

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`struct Foo;`
`14`	`14`
`15`	`15`	`impl Foo {`
`16`		`- type Bar = isize; //~ERROR associated items are not allowed in inherent impls`
	`16`	`+ type Bar = isize; //~ERROR associated types are not allowed in inherent impls`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`fn main() {}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`
`11`	`11`	`trait Expr : PartialEq<Self::Item> {`
`12`	`12`	`//~^ ERROR: unsupported cyclic reference between types/traits detected`
`13`		`- type Item = Expr;`
	`13`	`+ type Item;`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`fn main() {}`