diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2015-11-27 10:47:00 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2015-11-27 10:47:00 +0530 |
| commit | f13c72d68e1e7f49e241938bfd6e8a588c68e86b (patch) | |
| tree | 5a4f80662d4c7b5b18adc49a325015e971380225 /components/util/workqueue.rs | |
| parent | bc618b0d535e0e67a7ea845c026678113f000d64 (diff) | |
| parent | dc0e467945e7fb8eaf93f9e40e7ebcb2d5f52b0c (diff) | |
| download | servo-f13c72d68e1e7f49e241938bfd6e8a588c68e86b.tar.gz servo-f13c72d68e1e7f49e241938bfd6e8a588c68e86b.zip | |
Auto merge of #8446 - servo:rustup_20151110, r=SimonSapin+Ms2ger+jdm+Manishearth
Rust upgrade to rustc 1.6.0-nightly (5b4986fa5 2015-11-08)
<s>DO NOT r+ or try+ this</s>
<s>It causes an OOM (https://github.com/rust-lang/rust/issues/29740) and can crash the OS. Probably will set our CI on fire. </s>
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8446)
<!-- Reviewable:end -->
Diffstat (limited to 'components/util/workqueue.rs')
| -rw-r--r-- | components/util/workqueue.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/util/workqueue.rs b/components/util/workqueue.rs index 26125335b3e..dd7c4dd355a 100644 --- a/components/util/workqueue.rs +++ b/components/util/workqueue.rs @@ -8,7 +8,7 @@ //! higher-level API on top of this could allow safe fork-join parallelism. use deque::{Abort, BufferPool, Data, Empty, Stealer, Worker}; -use libc::funcs::posix88::unistd::usleep; +use libc::usleep; use rand::{Rng, XorShiftRng, weak_rng}; use std::sync::atomic::{AtomicUsize, Ordering}; use std::sync::mpsc::{Receiver, Sender, channel}; |