Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-08 00:23:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cargo updates and small workqueue change

Browse source
This commit is contained in:
Lars Bergstrom 2015-12-03 18:50:58 -06:00
parent 5b845cbf79
commit 095658e098
3 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/gfx/Cargo.toml
View file

@ -84,7 +84,7 @@ servo-fontconfig = "0.2"
[target.arm-linux-androideabi.dependencies] [target.arm-linux-androideabi.dependencies]
servo-fontconfig = "0.2" servo-fontconfig = "0.2"
[target.x86_64-pc-windows-gnu.dependencies.fontconfig] [target.x86_64-pc-windows-gnu.dependencies.servo-fontconfig]
git = "https://github.com/servo/rust-fontconfig" git = "https://github.com/servo/rust-fontconfig"
[target.i686-unknown-linux-gnu.dependencies.freetype] [target.i686-unknown-linux-gnu.dependencies.freetype]

19
components/servo/Cargo.lock generated
View file

@ -899,6 +899,15 @@ dependencies = [
"rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]]
name = "kernel32-sys"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"winapi 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
"winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]] [[package]]
name = "kernel32-sys" name = "kernel32-sys"
version = "0.2.1" version = "0.2.1"
@ -1637,6 +1646,15 @@ dependencies = [
"libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]]
name = "servo-fontconfig"
version = "0.2.0"
source = "git+https://github.com/servo/rust-fontconfig#0dd4c4496295ac58ef2f8248d896b19a369767d4"
dependencies = [
"libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"servo-fontconfig-sys 2.11.2-really.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]] [[package]]
name = "servo-fontconfig" name = "servo-fontconfig"
version = "0.2.0" version = "0.2.0"
@ -1961,6 +1979,7 @@ dependencies = [
"hyper 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
"ipc-channel 0.1.0 (git+https://github.com/servo/ipc-channel)", "ipc-channel 0.1.0 (git+https://github.com/servo/ipc-channel)",
"js 0.1.1 (git+https://github.com/servo/rust-mozjs)", "js 0.1.1 (git+https://github.com/servo/rust-mozjs)",
"kernel32-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"layers 0.2.0 (git+https://github.com/servo/rust-layers)", "layers 0.2.0 (git+https://github.com/servo/rust-layers)",
"lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",

3
components/util/workqueue.rs
View file

@ -11,9 +11,8 @@
extern crate kernel32; extern crate kernel32;
use deque::{Abort, BufferPool, Data, Empty, Stealer, Worker}; use deque::{Abort, BufferPool, Data, Empty, Stealer, Worker};
use libc::usleep;
#[cfg(not(windows))] #[cfg(not(windows))]
use libc::funcs::posix88::unistd::usleep; use libc::usleep;
use rand::{Rng, XorShiftRng, weak_rng}; use rand::{Rng, XorShiftRng, weak_rng};
use std::sync::atomic::{AtomicUsize, Ordering}; use std::sync::atomic::{AtomicUsize, Ordering};
use std::sync::mpsc::{Receiver, Sender, channel}; use std::sync::mpsc::{Receiver, Sender, channel};