diff --git a/src/libstd/collections/hash/set.rs b/src/libstd/collections/hash/set.rs index fb594dadd738..445391bbe3a1 100644 --- a/src/libstd/collections/hash/set.rs +++ b/src/libstd/collections/hash/set.rs @@ -11,7 +11,7 @@ use borrow::Borrow; use clone::Clone; use cmp::{Eq, PartialEq}; -use core::marker::Sized; +use core::marker::{Sized, Send, Sync}; use default::Default; use fmt::Debug; use fmt; @@ -764,18 +764,27 @@ pub struct Iter<'a, K: 'a> { iter: Keys<'a, K, ()> } +unsafe impl<'a, K: Send> Send for Iter<'a, K> {} +unsafe impl<'a, K: Sync> Sync for Iter<'a, K> {} + /// HashSet move iterator #[stable(feature = "rust1", since = "1.0.0")] pub struct IntoIter { iter: Map, fn((K, ())) -> K> } +unsafe impl Send for IntoIter {} +unsafe impl Sync for IntoIter {} + /// HashSet drain iterator #[stable(feature = "rust1", since = "1.0.0")] pub struct Drain<'a, K: 'a> { iter: Map, fn((K, ())) -> K>, } +unsafe impl<'a, K: Send> Send for Drain<'a, K> {} +unsafe impl<'a, K: Sync> Sync for Drain<'a, K> {} + /// Intersection iterator #[stable(feature = "rust1", since = "1.0.0")] pub struct Intersection<'a, T: 'a, S: 'a> { @@ -785,6 +794,9 @@ pub struct Intersection<'a, T: 'a, S: 'a> { other: &'a HashSet, } +unsafe impl<'a, K: Send, S: Send> Send for Intersection<'a, K, S> {} +unsafe impl<'a, K: Sync, S: Send> Sync for Intersection<'a, K, S> {} + /// Difference iterator #[stable(feature = "rust1", since = "1.0.0")] pub struct Difference<'a, T: 'a, S: 'a> { @@ -794,18 +806,27 @@ pub struct Difference<'a, T: 'a, S: 'a> { other: &'a HashSet, } +unsafe impl<'a, K: Send, S: Send> Send for Difference<'a, K, S> {} +unsafe impl<'a, K: Sync, S: Send> Sync for Difference<'a, K, S> {} + /// Symmetric difference iterator. #[stable(feature = "rust1", since = "1.0.0")] pub struct SymmetricDifference<'a, T: 'a, S: 'a> { iter: Chain, Difference<'a, T, S>> } +unsafe impl<'a, K: Send, S: Send> Send for SymmetricDifference<'a, K, S> {} +unsafe impl<'a, K: Sync, S: Send> Sync for SymmetricDifference<'a, K, S> {} + /// Set union iterator. #[stable(feature = "rust1", since = "1.0.0")] pub struct Union<'a, T: 'a, S: 'a> { iter: Chain, Difference<'a, T, S>> } +unsafe impl<'a, K: Send, S: Send> Send for Union<'a, K, S> {} +unsafe impl<'a, K: Sync, S: Send> Sync for Union<'a, K, S> {} + #[stable(feature = "rust1", since = "1.0.0")] impl<'a, T, S> IntoIterator for &'a HashSet where T: Eq + Hash, S: HashState diff --git a/src/libstd/collections/hash/table.rs b/src/libstd/collections/hash/table.rs index 349462aebe31..ee63e29e6c9a 100644 --- a/src/libstd/collections/hash/table.rs +++ b/src/libstd/collections/hash/table.rs @@ -741,6 +741,9 @@ struct RawBuckets<'a, K, V> { marker: marker::PhantomData<&'a ()>, } +unsafe impl<'a, K: Send, V: Send> Send for RawBuckets<'a, K, V> {} +unsafe impl<'a, K: Sync, V: Sync> Sync for RawBuckets<'a, K, V> {} + // FIXME(#19839) Remove in favor of `#[derive(Clone)]` impl<'a, K, V> Clone for RawBuckets<'a, K, V> { fn clone(&self) -> RawBuckets<'a, K, V> { diff --git a/src/test/run-pass/sync-send-iterators-in-libcollections.rs b/src/test/run-pass/sync-send-iterators-in-libcollections.rs index 0ee04c4463b0..ffa5c6117778 100644 --- a/src/test/run-pass/sync-send-iterators-in-libcollections.rs +++ b/src/test/run-pass/sync-send-iterators-in-libcollections.rs @@ -25,6 +25,7 @@ use collections::String; use collections::Vec; use collections::VecDeque; use collections::VecMap; +use std::collections::HashMap; use collections::Bound::Included; use collections::enum_set::CLike; @@ -77,6 +78,8 @@ fn main() { is_sync_send!(BTreeSet::::new(), intersection(&BTreeSet::::new())); is_sync_send!(BTreeSet::::new(), union(&BTreeSet::::new())); + all_sync_send!(HashMap::::new(), keys, values, iter, iter_mut); + all_sync_send!(LinkedList::::new(), iter, iter_mut, into_iter); #[derive(Copy, Clone)]