diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-05-10 08:58:33 -0500 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-05-10 08:58:33 -0500 |
| commit | 54b1c9af11f77ae9e4e92531a12b2a1dc1aa10f7 (patch) | |
| tree | d9fe4eaa4362fbffb33bef8ecf3d9b82d5e6a9bb | |
| parent | 49b73c0bfe50366e767525f9f90c5aa348f68f18 (diff) | |
| parent | 076d15992aaa1c75a2de8241f79ca1ebdf09b5f7 (diff) | |
| download | servo-54b1c9af11f77ae9e4e92531a12b2a1dc1aa10f7.tar.gz servo-54b1c9af11f77ae9e4e92531a12b2a1dc1aa10f7.zip | |
Auto merge of #6000 - Ms2ger:update-js, r=jdm
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6000)
<!-- Reviewable:end -->
| -rw-r--r-- | components/script/script_task.rs | 2 | ||||
| -rw-r--r-- | components/servo/Cargo.lock | 2 | ||||
| -rw-r--r-- | ports/cef/Cargo.lock | 2 | ||||
| -rw-r--r-- | ports/gonk/Cargo.lock | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/components/script/script_task.rs b/components/script/script_task.rs index 12ae363c95b..926d8567b46 100644 --- a/components/script/script_task.rs +++ b/components/script/script_task.rs @@ -80,7 +80,7 @@ use hyper::header::{LastModified, Headers}; use js::jsapi::{JS_SetWrapObjectCallbacks, JS_SetExtraGCRootsTracer}; use js::jsapi::{JSContext, JSRuntime, JSObject, JSTracer}; use js::jsapi::{JS_SetGCCallback, JSGCStatus, JSGC_BEGIN, JSGC_END}; -use js::rust::{Runtime, RtUtils}; +use js::rust::Runtime; use url::Url; use libc; diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 2f95be12aa2..e2d46c3cb25 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -579,7 +579,7 @@ dependencies = [ [[package]] name = "js" version = "0.1.0" -source = "git+https://github.com/servo/rust-mozjs#30a1ad31d1ee47a8e4e1ef582e793badfb405fa0" +source = "git+https://github.com/servo/rust-mozjs#2f745ff00f2ad7fdc89053af9adc99200a8019a1" dependencies = [ "libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 6d3248bbc62..b3137f2535e 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -581,7 +581,7 @@ dependencies = [ [[package]] name = "js" version = "0.1.0" -source = "git+https://github.com/servo/rust-mozjs#30a1ad31d1ee47a8e4e1ef582e793badfb405fa0" +source = "git+https://github.com/servo/rust-mozjs#2f745ff00f2ad7fdc89053af9adc99200a8019a1" dependencies = [ "libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index 6078ce1206b..b5053706d5d 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -479,7 +479,7 @@ dependencies = [ [[package]] name = "js" version = "0.1.0" -source = "git+https://github.com/servo/rust-mozjs#30a1ad31d1ee47a8e4e1ef582e793badfb405fa0" +source = "git+https://github.com/servo/rust-mozjs#2f745ff00f2ad7fdc89053af9adc99200a8019a1" dependencies = [ "libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", |