about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-12-15 16:08:07 +0000
committerbors <bors@rust-lang.org>2017-12-15 16:08:07 +0000
commit50f6c3ece0ec738da48f8e77e6379a14bd02d1f4 (patch)
tree56b55759ba9b8e1f4f884958dbcafb7228922f84 /src/libstd
parent5a0dc2d06d92d3bef7502d2095cd0d51486d4e12 (diff)
parentb98de5d0aca50ec6c947db9d1f2f54aab7d1ef6f (diff)
downloadrust-50f6c3ece0ec738da48f8e77e6379a14bd02d1f4.tar.gz
rust-50f6c3ece0ec738da48f8e77e6379a14bd02d1f4.zip
Auto merge of #46745 - steveklabnik:rollup, r=steveklabnik
Rollup of 7 pull requests

- Successful merges: #46601, #46652, #46690, #46705, #46710, #46728, #46737
- Failed merges:
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/collections/hash/table.rs3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/libstd/collections/hash/table.rs b/src/libstd/collections/hash/table.rs
index 7e623a0af17..96f98efe4aa 100644
--- a/src/libstd/collections/hash/table.rs
+++ b/src/libstd/collections/hash/table.rs
@@ -123,9 +123,6 @@ pub struct RawTable<K, V> {
     marker: marker::PhantomData<(K, V)>,
 }
 
-unsafe impl<K: Send, V: Send> Send for RawTable<K, V> {}
-unsafe impl<K: Sync, V: Sync> Sync for RawTable<K, V> {}
-
 // An unsafe view of a RawTable bucket
 // Valid indexes are within [0..table_capacity)
 pub struct RawBucket<K, V> {