auto merge of #16956 : nick29581/rust/unsized-test-1, r=alexcrichton

bors · bors · commit 8a8986776d16 · 2014-09-03T14:11:09.000Z
I landed this disabled, but it now passes since @pcwalton implemented RFC 11 r?
diff --git a/src/test/compile-fail/unsized3.rs b/src/test/compile-fail/unsized3.rs
@@ -68,14 +68,15 @@ impl<Sized? X: T> T1<X> for S3<X> { //ERROR instantiating a type parameter with
 trait T2<Z> {
 }
 impl<Sized? X> T2<X> for S3<X> { //ERROR instantiating a type parameter with an incompatible type `X
+*/
 
 // impl - struct
 trait T3<Sized? Z> {
 }
 struct S4<Y>;
-impl<Sized? X> T3<X> for S4<X> { //ERROR instantiating a type parameter with an incompatible type `X
+impl<Sized? X> T3<X> for S4<X> { //~ ERROR instantiating a type parameter with an incompatible type
 }
-*/
+
 
 pub fn main() {
 }

Original file line number	Diff line number	Diff line change
`@@ -68,14 +68,15 @@ impl<Sized? X: T> T1<X> for S3<X> { //ERROR instantiating a type parameter with`
`68`	`68`	`trait T2<Z> {`
`69`	`69`	`}`
`70`	`70`	impl<Sized? X> T2<X> for S3<X> { //ERROR instantiating a type parameter with an incompatible type `X
	`71`	`+*/`
`71`	`72`
`72`	`73`	`// impl - struct`
`73`	`74`	`trait T3<Sized? Z> {`
`74`	`75`	`}`
`75`	`76`	`struct S4<Y>;`
`76`		-impl<Sized? X> T3<X> for S4<X> { //ERROR instantiating a type parameter with an incompatible type `X
	`77`	`+impl<Sized? X> T3<X> for S4<X> { //~ ERROR instantiating a type parameter with an incompatible type`
`77`	`78`	`}`
`78`		`-*/`
	`79`	`+`
`79`	`80`
`80`	`81`	`pub fn main() {`
`81`	`82`	`}`