Fallout in tests

Author: nikomatsakis

src/test/auxiliary/coherence_orphan_lib.rs

@@ -8,6 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-pub trait TheTrait<T> : ::std::marker::PhantomFn<T> {
+pub trait TheTrait<T> {
     fn the_fn(&self);
 }

src/test/auxiliary/lang-item-public.rs

@@ -12,12 +12,8 @@
 #![no_std]
 #![feature(lang_items)]
 
-#[lang="phantom_fn"]
-pub trait PhantomFn<A:?Sized,R:?Sized=()> { }
-impl<A:?Sized, R:?Sized, U:?Sized> PhantomFn<A,R> for U { }
-
 #[lang="sized"]
-pub trait Sized : PhantomFn<Self> {}
+pub trait Sized { }
 
 #[lang="panic"]
 fn panic(_: &(&'static str, &'static str, usize)) -> ! { loop {} }
@@ -29,7 +25,7 @@ extern fn stack_exhausted() {}
 extern fn eh_personality() {}
 
 #[lang="copy"]
-pub trait Copy : PhantomFn<Self> {
+pub trait Copy {
     // Empty.
 }
 

src/test/compile-fail/associated-types-ICE-when-projecting-out-of-err.rs

@@ -16,12 +16,8 @@
 #![feature(no_std)]
 #![no_std]
 
-#[lang="phantom_fn"]
-pub trait PhantomFn<A:?Sized,R:?Sized=()> { }
-impl<A:?Sized, R:?Sized, U:?Sized> PhantomFn<A,R> for U { }
-
 #[lang="sized"]
-pub trait Sized : PhantomFn<Self> {
+pub trait Sized {
     // Empty.
 }
 

src/test/compile-fail/issue-13853-2.rs

@@ -8,9 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::marker::PhantomFn;
-
-trait FromStructReader<'a> : PhantomFn<(Self,&'a ())> { }
+trait FromStructReader<'a> { }
 trait ResponseHook {
      fn get<'a, T: FromStructReader<'a>>(&'a self);
 }

src/test/compile-fail/issue-19660.rs

@@ -13,12 +13,8 @@
 #![feature(lang_items, start, no_std)]
 #![no_std]
 
-#[lang="phantom_fn"]
-trait PhantomFn<A:?Sized,R:?Sized=()> { }
-impl<A:?Sized, R:?Sized, U:?Sized> PhantomFn<A,R> for U { }
-
 #[lang = "sized"]
-trait Sized : PhantomFn<Self> {}
+trait Sized { }
 
 #[start]
 fn main(_: isize, _: *const *const u8) -> isize {

src/test/compile-fail/kindck-impl-type-params.rs

@@ -41,7 +41,7 @@ fn g<T>(val: T) {
 fn foo<'a>() {
     let t: S<&'a isize> = S(marker::PhantomData);
     let a = &t as &Gettable<&'a isize>;
-    //~^ ERROR cannot infer
+    //~^ ERROR does not fulfill
 }
 
 fn foo2<'a>() {

src/test/compile-fail/lint-unsafe-code.rs

@@ -12,18 +12,15 @@
 #![allow(dead_code)]
 #![deny(unsafe_code)]
 
-use std::marker::PhantomFn;
-
 struct Bar;
 struct Bar2;
 struct Bar3;
 
 #[allow(unsafe_code)]
 mod allowed_unsafe {
-    use std::marker::PhantomFn;
     fn allowed() { unsafe {} }
     unsafe fn also_allowed() {}
-    unsafe trait AllowedUnsafe : PhantomFn<Self> {}
+    unsafe trait AllowedUnsafe { }
     unsafe impl AllowedUnsafe for super::Bar {}
 }
 
@@ -34,7 +31,7 @@ macro_rules! unsafe_in_macro {
 }
 
 unsafe fn baz() {} //~ ERROR: declaration of an `unsafe` function
-unsafe trait Foo : PhantomFn<Self> {} //~ ERROR: declaration of an `unsafe` trait
+unsafe trait Foo {} //~ ERROR: declaration of an `unsafe` trait
 unsafe impl Foo for Bar {} //~ ERROR: implementation of an `unsafe` trait
 
 trait Baz {

src/test/compile-fail/object-safety-phantom-fn.rs

@@ -13,12 +13,10 @@
 #![feature(rustc_attrs)]
 #![allow(dead_code)]
 
-use std::marker::PhantomFn;
-
-trait Baz : PhantomFn<Self> {
+trait Baz {
 }
 
-trait Bar<T> : PhantomFn<(Self, T)> {
+trait Bar<T> {
 }
 
 fn make_bar<T:Bar<u32>>(t: &T) -> &Bar<u32> {

src/test/compile-fail/on-unimplemented-bad-anno.rs

@@ -13,11 +13,8 @@
 
 #![allow(unused)]
 
-use std::marker;
-
 #[rustc_on_unimplemented = "test error `{Self}` with `{Bar}` `{Baz}` `{Quux}`"]
 trait Foo<Bar, Baz, Quux>
-    : marker::PhantomFn<(Self,Bar,Baz,Quux)>
 {}
 
 #[rustc_on_unimplemented="a collection of type `{Self}` cannot be built from an iterator over elements of type `{A}`"]
@@ -28,19 +25,16 @@ trait MyFromIterator<A> {
 
 #[rustc_on_unimplemented] //~ ERROR this attribute must have a value
 trait BadAnnotation1
-    : marker::MarkerTrait
 {}
 
 #[rustc_on_unimplemented = "Unimplemented trait error on `{Self}` with params `<{A},{B},{C}>`"]
 //~^ ERROR there is no type parameter C on trait BadAnnotation2
 trait BadAnnotation2<A,B>
-    : marker::PhantomFn<(Self,A,B)>
 {}
 
 #[rustc_on_unimplemented = "Unimplemented trait error on `{Self}` with params `<{A},{B},{}>`"]
 //~^ only named substitution parameters are allowed
 trait BadAnnotation3<A,B>
-    : marker::PhantomFn<(Self,A,B)>
 {}
 
 pub fn main() {

src/test/compile-fail/on-unimplemented.rs

@@ -11,11 +11,8 @@
 
 #![feature(on_unimplemented)]
 
-use std::marker;
-
 #[rustc_on_unimplemented = "test error `{Self}` with `{Bar}` `{Baz}` `{Quux}`"]
 trait Foo<Bar, Baz, Quux>
-    : marker::PhantomFn<(Self,Bar,Baz,Quux)>
 {}
 
 fn foobar<U: Clone, T: Foo<u8, U, u32>>() -> T {

src/test/compile-fail/privacy1.rs

@@ -11,15 +11,11 @@
 #![feature(lang_items, start, no_std)]
 #![no_std] // makes debugging this test *a lot* easier (during resolve)
 
-#[lang="phantom_fn"]
-pub trait PhantomFn<A:?Sized,R:?Sized=()> { }
-impl<A:?Sized, R:?Sized, U:?Sized> PhantomFn<A,R> for U { }
-
 #[lang="sized"]
-pub trait Sized : PhantomFn<Self> {}
+pub trait Sized {}
 
 #[lang="copy"]
-pub trait Copy : PhantomFn<Self> {}
+pub trait Copy {}
 
 mod bar {
     // shouldn't bring in too much

src/test/compile-fail/privacy4.rs

@@ -11,12 +11,8 @@
 #![feature(lang_items, start, no_std)]
 #![no_std] // makes debugging this test *a lot* easier (during resolve)
 
-#[lang="phantom_fn"]
-pub trait PhantomFn<A:?Sized,R:?Sized=()> { }
-impl<A:?Sized, R:?Sized, U:?Sized> PhantomFn<A,R> for U { }
-
-#[lang = "sized"] pub trait Sized : PhantomFn<Self> {}
-#[lang="copy"] pub trait Copy : PhantomFn<Self> {}
+#[lang = "sized"] pub trait Sized {}
+#[lang="copy"] pub trait Copy {}
 
 // Test to make sure that private items imported through globs remain private
 // when  they're used.

src/test/compile-fail/regions-assoc-type-in-supertrait-outlives-container.rs

@@ -15,11 +15,9 @@
 
 #![allow(dead_code)]
 
-use std::marker::PhantomFn;
-
 ///////////////////////////////////////////////////////////////////////////
 
-pub trait TheTrait: PhantomFn<Self, Self> {
+pub trait TheTrait {
     type TheAssocType;
 }
 

src/test/compile-fail/regions-assoc-type-outlives-container-hrtb.rs

@@ -14,11 +14,9 @@
 #![allow(dead_code)]
 #![feature(rustc_attrs)]
 
-use std::marker::PhantomFn;
-
 ///////////////////////////////////////////////////////////////////////////
 
-pub trait TheTrait<'b> : PhantomFn<&'b Self,Self> {
+pub trait TheTrait<'b> {
     type TheAssocType;
 }
 

src/test/compile-fail/regions-assoc-type-outlives-container-wc.rs

@@ -15,11 +15,9 @@
 
 #![allow(dead_code)]
 
-use std::marker::PhantomFn;
-
 ///////////////////////////////////////////////////////////////////////////
 
-pub trait TheTrait: PhantomFn<Self, Self> {
+pub trait TheTrait {
     type TheAssocType;
 }
 

src/test/compile-fail/regions-assoc-type-outlives-container.rs

@@ -15,11 +15,9 @@
 #![allow(dead_code)]
 #![feature(rustc_attrs)]
 
-use std::marker::PhantomFn;
-
 ///////////////////////////////////////////////////////////////////////////
 
-pub trait TheTrait: PhantomFn<Self, Self> {
+pub trait TheTrait {
     type TheAssocType;
 }
 

src/test/compile-fail/regions-close-object-into-object-1.rs

@@ -11,12 +11,10 @@
 #![feature(box_syntax)]
 #![allow(warnings)]
 
-use std::marker::PhantomFn;
-
-trait A<T> : PhantomFn<(Self,T)> { }
+trait A<T> { }
 struct B<'a, T>(&'a (A<T>+'a));
 
-trait X : ::std::marker::MarkerTrait {}
+trait X { }
 
 impl<'a, T> X for B<'a, T> {}
 

src/test/compile-fail/regions-close-object-into-object-2.rs

@@ -10,12 +10,10 @@
 
 #![feature(box_syntax)]
 
-use std::marker::PhantomFn;
-
-trait A<T> : PhantomFn<(Self,T)> { }
+trait A<T> { }
 struct B<'a, T>(&'a (A<T>+'a));
 
-trait X : PhantomFn<Self> {}
+trait X { }
 impl<'a, T> X for B<'a, T> {}
 
 fn g<'a, T: 'static>(v: Box<A<T>+'a>) -> Box<X+'static> {

src/test/compile-fail/regions-close-object-into-object-3.rs

@@ -11,15 +11,13 @@
 #![feature(box_syntax)]
 #![allow(warnings)]
 
-use std::marker::PhantomFn;
-
-trait A<T> : PhantomFn<(Self,T)> {}
+trait A<T> { }
 struct B<'a, T>(&'a (A<T>+'a));
 
-trait X : PhantomFn<Self> {}
+trait X { }
 impl<'a, T> X for B<'a, T> {}
 
-fn h<'a, T, U>(v: Box<A<U>+'static>) -> Box<X+'static> {
+fn h<'a, T, U:'static>(v: Box<A<U>+'static>) -> Box<X+'static> {
     box B(&*v) as Box<X> //~ ERROR `*v` does not live long enough
 }
 

src/test/compile-fail/regions-close-object-into-object-4.rs

@@ -10,12 +10,10 @@
 
 #![feature(box_syntax)]
 
-use std::marker::PhantomFn;
-
-trait A<T> : PhantomFn<(Self,T)> {}
+trait A<T> { }
 struct B<'a, T>(&'a (A<T>+'a));
 
-trait X : PhantomFn<Self> {}
+trait X { }
 impl<'a, T> X for B<'a, T> {}
 
 fn i<'a, T, U>(v: Box<A<U>+'a>) -> Box<X+'static> {

src/test/compile-fail/required-lang-item.rs

@@ -11,11 +11,7 @@
 #![feature(lang_items, no_std)]
 #![no_std]
 
-#[lang="phantom_fn"]
-pub trait PhantomFn<T:?Sized> { }
-impl<T:?Sized, U:?Sized> PhantomFn<T> for U { }
-
-#[lang="sized"] pub trait Sized : PhantomFn<Self> {}
+#[lang="sized"] pub trait Sized { }
 
 // error-pattern:requires `start` lang_item
 

src/test/compile-fail/trait-bounds-impl-comparison-1.rs

@@ -13,8 +13,7 @@
 
 use std::marker;
 
-trait A : marker::PhantomFn<Self> {
-}
+trait A { }
 
 trait B: A {}
 

src/test/compile-fail/trait-bounds-impl-comparison-2.rs

@@ -15,7 +15,6 @@ trait Iterator<A> {
 }
 
 trait IteratorUtil<A>
-    : ::std::marker::PhantomFn<(),A>
 {
     fn zip<B, U: Iterator<U>>(self, other: U) -> ZipIterator<Self, U>;
 }

src/test/compile-fail/unboxed-closure-sugar-equiv.rs

@@ -16,14 +16,12 @@
 #![feature(unboxed_closures)]
 #![allow(dead_code)]
 
-use std::marker::PhantomFn;
-
 trait Foo<T> {
     type Output;
     fn dummy(&self, t: T, u: Self::Output);
 }
 
-trait Eq<X: ?Sized> : PhantomFn<(Self,X)> { }
+trait Eq<X: ?Sized> { }
 impl<X: ?Sized> Eq<X> for X { }
 fn eq<A: ?Sized,B: ?Sized +Eq<A>>() { }
 

src/test/compile-fail/unboxed-closure-sugar-lifetime-elision.rs

@@ -23,7 +23,7 @@ trait Foo<T> {
     fn dummy(&self, t: T);
 }
 
-trait Eq<X: ?Sized> : marker::PhantomFn<(Self, X)> { }
+trait Eq<X: ?Sized> { }
 impl<X: ?Sized> Eq<X> for X { }
 fn eq<A: ?Sized,B: ?Sized +Eq<A>>() { }
 

src/test/compile-fail/variance-contravariant-arg-object.rs

@@ -10,6 +10,9 @@
 
 #![allow(dead_code)]
 
+// This test was previously testing variance on traits.
+// But now that it is removed, both cases error.
+
 trait Get<T> : 'static {
     fn get(&self, t: T);
 }
@@ -25,7 +28,8 @@ fn get_max_from_min<'min, 'max, G>(v: Box<Get<&'min i32>>)
                                    -> Box<Get<&'max i32>>
     where 'max : 'min
 {
-    v
+    // Previously OK:
+    v //~ ERROR mismatched types
 }
 
 fn main() { }