---

nikomatsakis · nikomatsakis · commit 951ee3effcf1 · 2014-10-17T08:04:34.000-04:00
yaml --- r: 156399 b: refs/heads/snap-stage3 c: f4a7d32 h: refs/heads/master i: 156397: 5f0bfce 156395: f136cac 156391: 66e4d36 156383: ebcb839 v: v3
diff --git a/[refs] b/[refs]
@@ -1,7 +1,7 @@
 ---
 refs/heads/master: c29a7520e7fb4a5b4d4eccfc594e05793ef6688d
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 590a61f788e058d7ae95806f55258bce3ae45567
+refs/heads/snap-stage3: f4a7d32c8b53649d20735c8a90469b08fe7cc3dc
 refs/heads/try: 6601b0501e31d08d3892a2d5a7d8a57ab120bf75
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
diff --git a/branches/snap-stage3/src/test/compile-fail/type-params-in-different-spaces-2.rs b/branches/snap-stage3/src/test/compile-fail/type-params-in-different-spaces-2.rs
@@ -8,28 +8,25 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// Test static calls to make sure that we align the Self and input
+// type parameters on a trait correctly.
+
 trait Tr<T> {
     fn op(T) -> Self;
 }
 
-// these compile as if Self: Tr<U>, even tho only Self: Tr<Self or T>
 trait A:    Tr<Self> {
     fn test<U>(u: U) -> Self {
         Tr::op(u)   //~ ERROR not implemented
     }
 }
+
 trait B<T>: Tr<T> {
     fn test<U>(u: U) -> Self {
         Tr::op(u)   //~ ERROR not implemented
     }
 }
 
-impl<T> Tr<T> for T {
-    fn op(t: T) -> T { t }
-}
-impl<T> A for T {}
-
 fn main() {
-    std::io::println(A::test((&7306634593706211700, 8)));
 }
 

Original file line number	Diff line number	Diff line change
`@@ -8,28 +8,25 @@`
`8`	`8`	`// option. This file may not be copied, modified, or distributed`
`9`	`9`	`// except according to those terms.`
`10`	`10`
	`11`	`+// Test static calls to make sure that we align the Self and input`
	`12`	`+// type parameters on a trait correctly.`
	`13`	`+`
`11`	`14`	`trait Tr<T> {`
`12`	`15`	`fn op(T) -> Self;`
`13`	`16`	`}`
`14`	`17`
`15`		`-// these compile as if Self: Tr<U>, even tho only Self: Tr<Self or T>`
`16`	`18`	`trait A: Tr<Self> {`
`17`	`19`	`fn test<U>(u: U) -> Self {`
`18`	`20`	`Tr::op(u) //~ ERROR not implemented`
`19`	`21`	`}`
`20`	`22`	`}`
	`23`	`+`
`21`	`24`	`trait B<T>: Tr<T> {`
`22`	`25`	`fn test<U>(u: U) -> Self {`
`23`	`26`	`Tr::op(u) //~ ERROR not implemented`
`24`	`27`	`}`
`25`	`28`	`}`
`26`	`29`
`27`		`-impl<T> Tr<T> for T {`
`28`		`- fn op(t: T) -> T { t }`
`29`		`-}`
`30`		`-impl<T> A for T {}`
`31`		`-`
`32`	`30`	`fn main() {`
`33`		`- std::io::println(A::test((&7306634593706211700, 8)));`
`34`	`31`	`}`
`35`	`32`