diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2015-03-31 19:58:01 -0400 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2015-04-02 13:24:46 -0400 |
| commit | 9b5accade787beb0c82fe1f6937c43bfb6abd054 (patch) | |
| tree | f3861c1fbd7e7d2fcd016ca49dd69e69bb317089 /src/test/auxiliary | |
| parent | dd31bb24e8c23f27e19da535e762361b2d8e773a (diff) | |
| download | rust-9b5accade787beb0c82fe1f6937c43bfb6abd054.tar.gz rust-9b5accade787beb0c82fe1f6937c43bfb6abd054.zip | |
Fallout in tests
Diffstat (limited to 'src/test/auxiliary')
| -rw-r--r-- | src/test/auxiliary/coherence_orphan_lib.rs | 2 | ||||
| -rw-r--r-- | src/test/auxiliary/lang-item-public.rs | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/test/auxiliary/coherence_orphan_lib.rs b/src/test/auxiliary/coherence_orphan_lib.rs index 93d8fd3da88..b22d12300c7 100644 --- a/src/test/auxiliary/coherence_orphan_lib.rs +++ b/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); } diff --git a/src/test/auxiliary/lang-item-public.rs b/src/test/auxiliary/lang-item-public.rs index 72dfc75f41b..d195bd7e77b 100644 --- a/src/test/auxiliary/lang-item-public.rs +++ b/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. } |