about summary refs log tree commit diff
path: root/src/libworkcache
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-03-27 14:32:02 -0700
committerbors <bors@rust-lang.org>2014-03-27 14:32:02 -0700
commit13dafa09f1a80b8b50f41cab42ac2bfd24dfa6b9 (patch)
treeb9e7df5a742c922c22c5796969b4266850d6ce7e /src/libworkcache
parent8eaada5d3922e5e39c402493a37c384699ef1756 (diff)
parent8d0be731f543837251ea10a77499725f91d02560 (diff)
downloadrust-13dafa09f1a80b8b50f41cab42ac2bfd24dfa6b9.tar.gz
rust-13dafa09f1a80b8b50f41cab42ac2bfd24dfa6b9.zip
auto merge of #13050 : alexcrichton/rust/no-send-default, r=huonw
See #10296 for the rationale, and commits for the implementation.
Diffstat (limited to 'src/libworkcache')
-rw-r--r--src/libworkcache/lib.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libworkcache/lib.rs b/src/libworkcache/lib.rs
index 9c0328d4b11..3e513472027 100644
--- a/src/libworkcache/lib.rs
+++ b/src/libworkcache/lib.rs
@@ -394,14 +394,14 @@ impl<'a> Prep<'a> {
     pub fn exec<'a, T:Send +
         Encodable<json::Encoder<'a>> +
         Decodable<json::Decoder>>(
-            &'a self, blk: proc(&mut Exec) -> T) -> T {
+            &'a self, blk: proc:Send(&mut Exec) -> T) -> T {
         self.exec_work(blk).unwrap()
     }
 
     fn exec_work<'a, T:Send +
         Encodable<json::Encoder<'a>> +
         Decodable<json::Decoder>>( // FIXME(#5121)
-            &'a self, blk: proc(&mut Exec) -> T) -> Work<'a, T> {
+            &'a self, blk: proc:Send(&mut Exec) -> T) -> Work<'a, T> {
         let mut bo = Some(blk);
 
         debug!("exec_work: looking up {} and {:?}", self.fn_name,