aboutsummaryrefslogtreecommitdiffstats
path: root/components/webdriver_server/lib.rs
diff options
context:
space:
mode:
authorSimon Sapin <simon.sapin@exyr.org>2018-11-01 21:43:04 +0100
committerSimon Sapin <simon.sapin@exyr.org>2018-11-08 09:28:00 +0100
commit2012be4a8bd97f2fd69f986c8fffb1af1eec21dc (patch)
treec9f1ef91146253f72987cb1436866523880965e0 /components/webdriver_server/lib.rs
parentb1fd6237d1304f3d57abdafd3e6e738c1ece9f83 (diff)
downloadservo-2012be4a8bd97f2fd69f986c8fffb1af1eec21dc.tar.gz
servo-2012be4a8bd97f2fd69f986c8fffb1af1eec21dc.zip
`cargo fix --edition-idioms`
Diffstat (limited to 'components/webdriver_server/lib.rs')
-rw-r--r--components/webdriver_server/lib.rs25
1 files changed, 5 insertions, 20 deletions
diff --git a/components/webdriver_server/lib.rs b/components/webdriver_server/lib.rs
index c199eddee28..40339bf14d9 100644
--- a/components/webdriver_server/lib.rs
+++ b/components/webdriver_server/lib.rs
@@ -6,30 +6,15 @@
#![crate_type = "rlib"]
#![deny(unsafe_code)]
-extern crate base64;
-extern crate cookie as cookie_rs;
-extern crate euclid;
-extern crate hyper;
-extern crate image;
-extern crate ipc_channel;
-extern crate keyboard_types;
#[macro_use]
extern crate log;
-extern crate msg;
-extern crate net_traits;
-extern crate regex;
-extern crate script_traits;
#[macro_use]
extern crate serde;
-extern crate serde_json;
-extern crate servo_channel;
-extern crate servo_config;
-extern crate servo_url;
-extern crate uuid;
-extern crate webdriver;
mod keys;
+use base64;
+use cookie;
use crate::keys::keycodes_to_keys;
use euclid::TypedSize2D;
use hyper::Method;
@@ -45,7 +30,7 @@ use script_traits::webdriver_msg::{
use script_traits::{ConstellationMsg, LoadData, WebDriverCommandMsg};
use serde::de::{Deserialize, Deserializer, MapAccess, Visitor};
use serde::ser::{Serialize, Serializer};
-use serde_json::Value;
+use serde_json::{self, Value};
use servo_channel::Sender;
use servo_config::prefs::{PrefValue, PREFS};
use servo_url::ServoUrl;
@@ -91,7 +76,7 @@ fn extension_routes() -> Vec<(Method, &'static str, ServoExtensionRoute)> {
];
}
-fn cookie_msg_to_cookie(cookie: cookie_rs::Cookie) -> Cookie {
+fn cookie_msg_to_cookie(cookie: cookie::Cookie) -> Cookie {
Cookie {
name: cookie.name().to_owned(),
value: cookie.value().to_owned(),
@@ -920,7 +905,7 @@ impl Handler {
) -> WebDriverResult<WebDriverResponse> {
let (sender, receiver) = ipc::channel().unwrap();
- let cookie = cookie_rs::Cookie::build(params.name.to_owned(), params.value.to_owned())
+ let cookie = cookie::Cookie::build(params.name.to_owned(), params.value.to_owned())
.secure(params.secure)
.http_only(params.httpOnly);
let cookie = match params.domain {