---

Ariel Ben-Yehuda · Ariel Ben-Yehuda · commit 3e6c916a47fe · 2015-05-27T20:31:56.000+03:00
yaml --- r: 225322 b: refs/heads/stable c: c68e652 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -29,6 +29,6 @@ refs/heads/tmp: e5d90d98402475b6e154ce216f9efcb80da1a747
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: 1fe32ca12c51afcd761d9962f51a74ff0d07a591
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: 65a3245319405e4dd53f10abdbc042502d184c93
+refs/heads/stable: c68e65251c86ffdb21aecec56ec45e303d952d79
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
diff --git a/branches/stable/src/test/compile-fail/assoc-inherent.rs b/branches/stable/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/stable/src/test/compile-fail/issue-22673.rs b/branches/stable/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() {}`