about summary refs log tree commit diff
path: root/src/test/run-make
diff options
context:
space:
mode:
authorNiko Matsakis <niko@alum.mit.edu>2015-03-31 19:58:01 -0400
committerNiko Matsakis <niko@alum.mit.edu>2015-04-02 13:24:46 -0400
commit9b5accade787beb0c82fe1f6937c43bfb6abd054 (patch)
treef3861c1fbd7e7d2fcd016ca49dd69e69bb317089 /src/test/run-make
parentdd31bb24e8c23f27e19da535e762361b2d8e773a (diff)
downloadrust-9b5accade787beb0c82fe1f6937c43bfb6abd054.tar.gz
rust-9b5accade787beb0c82fe1f6937c43bfb6abd054.zip
Fallout in tests
Diffstat (limited to 'src/test/run-make')
-rw-r--r--src/test/run-make/simd-ffi/simd.rs8
-rw-r--r--src/test/run-make/target-specs/foo.rs8
2 files changed, 4 insertions, 12 deletions
diff --git a/src/test/run-make/simd-ffi/simd.rs b/src/test/run-make/simd-ffi/simd.rs
index f418d5d1fb7..563fe79e537 100644
--- a/src/test/run-make/simd-ffi/simd.rs
+++ b/src/test/run-make/simd-ffi/simd.rs
@@ -70,14 +70,10 @@ pub fn bar(a: i32x4, b: i32x4) -> i32x4 {
 }
 
 #[lang = "sized"]
-pub trait Sized : PhantomFn<Self> {}
+pub trait Sized { }
 
 #[lang = "copy"]
-pub trait Copy : PhantomFn<Self> {}
-
-#[lang="phantom_fn"]
-pub trait PhantomFn<A:?Sized,R:?Sized=()> { }
-impl<A:?Sized, R:?Sized, U:?Sized> PhantomFn<A,R> for U { }
+pub trait Copy { }
 
 mod core {
     pub mod marker {
diff --git a/src/test/run-make/target-specs/foo.rs b/src/test/run-make/target-specs/foo.rs
index b13c41be559..9dbae193388 100644
--- a/src/test/run-make/target-specs/foo.rs
+++ b/src/test/run-make/target-specs/foo.rs
@@ -11,15 +11,11 @@
 #![feature(lang_items, 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="copy"]
-trait Copy : PhantomFn<Self> { }
+trait Copy { }
 
 #[lang="sized"]
-trait Sized : PhantomFn<Self>  { }
+trait Sized { }
 
 #[lang="start"]
 fn start(_main: *const u8, _argc: isize, _argv: *const *const u8) -> isize { 0 }