diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-01-03 08:11:09 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-03 08:11:09 -0800 |
commit | 68ecb0484739ffacc4e76b4cbf54bcf20e5cca2b (patch) | |
tree | d2b506d5f8093f305021d27d28abcc246ad183a8 /components/script_traits/webdriver_msg.rs | |
parent | 672f099c95f8b5b98b762beb2a36957e32713940 (diff) | |
parent | b46846e2a01ad38e7c8c4cf0099dfd94d74faa6d (diff) | |
download | servo-68ecb0484739ffacc4e76b4cbf54bcf20e5cca2b.tar.gz servo-68ecb0484739ffacc4e76b4cbf54bcf20e5cca2b.zip |
Auto merge of #14831 - servo:rustfmt-traits, r=nox
Rustfmt script_traits and net_traits.
CC #8553.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14831)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script_traits/webdriver_msg.rs')
-rw-r--r-- | components/script_traits/webdriver_msg.rs | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/components/script_traits/webdriver_msg.rs b/components/script_traits/webdriver_msg.rs index b8c102ee4a2..9fe9e9b80f5 100644 --- a/components/script_traits/webdriver_msg.rs +++ b/components/script_traits/webdriver_msg.rs @@ -14,12 +14,10 @@ use servo_url::ServoUrl; #[derive(Deserialize, Serialize)] pub enum WebDriverScriptCommand { - AddCookie( - #[serde(deserialize_with = "::hyper_serde::deserialize", + AddCookie(#[serde(deserialize_with = "::hyper_serde::deserialize", serialize_with = "::hyper_serde::serialize")] - Cookie, - IpcSender<Result<(), WebDriverCookieError>> - ), + Cookie, + IpcSender<Result<(), WebDriverCookieError>>), ExecuteScript(String, IpcSender<WebDriverJSResult>), ExecuteAsyncScript(String, IpcSender<WebDriverJSResult>), FindElementCSS(String, IpcSender<Result<Option<String>, ()>>), @@ -37,13 +35,13 @@ pub enum WebDriverScriptCommand { GetUrl(IpcSender<ServoUrl>), IsEnabled(String, IpcSender<Result<bool, ()>>), IsSelected(String, IpcSender<Result<bool, ()>>), - GetTitle(IpcSender<String>) + GetTitle(IpcSender<String>), } #[derive(Deserialize, Serialize)] pub enum WebDriverCookieError { InvalidDomain, - UnableToSetCookie + UnableToSetCookie, } #[derive(Deserialize, Serialize)] @@ -52,8 +50,7 @@ pub enum WebDriverJSValue { Null, Boolean(bool), Number(f64), - String(String), - // TODO: Object and WebElement + String(String), // TODO: Object and WebElement } #[derive(Deserialize, Serialize)] @@ -62,7 +59,7 @@ pub enum WebDriverJSError { UnknownType, /// Occurs when handler received an event message for a layout channel that is not /// associated with the current script thread - BrowsingContextNotFound + BrowsingContextNotFound, } pub type WebDriverJSResult = Result<WebDriverJSValue, WebDriverJSError>; @@ -71,7 +68,7 @@ pub type WebDriverJSResult = Result<WebDriverJSValue, WebDriverJSError>; pub enum WebDriverFrameId { Short(u16), Element(String), - Parent + Parent, } impl ToJson for WebDriverJSValue { @@ -81,7 +78,7 @@ impl ToJson for WebDriverJSValue { WebDriverJSValue::Null => Json::Null, WebDriverJSValue::Boolean(ref x) => x.to_json(), WebDriverJSValue::Number(ref x) => x.to_json(), - WebDriverJSValue::String(ref x) => x.to_json() + WebDriverJSValue::String(ref x) => x.to_json(), } } } @@ -89,5 +86,5 @@ impl ToJson for WebDriverJSValue { #[derive(Deserialize, Serialize)] pub enum LoadStatus { LoadComplete, - LoadTimeout + LoadTimeout, } |