diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-04-22 07:08:41 -0500 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-04-22 07:08:41 -0500 |
| commit | 886805d76c206214047c475c6f8947c8c38c40b7 (patch) | |
| tree | 590cb90eb09bd8600719c144a8a59da25592f597 /components/script/dom/bindings/trace.rs | |
| parent | 3a1bf45dea2ee7a9f4d8f299a2f1d05912b5e0a7 (diff) | |
| parent | 04b532e1fbb46b8761d0e47e6f5916046d9db488 (diff) | |
| download | servo-886805d76c206214047c475c6f8947c8c38c40b7.tar.gz servo-886805d76c206214047c475c6f8947c8c38c40b7.zip | |
Auto merge of #5790 - Ms2ger:new_rt_and_cx, r=jdm
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5790)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/bindings/trace.rs')
| -rw-r--r-- | components/script/dom/bindings/trace.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs index 3d32abb610a..10e13c90a5b 100644 --- a/components/script/dom/bindings/trace.rs +++ b/components/script/dom/bindings/trace.rs @@ -45,7 +45,7 @@ use hyper::header::Headers; use hyper::method::Method; use js::jsapi::{JSObject, JSTracer, JS_CallTracer, JSGCTraceKind}; use js::jsval::JSVal; -use js::rust::{Cx, rt}; +use js::rust::{Cx, Runtime}; use layout_interface::{LayoutRPC, LayoutChan}; use libc; use msg::constellation_msg::{PipelineId, SubpageId, WindowSizeData, WorkerId}; @@ -259,7 +259,7 @@ no_jsmanaged_fields!(SubpageId, WindowSizeData, PipelineId); no_jsmanaged_fields!(WorkerId); no_jsmanaged_fields!(QuirksMode); no_jsmanaged_fields!(Cx); -no_jsmanaged_fields!(rt); +no_jsmanaged_fields!(Runtime); no_jsmanaged_fields!(Headers, Method); no_jsmanaged_fields!(ConstellationChan); no_jsmanaged_fields!(LayoutChan); |