aboutsummaryrefslogtreecommitdiffstats
path: root/components/msg
diff options
context:
space:
mode:
Diffstat (limited to 'components/msg')
-rw-r--r--components/msg/Cargo.toml13
-rw-r--r--components/msg/constellation_msg.rs4
-rw-r--r--components/msg/lib.rs1
3 files changed, 12 insertions, 6 deletions
diff --git a/components/msg/Cargo.toml b/components/msg/Cargo.toml
index 06e60c24054..f8795576a17 100644
--- a/components/msg/Cargo.toml
+++ b/components/msg/Cargo.toml
@@ -11,15 +11,16 @@ path = "lib.rs"
[dependencies]
bitflags = "0.7"
-cssparser = {version = "0.5.4", features = ["heap_size", "serde-serialization"]}
+cssparser = {version = "0.5.7", features = ["heap_size", "serde-serialization"]}
heapsize = "0.3.0"
heapsize_plugin = "0.1.2"
-hyper = {version = "0.9.9", features = ["serde-serialization"]}
-ipc-channel = "0.4.0"
+hyper = "0.9.9"
+hyper_serde = "0.1.4"
+ipc-channel = "0.5"
plugins = {path = "../plugins"}
-serde = "0.7.15"
-serde_macros = "0.7.15"
-url = {version = "1.0.0", features = ["heap_size", "serde"]}
+serde = "0.8"
+serde_macros = "0.8"
+url = {version = "1.2", features = ["heap_size", "serde"]}
[dependencies.webrender_traits]
git = "https://github.com/servo/webrender_traits"
diff --git a/components/msg/constellation_msg.rs b/components/msg/constellation_msg.rs
index 530bceaeb39..51e2a7635d1 100644
--- a/components/msg/constellation_msg.rs
+++ b/components/msg/constellation_msg.rs
@@ -191,7 +191,11 @@ pub struct Image {
#[derive(Clone, Deserialize, Serialize)]
pub struct LoadData {
pub url: Url,
+ #[serde(deserialize_with = "::hyper_serde::deserialize",
+ serialize_with = "::hyper_serde::serialize")]
pub method: Method,
+ #[serde(deserialize_with = "::hyper_serde::deserialize",
+ serialize_with = "::hyper_serde::serialize")]
pub headers: Headers,
pub data: Option<Vec<u8>>,
pub referrer_policy: Option<ReferrerPolicy>,
diff --git a/components/msg/lib.rs b/components/msg/lib.rs
index 13923b16b6e..af96cb541a4 100644
--- a/components/msg/lib.rs
+++ b/components/msg/lib.rs
@@ -12,6 +12,7 @@
extern crate bitflags;
extern crate heapsize;
extern crate hyper;
+extern crate hyper_serde;
extern crate ipc_channel;
extern crate serde;
extern crate url;