diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-04-02 14:19:39 +0530 |
---|---|---|
committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-04-02 14:19:39 +0530 |
commit | 0760e56bb66e38a16543ed24385c29fd7c4a034b (patch) | |
tree | aa77de3c954e4a78eb67868a60d04639a04e42c4 /components/script/webdriver_handlers.rs | |
parent | f2b48d2764c88970d9fbf654e59fe135b6c79629 (diff) | |
parent | bf4db405e4d10cc4a2d665abf7e8c8d701254699 (diff) | |
download | servo-0760e56bb66e38a16543ed24385c29fd7c4a034b.tar.gz servo-0760e56bb66e38a16543ed24385c29fd7c4a034b.zip |
Auto merge of #10327 - frewsxcv:get-prefix, r=ms2ger
Remove `get_*` on getters as per RFC 0344.
https://github.com/rust-lang/rfcs/blob/master/text/0344-conventions-galore.md#gettersetter-apis
https://github.com/servo/servo/issues/6224
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10327)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/webdriver_handlers.rs')
-rw-r--r-- | components/script/webdriver_handlers.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/components/script/webdriver_handlers.rs b/components/script/webdriver_handlers.rs index e51a2e23804..acd375b6690 100644 --- a/components/script/webdriver_handlers.rs +++ b/components/script/webdriver_handlers.rs @@ -40,7 +40,7 @@ use util::str::DOMString; fn find_node_by_unique_id(page: &Rc<Page>, pipeline: PipelineId, node_id: String) -> Option<Root<Node>> { let page = get_page(&*page, pipeline); let document = page.document(); - document.upcast::<Node>().traverse_preorder().find(|candidate| candidate.get_unique_id() == node_id) + document.upcast::<Node>().traverse_preorder().find(|candidate| candidate.unique_id() == node_id) } #[allow(unsafe_code)] @@ -124,7 +124,7 @@ pub fn handle_find_element_css(page: &Rc<Page>, _pipeline: PipelineId, selector: reply: IpcSender<Result<Option<String>, ()>>) { reply.send(match page.document().QuerySelector(DOMString::from(selector)) { Ok(node) => { - Ok(node.map(|x| x.upcast::<Node>().get_unique_id())) + Ok(node.map(|x| x.upcast::<Node>().unique_id())) } Err(_) => Err(()) }).unwrap(); @@ -139,7 +139,7 @@ pub fn handle_find_elements_css(page: &Rc<Page>, let mut result = Vec::with_capacity(nodes.Length() as usize); for i in 0..nodes.Length() { if let Some(ref node) = nodes.Item(i) { - result.push(node.get_unique_id()); + result.push(node.unique_id()); } } Ok(result) @@ -173,7 +173,7 @@ pub fn handle_get_active_element(page: &Rc<Page>, _pipeline: PipelineId, reply: IpcSender<Option<String>>) { reply.send(page.document().GetActiveElement().map( - |elem| elem.upcast::<Node>().get_unique_id())).unwrap(); + |elem| elem.upcast::<Node>().unique_id())).unwrap(); } pub fn handle_get_title(page: &Rc<Page>, _pipeline: PipelineId, reply: IpcSender<String>) { |