aboutsummaryrefslogtreecommitdiffstats
path: root/components/webdriver_server
diff options
context:
space:
mode:
authorAnthony Ramine <n.oxyde@gmail.com>2016-08-12 14:46:25 +0200
committerAnthony Ramine <n.oxyde@gmail.com>2016-08-12 18:37:27 +0200
commit7ad51dcd7aff7658914bcbdde0800fc2f87d9fa5 (patch)
tree7c3323204e3fb5d85edcb95b97748962e3978ae1 /components/webdriver_server
parenta22913569c2fa917015b23c27cb2f55de2a69ff2 (diff)
downloadservo-7ad51dcd7aff7658914bcbdde0800fc2f87d9fa5.tar.gz
servo-7ad51dcd7aff7658914bcbdde0800fc2f87d9fa5.zip
Update serde to 0.8 (fixes #12659)
Diffstat (limited to 'components/webdriver_server')
-rw-r--r--components/webdriver_server/Cargo.toml10
-rw-r--r--components/webdriver_server/lib.rs4
2 files changed, 7 insertions, 7 deletions
diff --git a/components/webdriver_server/Cargo.toml b/components/webdriver_server/Cargo.toml
index 5265dddc010..8c9c5fbde32 100644
--- a/components/webdriver_server/Cargo.toml
+++ b/components/webdriver_server/Cargo.toml
@@ -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"]}
diff --git a/components/webdriver_server/lib.rs b/components/webdriver_server/lib.rs
index eaa76dca177..ed38d1933a9 100644
--- a/components/webdriver_server/lib.rs
+++ b/components/webdriver_server/lib.rs
@@ -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)))
}