diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-03-18 11:25:00 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-03-18 11:25:00 -0600 |
| commit | 99cf9dbfc107bacb84dfe5afa9539a0ede3beac2 (patch) | |
| tree | cc36210329cb1a31709a03685c05c4aaa99407e3 /components/util/taskpool.rs | |
| parent | 65d4b12bf20783ea784f1c61f4b33ec0fc975f4f (diff) | |
| parent | 5f15eb5fbfb7a8649132cc8b3a07314389836714 (diff) | |
| download | servo-99cf9dbfc107bacb84dfe5afa9539a0ede3beac2.tar.gz servo-99cf9dbfc107bacb84dfe5afa9539a0ede3beac2.zip | |
auto merge of #5256 : servo/servo/rustup_20150311, r=jdm
...v.
Relies on:
* https://github.com/servo/rust-geom/pull/72
* https://github.com/servo/rust-glx/pull/10
* https://github.com/servo/gleam/pull/15
* https://github.com/servo/rust-mozjs/pull/137
* https://github.com/servo/rust-core-text/pull/35
* https://github.com/servo/rust-io-surface/pull/28
Diffstat (limited to 'components/util/taskpool.rs')
| -rw-r--r-- | components/util/taskpool.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/util/taskpool.rs b/components/util/taskpool.rs index d3f52c5018b..e091d0b5d6d 100644 --- a/components/util/taskpool.rs +++ b/components/util/taskpool.rs @@ -21,7 +21,7 @@ use std::sync::mpsc::{channel, Sender, Receiver}; use std::thunk::Thunk; pub struct TaskPool { - tx: Sender<Thunk<()>>, + tx: Sender<Thunk<'static, ()>>, } impl TaskPool { @@ -52,7 +52,7 @@ impl TaskPool { } pub fn execute<F>(&self, job: F) - where F: FnOnce() + Send + where F: FnOnce() + Send + 'static { self.tx.send(Thunk::new(job)).unwrap(); } |