diff options
Diffstat (limited to 'components/script_traits')
| -rw-r--r-- | components/script_traits/Cargo.toml | 7 | ||||
| -rw-r--r-- | components/script_traits/lib.rs | 11 |
2 files changed, 10 insertions, 8 deletions
diff --git a/components/script_traits/Cargo.toml b/components/script_traits/Cargo.toml index 580897fcc58..3656990aafe 100644 --- a/components/script_traits/Cargo.toml +++ b/components/script_traits/Cargo.toml @@ -12,13 +12,14 @@ path = "lib.rs" [dependencies] bluetooth_traits = {path = "../bluetooth_traits"} canvas_traits = {path = "../canvas_traits"} -cookie = "0.10" +cookie = "0.11" devtools_traits = {path = "../devtools_traits"} embedder_traits = {path = "../embedder_traits"} euclid = "0.19" gfx_traits = {path = "../gfx_traits"} -hyper = "0.10" -hyper_serde = "0.8" +http = "0.1" +hyper = "0.12" +hyper_serde = "0.9" ipc-channel = "0.11" keyboard-types = {version = "0.4.2-servo", features = ["serde"]} libc = "0.2" diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs index cc9787d4721..6ac224d0b51 100644 --- a/components/script_traits/lib.rs +++ b/components/script_traits/lib.rs @@ -16,6 +16,7 @@ extern crate devtools_traits; extern crate embedder_traits; extern crate euclid; extern crate gfx_traits; +extern crate http; extern crate hyper; extern crate hyper_serde; extern crate ipc_channel; @@ -47,8 +48,8 @@ use canvas_traits::webgl::WebGLPipeline; use devtools_traits::{DevtoolScriptControlMsg, ScriptToDevtoolsControlMsg, WorkerId}; use euclid::{Length, Point2D, Vector2D, Rect, TypedSize2D, TypedScale}; use gfx_traits::Epoch; -use hyper::header::Headers; -use hyper::method::Method; +use http::HeaderMap; +use hyper::Method; use ipc_channel::{Error as IpcError}; use ipc_channel::ipc::{IpcReceiver, IpcSender}; use keyboard_types::KeyboardEvent; @@ -148,7 +149,7 @@ pub struct LoadData { deserialize_with = "::hyper_serde::deserialize", serialize_with = "::hyper_serde::serialize" )] - pub headers: Headers, + pub headers: HeaderMap, /// The data. pub data: Option<Vec<u8>>, /// The result of evaluating a javascript scheme url. @@ -180,8 +181,8 @@ impl LoadData { LoadData { url: url, creator_pipeline_id: creator_pipeline_id, - method: Method::Get, - headers: Headers::new(), + method: Method::GET, + headers: HeaderMap::new(), data: None, js_eval_result: None, referrer_policy: referrer_policy, |