diff options
| author | Jeffrey Seyfried <jeffrey.seyfried@gmail.com> | 2016-03-20 11:24:08 +0000 |
|---|---|---|
| committer | Jeffrey Seyfried <jeffrey.seyfried@gmail.com> | 2016-03-30 22:00:48 +0000 |
| commit | da41e583d614411c99370881c38f919c99dec448 (patch) | |
| tree | 7b5ad7416f4c33196e9f03f5aff1a0cfb3731878 /src/test/compile-fail/coherence-conflicting-negative-trait-impl.rs | |
| parent | 0c6f067961f4f7475a74e1f3c32ed0599f541291 (diff) | |
| download | rust-da41e583d614411c99370881c38f919c99dec448.tar.gz rust-da41e583d614411c99370881c38f919c99dec448.zip | |
Fix fallout in tests
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 | 4 |
1 files changed, 2 insertions, 2 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 c123e381ab7..afc3b8d4ccd 100644 --- a/src/test/compile-fail/coherence-conflicting-negative-trait-impl.rs +++ b/src/test/compile-fail/coherence-conflicting-negative-trait-impl.rs @@ -17,10 +17,10 @@ struct TestType<T>(::std::marker::PhantomData<T>); unsafe impl<T: MyTrait+'static> Send for TestType<T> {} impl<T: MyTrait> !Send for TestType<T> {} -//~^ ERROR conflicting implementations of trait `core::marker::Send` +//~^ ERROR conflicting implementations of trait `std::marker::Send` unsafe impl<T:'static> Send for TestType<T> {} -//~^ ERROR error: conflicting implementations of trait `core::marker::Send` +//~^ ERROR error: conflicting implementations of trait `std::marker::Send` impl !Send for TestType<i32> {} |