diff options
| author | Anthony Ramine <n.oxyde@gmail.com> | 2016-08-12 14:46:25 +0200 |
|---|---|---|
| committer | Anthony Ramine <n.oxyde@gmail.com> | 2016-08-12 18:37:27 +0200 |
| commit | 7ad51dcd7aff7658914bcbdde0800fc2f87d9fa5 (patch) | |
| tree | 7c3323204e3fb5d85edcb95b97748962e3978ae1 /components/script_traits | |
| parent | a22913569c2fa917015b23c27cb2f55de2a69ff2 (diff) | |
| download | servo-7ad51dcd7aff7658914bcbdde0800fc2f87d9fa5.tar.gz servo-7ad51dcd7aff7658914bcbdde0800fc2f87d9fa5.zip | |
Update serde to 0.8 (fixes #12659)
Diffstat (limited to 'components/script_traits')
| -rw-r--r-- | components/script_traits/Cargo.toml | 17 | ||||
| -rw-r--r-- | components/script_traits/lib.rs | 1 | ||||
| -rw-r--r-- | components/script_traits/webdriver_msg.rs | 12 |
3 files changed, 19 insertions, 11 deletions
diff --git a/components/script_traits/Cargo.toml b/components/script_traits/Cargo.toml index 86c0361481d..5e9b1877c3e 100644 --- a/components/script_traits/Cargo.toml +++ b/components/script_traits/Cargo.toml @@ -10,26 +10,27 @@ name = "script_traits" path = "lib.rs" [dependencies] -app_units = "0.2.5" +app_units = "0.3" canvas_traits = {path = "../canvas_traits"} -cookie = { version = "0.2.5", features = ["serialize-rustc", "serialize-serde"]} +cookie = {version = "0.2.5", features = ["serialize-rustc"]} devtools_traits = {path = "../devtools_traits"} -euclid = "0.8.2" +euclid = "0.9" gfx_traits = {path = "../gfx_traits"} heapsize = "0.3.0" heapsize_plugin = "0.1.2" -ipc-channel = "0.4.0" +hyper_serde = "0.1.4" +ipc-channel = "0.5" layers = {git = "https://github.com/servo/rust-layers", features = ["plugins"]} libc = "0.2" msg = {path = "../msg"} net_traits = {path = "../net_traits"} -offscreen_gl_context = "0.2.0" +offscreen_gl_context = "0.3" plugins = {path = "../plugins"} profile_traits = {path = "../profile_traits"} rustc-serialize = "0.3.4" -serde = "0.7.15" -serde_macros = "0.7.15" +serde = "0.8" +serde_macros = "0.8" style_traits = {path = "../style_traits", features = ["servo"]} time = "0.1.12" -url = {version = "1.0.0", features = ["heap_size"]} +url = {version = "1.2", features = ["heap_size"]} util = {path = "../util"} diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs index 0bc9225d42c..aa61920e32b 100644 --- a/components/script_traits/lib.rs +++ b/components/script_traits/lib.rs @@ -18,6 +18,7 @@ extern crate devtools_traits; extern crate euclid; extern crate gfx_traits; extern crate heapsize; +extern crate hyper_serde; extern crate ipc_channel; extern crate layers; extern crate libc; diff --git a/components/script_traits/webdriver_msg.rs b/components/script_traits/webdriver_msg.rs index 09d3c9e9e1c..788dbd5ad36 100644 --- a/components/script_traits/webdriver_msg.rs +++ b/components/script_traits/webdriver_msg.rs @@ -6,6 +6,7 @@ use cookie_rs::Cookie; use euclid::rect::Rect; +use hyper_serde::Serde; use ipc_channel::ipc::IpcSender; use msg::constellation_msg::PipelineId; use rustc_serialize::json::{Json, ToJson}; @@ -13,15 +14,20 @@ use url::Url; #[derive(Deserialize, Serialize)] pub enum WebDriverScriptCommand { - AddCookie(Cookie, IpcSender<Result<(), WebDriverCookieError>>), + AddCookie( + #[serde(deserialize_with = "::hyper_serde::deserialize", + serialize_with = "::hyper_serde::serialize")] + Cookie, + IpcSender<Result<(), WebDriverCookieError>> + ), ExecuteScript(String, IpcSender<WebDriverJSResult>), ExecuteAsyncScript(String, IpcSender<WebDriverJSResult>), FindElementCSS(String, IpcSender<Result<Option<String>, ()>>), FindElementsCSS(String, IpcSender<Result<Vec<String>, ()>>), FocusElement(String, IpcSender<Result<(), ()>>), GetActiveElement(IpcSender<Option<String>>), - GetCookie(String, IpcSender<Vec<Cookie>>), - GetCookies(IpcSender<Vec<Cookie>>), + GetCookie(String, IpcSender<Vec<Serde<Cookie>>>), + GetCookies(IpcSender<Vec<Serde<Cookie>>>), GetElementAttribute(String, String, IpcSender<Result<Option<String>, ()>>), GetElementCSS(String, String, IpcSender<Result<String, ()>>), GetElementRect(String, IpcSender<Result<Rect<f64>, ()>>), |