diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-01-27 22:41:25 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-02-03 12:05:16 -0800 |
| commit | acacfb20fd34162cfba5a4e7b5f1447e0403fa50 (patch) | |
| tree | 0790d82726f49abc6d37b8ac5c8ca0fbec7e0685 /src/libgreen | |
| parent | 984727ff87bb8a9f345ababf473d1141f9e05c08 (diff) | |
| download | rust-acacfb20fd34162cfba5a4e7b5f1447e0403fa50.tar.gz rust-acacfb20fd34162cfba5a4e7b5f1447e0403fa50.zip | |
Various bug fixes and rebase conflicts
Diffstat (limited to 'src/libgreen')
| -rw-r--r-- | src/libgreen/sched.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libgreen/sched.rs b/src/libgreen/sched.rs index da4f0a3b68a..c8b84d445db 100644 --- a/src/libgreen/sched.rs +++ b/src/libgreen/sched.rs @@ -1470,7 +1470,6 @@ mod test { LOCK.signal(); // wakeup waiting scheduler LOCK.wait(); // wait for them to grab the lock LOCK.unlock(); - LOCK.destroy(); // now we're guaranteed they have no locks } }))); drop(handle); @@ -1478,6 +1477,6 @@ mod test { fin_po.recv(); pool.shutdown(); } - + unsafe { LOCK.destroy(); } } } |