about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2015-07-05 15:12:19 -0400
committerSteve Klabnik <steve@steveklabnik.com>2015-07-05 15:12:19 -0400
commit2e78d3705fcb63b2ee52698609bf43a9d066dca4 (patch)
tree1b84f15a417945007f9eb948c690e604b187498d
parent5d3b0f1f6b81f876d444fad2f87602a241e06a48 (diff)
parent3f56e9a984075fecfe757ab5774072f73bb86b1b (diff)
downloadrust-2e78d3705fcb63b2ee52698609bf43a9d066dca4.tar.gz
rust-2e78d3705fcb63b2ee52698609bf43a9d066dca4.zip
Rollup merge of #26464 - Gankro:send, r=alexcrichton
Vec contains `Unique<T>` and some usizes, this is already derived.
-rw-r--r--src/libcollections/vec.rs3
-rw-r--r--src/test/compile-fail/coherence-orphan.rs1
2 files changed, 0 insertions, 4 deletions
diff --git a/src/libcollections/vec.rs b/src/libcollections/vec.rs
index 5b326b1a5b0..c032471b6b6 100644
--- a/src/libcollections/vec.rs
+++ b/src/libcollections/vec.rs
@@ -157,9 +157,6 @@ pub struct Vec<T> {
     cap: usize,
 }
 
-unsafe impl<T: Send> Send for Vec<T> { }
-unsafe impl<T: Sync> Sync for Vec<T> { }
-
 ////////////////////////////////////////////////////////////////////////////////
 // Inherent methods
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/test/compile-fail/coherence-orphan.rs b/src/test/compile-fail/coherence-orphan.rs
index 78435f1a78a..80efc7b75e2 100644
--- a/src/test/compile-fail/coherence-orphan.rs
+++ b/src/test/compile-fail/coherence-orphan.rs
@@ -27,6 +27,5 @@ impl TheTrait<isize> for TheType { }
 
 impl !Send for Vec<isize> { }
 //~^ ERROR E0117
-//~| ERROR E0119
 
 fn main() { }