From d191874479356a9250786ab68bf977cdfd244d5a Mon Sep 17 00:00:00 2001 From: hundredeir <20334754+hundredeir@users.noreply.github.com> Date: Sat, 6 Apr 2019 23:40:01 +0530 Subject: [PATCH] Formatted code --- components/script/script_thread.rs | 2 +- components/script/webdriver_handlers.rs | 9 +++---- components/webdriver_server/lib.rs | 32 +++++++++++++++---------- 3 files changed, 25 insertions(+), 18 deletions(-) diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs index e9afeed8cd5..6a89aa1edf5 100644 --- a/components/script/script_thread.rs +++ b/components/script/script_thread.rs @@ -1872,7 +1872,7 @@ impl ScriptThread { reply, ) }, - WebDriverScriptCommand::FindElementElementsCSS(selector,element_id,reply) => { + WebDriverScriptCommand::FindElementElementsCSS(selector, element_id, reply) => { webdriver_handlers::handle_find_element_elements_css( &*documents, pipeline_id, diff --git a/components/script/webdriver_handlers.rs b/components/script/webdriver_handlers.rs index e3723ac51cd..428f8b283f8 100644 --- a/components/script/webdriver_handlers.rs +++ b/components/script/webdriver_handlers.rs @@ -226,11 +226,12 @@ pub fn handle_find_element_elements_css( element_id: String, selector: String, reply: IpcSender, ()>>, -){ - let node_ids = find_node_by_unique_id(documents,pipeline,element_id) +) { + let node_ids = find_node_by_unique_id(documents, pipeline, element_id) .ok_or(()) - .and_then(|node|{ - node.query_selector_all(DOMString::from(selector)).map_err(|_| ()) + .and_then(|node| { + node.query_selector_all(DOMString::from(selector)) + .map_err(|_| ()) }) .map(|nodes| { nodes diff --git a/components/webdriver_server/lib.rs b/components/webdriver_server/lib.rs index 966e6d91ddf..c7980d31bff 100644 --- a/components/webdriver_server/lib.rs +++ b/components/webdriver_server/lib.rs @@ -803,36 +803,42 @@ impl Handler { } } - // https://w3c.github.io/webdriver/#find-elements-from-element - fn handle_find_element_elements(&self, - element: &WebElement, parameters: &LocatorParameters - ) -> WebDriverResult{ + fn handle_find_element_elements( + &self, + element: &WebElement, + parameters: &LocatorParameters, + ) -> WebDriverResult { if parameters.using != LocatorStrategy::CSSSelector { return Err(WebDriverError::new( ErrorStatus::UnsupportedOperation, - "Unsupported locator strategy" + "Unsupported locator strategy", )); } - let (sender,receiver) = ipc::channel().unwrap(); + let (sender, receiver) = ipc::channel().unwrap(); let cmd = WebDriverScriptCommand::FindElementElementsCSS( - parameters.value.clone(),element.id.clone(),sender); + parameters.value.clone(), + element.id.clone(), + sender, + ); self.browsing_context_script_command(cmd)?; - match receiver.recv().unwrap(){ + match receiver.recv().unwrap() { Ok(value) => { - let value_resp = value.into_iter() //maybe into_iter is superfluous - .map(|x| serde_json::to_value(WebElement::new(x)) .unwrap()) + let value_resp = value + .into_iter() //maybe into_iter is superfluous + .map(|x| serde_json::to_value(WebElement::new(x)).unwrap()) .collect::>(); let value_resp = serde_json::to_value(value_resp).unwrap(); Ok(WebDriverResponse::Generic(ValueResponse(value_resp))) }, Err(_) => Err(WebDriverError::new( - ErrorStatus::InvalidSelector,"Invalid Selector",)) + ErrorStatus::InvalidSelector, + "Invalid Selector", + )), } - } // https://w3c.github.io/webdriver/webdriver-spec.html#get-element-rect @@ -1274,7 +1280,7 @@ impl WebDriverHandler for Handler { WebDriverCommand::FindElementElement(ref element, ref parameters) => { self.handle_find_element_element(element, parameters) }, - WebDriverCommand::FindElementElements(ref element,ref parameters) => { + WebDriverCommand::FindElementElements(ref element, ref parameters) => { self.handle_find_element_elements(element, parameters) }, WebDriverCommand::GetNamedCookie(ref name) => self.handle_get_cookie(name),