diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2015-02-12 10:29:52 -0500 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2015-02-18 10:25:28 -0500 |
| commit | 872ce479550a3d805babb0ca409dfc3cf6f52309 (patch) | |
| tree | a1cf314833d1c99b297d59c30a2f1289f111e57e /src/test/compile-fail/coherence-conflicting-negative-trait-impl.rs | |
| parent | ef42c2befd9451cd913de60539487a483ae9deac (diff) | |
| download | rust-872ce479550a3d805babb0ca409dfc3cf6f52309.tar.gz rust-872ce479550a3d805babb0ca409dfc3cf6f52309.zip | |
Fallout: tests. As tests frequently elide things, lots of changes
here. Some of this may have been poorly rebased, though I tried to be careful and preserve the spirit of the test.
Diffstat (limited to 'src/test/compile-fail/coherence-conflicting-negative-trait-impl.rs')
| -rw-r--r-- | src/test/compile-fail/coherence-conflicting-negative-trait-impl.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/test/compile-fail/coherence-conflicting-negative-trait-impl.rs b/src/test/compile-fail/coherence-conflicting-negative-trait-impl.rs index c9dfb8201a9..a225f6cf473 100644 --- a/src/test/compile-fail/coherence-conflicting-negative-trait-impl.rs +++ b/src/test/compile-fail/coherence-conflicting-negative-trait-impl.rs @@ -10,18 +10,18 @@ #![feature(optin_builtin_traits)] -trait MyTrait {} +trait MyTrait : ::std::marker::MarkerTrait {} -struct TestType<T>; +struct TestType<T>(::std::marker::PhantomData<T>); -unsafe impl<T: MyTrait> Send for TestType<T> {} +unsafe impl<T: MyTrait+'static> Send for TestType<T> {} //~^ ERROR conflicting implementations for trait `core::marker::Send` //~^^ ERROR conflicting implementations for trait `core::marker::Send` impl<T: MyTrait> !Send for TestType<T> {} //~^ ERROR conflicting implementations for trait `core::marker::Send` -unsafe impl<T> Send for TestType<T> {} +unsafe impl<T:'static> Send for TestType<T> {} //~^ ERROR error: conflicting implementations for trait `core::marker::Send` impl !Send for TestType<i32> {} |