auto merge of #4963 : Ms2ger/servo/js-libc, r=jdm

Requires https://github.com/servo/rust-mozjs/pull/136.
This commit is contained in:
bors-servo 2015-02-19 12:03:54 -07:00
commit d94bd278a4
5 changed files with 10 additions and 4 deletions

View file

@ -70,3 +70,4 @@ url = "0.2.16"
time = "0.1.12"
bitflags = "*"
rustc-serialize = "*"
libc = "*"

View file

@ -9,7 +9,6 @@
#![feature(hash)]
#![feature(int_uint)]
#![feature(io)]
#![feature(libc)]
#![feature(plugin)]
#![feature(rustc_private)]
#![feature(std_misc)]

View file

@ -451,8 +451,9 @@ dependencies = [
[[package]]
name = "js"
version = "0.1.0"
source = "git+https://github.com/servo/rust-mozjs#f01d85186415afdaded8179ba7455534931778ca"
source = "git+https://github.com/servo/rust-mozjs#db08a4eacdb3d92df9a38c8a5d7ad1e1ee0fef4e"
dependencies = [
"libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"mozjs-sys 0.0.0 (git+https://github.com/servo/mozjs)",
]
@ -703,6 +704,7 @@ dependencies = [
"html5ever 0.0.0 (git+https://github.com/servo/html5ever)",
"hyper 0.1.10 (git+https://github.com/servo/hyper?branch=servo)",
"js 0.1.0 (git+https://github.com/servo/rust-mozjs)",
"libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
"net 0.0.1",
"plugins 0.0.1",

4
ports/cef/Cargo.lock generated
View file

@ -454,8 +454,9 @@ dependencies = [
[[package]]
name = "js"
version = "0.1.0"
source = "git+https://github.com/servo/rust-mozjs#f01d85186415afdaded8179ba7455534931778ca"
source = "git+https://github.com/servo/rust-mozjs#db08a4eacdb3d92df9a38c8a5d7ad1e1ee0fef4e"
dependencies = [
"libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"mozjs-sys 0.0.0 (git+https://github.com/servo/mozjs)",
]
@ -711,6 +712,7 @@ dependencies = [
"html5ever 0.0.0 (git+https://github.com/servo/html5ever)",
"hyper 0.1.10 (git+https://github.com/servo/hyper?branch=servo)",
"js 0.1.0 (git+https://github.com/servo/rust-mozjs)",
"libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
"net 0.0.1",
"plugins 0.0.1",

4
ports/gonk/Cargo.lock generated
View file

@ -374,8 +374,9 @@ dependencies = [
[[package]]
name = "js"
version = "0.1.0"
source = "git+https://github.com/servo/rust-mozjs#f01d85186415afdaded8179ba7455534931778ca"
source = "git+https://github.com/servo/rust-mozjs#db08a4eacdb3d92df9a38c8a5d7ad1e1ee0fef4e"
dependencies = [
"libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"mozjs-sys 0.0.0 (git+https://github.com/servo/mozjs)",
]
@ -618,6 +619,7 @@ dependencies = [
"html5ever 0.0.0 (git+https://github.com/servo/html5ever)",
"hyper 0.1.10 (git+https://github.com/servo/hyper?branch=servo)",
"js 0.1.0 (git+https://github.com/servo/rust-mozjs)",
"libc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",
"net 0.0.1",
"plugins 0.0.1",