Imported Upstream version 1.0.0~beta.3

[rustc.git] / src / test / run-pass / unsized.rs

diff --git a/src/test/run-pass/unsized.rs b/src/test/run-pass/unsized.rs
index 8ff8169ef497cb89ae4320240f1778cae5919996..449d6b37e9f894183d336845f66993600876a5c1 100644 (file)
--- a/src/test/run-pass/unsized.rs
+++ b/src/test/run-pass/unsized.rs
@@ -12,17 +12,17 @@
 
 // pretty-expanded FIXME #23616
 
-use std::marker::{PhantomData, PhantomFn};
+use std::marker::PhantomData;
 
-trait T1 : PhantomFn<Self> { }
-pub trait T2 : PhantomFn<Self> { }
-trait T3<X: T1> : T2 + PhantomFn<X> { }
-trait T4<X: ?Sized> : PhantomFn<(Self,X)> {}
-trait T5<X: ?Sized, Y> : PhantomFn<(Self,X,Y)> {}
-trait T6<Y, X: ?Sized> : PhantomFn<(Self,X,Y)> {}
-trait T7<X: ?Sized, Y: ?Sized> : PhantomFn<(Self,X,Y)> {}
-trait T8<X: ?Sized+T2> : PhantomFn<(Self,X)> {}
-trait T9<X: T2 + ?Sized> : PhantomFn<(Self,X)> {}
+trait T1  { }
+pub trait T2  { }
+trait T3<X: T1> : T2 { }
+trait T4<X: ?Sized> { }
+trait T5<X: ?Sized, Y> { }
+trait T6<Y, X: ?Sized> { }
+trait T7<X: ?Sized, Y: ?Sized> { }
+trait T8<X: ?Sized+T2> { }
+trait T9<X: T2 + ?Sized> { }
 struct S1<X: ?Sized>(PhantomData<X>);
 enum E<X: ?Sized> { E1(PhantomData<X>) }
 impl <X: ?Sized> T1 for S1<X> {}