Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-29 10:10:34 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update serde to 0.8 (fixes #12659)

Browse source
This commit is contained in:
Anthony Ramine 2016-08-12 14:46:25 +02:00
parent a22913569c
commit 7ad51dcd7a
70 changed files with 919 additions and 778 deletions
Download patch file Download diff file Expand all files Collapse all files

17
components/script_traits/Cargo.toml
View file

@ -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"}

1
components/script_traits/lib.rs
View file

@ -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;

12
components/script_traits/webdriver_msg.rs
View file

@ -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>, ()>>),