diff options
Diffstat (limited to 'src/test/ui/coherence/coherence-conflicting-negative-trait-impl.rs')
| -rw-r--r-- | src/test/ui/coherence/coherence-conflicting-negative-trait-impl.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/test/ui/coherence/coherence-conflicting-negative-trait-impl.rs b/src/test/ui/coherence/coherence-conflicting-negative-trait-impl.rs index 66d0958e4c9..b4f5f9ef56b 100644 --- a/src/test/ui/coherence/coherence-conflicting-negative-trait-impl.rs +++ b/src/test/ui/coherence/coherence-conflicting-negative-trait-impl.rs @@ -1,6 +1,7 @@ #![feature(optin_builtin_traits)] -#![feature(overlapping_marker_traits)] +#![feature(marker_trait_attr)] +#[marker] trait MyTrait {} struct TestType<T>(::std::marker::PhantomData<T>); @@ -8,11 +9,11 @@ struct TestType<T>(::std::marker::PhantomData<T>); unsafe impl<T: MyTrait+'static> Send for TestType<T> {} impl<T: MyTrait> !Send for TestType<T> {} -//~^ ERROR E0119 +//~^ ERROR conflicting implementations unsafe impl<T:'static> Send for TestType<T> {} +//~^ ERROR conflicting implementations impl !Send for TestType<i32> {} -//~^ ERROR E0119 fn main() {} |
