---

Ariel Ben-Yehuda · Ariel Ben-Yehuda · commit 8fc80f9ce459 · 2015-05-27T20:31:56.000+03:00
yaml --- r: 211397 b: refs/heads/tmp c: c68e652 h: refs/heads/master i: 211395: 39c7b66 v: v3
diff --git a/[refs] b/[refs]
@@ -32,7 +32,7 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
 refs/heads/beta: 2d00dc3b85aaf81caa3a4e5764c5e185a4dd0a7c
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
-refs/heads/tmp: 65a3245319405e4dd53f10abdbc042502d184c93
+refs/heads/tmp: c68e65251c86ffdb21aecec56ec45e303d952d79
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: 704c2ee730d2e948d11a2edd77e3f35de8329a6e
 refs/heads/gate: 97c84447b65164731087ea82685580cc81424412
diff --git a/branches/tmp/src/test/compile-fail/assoc-inherent.rs b/branches/tmp/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/tmp/src/test/compile-fail/issue-22673.rs b/branches/tmp/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() {}`