about summary refs log tree commit diff
path: root/src/libstd/sys
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-01-21 09:14:36 -0800
committerAlex Crichton <alex@alexcrichton.com>2015-01-21 09:14:36 -0800
commit8b10733e7a5fd92cdc4fb44e7c808dc47e28e3f2 (patch)
tree31bbdaca98744759771b6a64444b7191b21c0118 /src/libstd/sys
parent9173797be11cbc10f83d66a9c7616e27108cdbcd (diff)
parentabccfa4018a407bbe80e8acd0f83c023664ea49a (diff)
downloadrust-8b10733e7a5fd92cdc4fb44e7c808dc47e28e3f2.tar.gz
rust-8b10733e7a5fd92cdc4fb44e7c808dc47e28e3f2.zip
rollup merge of #21389: retep998/timer
Fixes #20943 and adds a test for it
r? @alexcrichton
Diffstat (limited to 'src/libstd/sys')
-rw-r--r--src/libstd/sys/windows/timer.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sys/windows/timer.rs b/src/libstd/sys/windows/timer.rs
index 1ae3979cd9a..12b4e56bf52 100644
--- a/src/libstd/sys/windows/timer.rs
+++ b/src/libstd/sys/windows/timer.rs
@@ -48,9 +48,9 @@ pub enum Req {
     RemoveTimer(libc::HANDLE, Sender<()>),
 }
 
+unsafe impl Send for Timer {}
 unsafe impl Send for Req {}
 
-
 fn helper(input: libc::HANDLE, messages: Receiver<Req>, _: ()) {
     let mut objs = vec![input];
     let mut chans = vec![];