about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-09-03 14:11:09 +0000
committerbors <bors@rust-lang.org>2014-09-03 14:11:09 +0000
commit8a8986776d16c16ef4685aa38c3f6a2c0efa7884 (patch)
tree2677fac2cc0ff82017744e8b8ec98aa15f1e476d /src
parent3ce5a026b076276a01ddec5b4b1ffbc171e8fce2 (diff)
parent69a9d23d58cc0efff107d25e9a4f9f7a4239b004 (diff)
downloadrust-8a8986776d16c16ef4685aa38c3f6a2c0efa7884.tar.gz
rust-8a8986776d16c16ef4685aa38c3f6a2c0efa7884.zip
auto merge of #16956 : nick29581/rust/unsized-test-1, r=alexcrichton
I landed this disabled, but it now passes since @pcwalton implemented RFC 11

r?
Diffstat (limited to 'src')
-rw-r--r--src/test/compile-fail/unsized3.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/test/compile-fail/unsized3.rs b/src/test/compile-fail/unsized3.rs
index c07dcf93683..4f1f21f6c0e 100644
--- 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() {
 }