about summary refs log tree commit diff
path: root/src/libcore
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-03-23 15:07:21 -0700
committerAlex Crichton <alex@alexcrichton.com>2015-03-23 15:07:21 -0700
commitec1a85a85c784a8481ea7f6d28453239db716829 (patch)
treef378e7d448169c3a69e072fea63182ddb736c6bb /src/libcore
parentad41e7cd7a3d1969e666508d7e4a3ba305cee2ec (diff)
parent04d57729fcf058026d35acdd65fd5539166d838f (diff)
downloadrust-ec1a85a85c784a8481ea7f6d28453239db716829.tar.gz
rust-ec1a85a85c784a8481ea7f6d28453239db716829.zip
rollup merge of #23211: FlaPer87/oibit-send-and-friends
Fixes #23225

r? @nikomatsakis
Diffstat (limited to 'src/libcore')
-rw-r--r--src/libcore/marker.rs4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/libcore/marker.rs b/src/libcore/marker.rs
index 1b866501b8e..0197ee82c77 100644
--- a/src/libcore/marker.rs
+++ b/src/libcore/marker.rs
@@ -39,6 +39,8 @@ pub unsafe trait Send : MarkerTrait {
     // empty.
 }
 
+unsafe impl Send for .. { }
+
 impl<T> !Send for *const T { }
 impl<T> !Send for *mut T { }
 impl !Send for Managed { }
@@ -203,6 +205,8 @@ pub unsafe trait Sync : MarkerTrait {
     // Empty
 }
 
+unsafe impl Sync for .. { }
+
 impl<T> !Sync for *const T { }
 impl<T> !Sync for *mut T { }
 impl !Sync for Managed { }