Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-10 09:33:13 +00: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

10
components/webdriver_server/Cargo.toml
View file

@ -10,18 +10,18 @@ name = "webdriver_server"
path = "lib.rs"
[dependencies]
euclid = "0.8.2"
euclid = "0.9"
hyper = "0.9.9"
image = "0.10"
ipc-channel = "0.4.0"
ipc-channel = "0.5"
log = "0.3.5"
msg = {path = "../msg"}
plugins = {path = "../plugins"}
regex = "0.1.55"
rustc-serialize = "0.3.4"
script_traits = {path = "../script_traits"}
url = {version = "1.0.0", features = ["heap_size"]}
url = {version = "1.2", features = ["heap_size"]}
util = {path = "../util"}
uuid = { version = "0.2", features = ["v4"] }
uuid = { version = "0.3", features = ["v4"] }
webdriver = "0.9"
cookie = { version = "0.2.5", features = ["serialize-serde", "serialize-rustc" ] }
cookie = {version = "0.2.5", features = ["serialize-rustc"]}

4
components/webdriver_server/lib.rs
View file

@ -643,7 +643,7 @@ impl Handler {
try!(self.frame_script_command(WebDriverScriptCommand::GetCookies(sender)));
let cookies = receiver.recv().unwrap();
let response = cookies.into_iter().map(|cookie| {
cookie_msg_to_cookie(cookie)
cookie_msg_to_cookie(cookie.into_inner())
}).collect::<Vec<Cookie>>();
Ok(WebDriverResponse::Cookie(CookieResponse::new(response)))
}
@ -653,7 +653,7 @@ impl Handler {
try!(self.frame_script_command(WebDriverScriptCommand::GetCookie(name.to_owned(), sender)));
let cookies = receiver.recv().unwrap();
let response = cookies.into_iter().map(|cookie| {
cookie_msg_to_cookie(cookie)
cookie_msg_to_cookie(cookie.into_inner())
}).collect::<Vec<Cookie>>();
Ok(WebDriverResponse::Cookie(CookieResponse::new(response)))
}