diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-09-19 17:47:27 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-19 17:47:27 -0400 |
commit | df2adebefdfa3da49f173e480fa1e56450f9bda2 (patch) | |
tree | 1f05b49bac02318455a59d5b143c186fd872bdb9 /components/script/dom/htmlformcontrolscollection.rs | |
parent | 2ca7a134736bb4759ff209c1bc0b6dc3cc1984c9 (diff) | |
parent | c37a345dc9f4dda6ea29c42f96f6c7201c42cbac (diff) | |
download | servo-df2adebefdfa3da49f173e480fa1e56450f9bda2.tar.gz servo-df2adebefdfa3da49f173e480fa1e56450f9bda2.zip |
Auto merge of #21737 - chansuke:format_script, r=jdm
Format script component
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix part of #21373.
- [x] These changes do not require tests because they format code only.
<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
<!-- 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/21737)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/htmlformcontrolscollection.rs')
-rw-r--r-- | components/script/dom/htmlformcontrolscollection.rs | 45 |
1 files changed, 30 insertions, 15 deletions
diff --git a/components/script/dom/htmlformcontrolscollection.rs b/components/script/dom/htmlformcontrolscollection.rs index 76398666f0f..b06810ca9fc 100644 --- a/components/script/dom/htmlformcontrolscollection.rs +++ b/components/script/dom/htmlformcontrolscollection.rs @@ -23,18 +23,25 @@ pub struct HTMLFormControlsCollection { } impl HTMLFormControlsCollection { - fn new_inherited(root: &Node, filter: Box<CollectionFilter + 'static>) -> HTMLFormControlsCollection { + fn new_inherited( + root: &Node, + filter: Box<CollectionFilter + 'static>, + ) -> HTMLFormControlsCollection { HTMLFormControlsCollection { - collection: HTMLCollection::new_inherited(root, filter) + collection: HTMLCollection::new_inherited(root, filter), } } - pub fn new(window: &Window, root: &Node, filter: Box<CollectionFilter + 'static>) - -> DomRoot<HTMLFormControlsCollection> - { - reflect_dom_object(Box::new(HTMLFormControlsCollection::new_inherited(root, filter)), - window, - HTMLFormControlsCollectionBinding::Wrap) + pub fn new( + window: &Window, + root: &Node, + filter: Box<CollectionFilter + 'static>, + ) -> DomRoot<HTMLFormControlsCollection> { + reflect_dom_object( + Box::new(HTMLFormControlsCollection::new_inherited(root, filter)), + window, + HTMLFormControlsCollectionBinding::Wrap, + ) } // FIXME: This shouldn't need to be implemented here since HTMLCollection (the parent of @@ -48,13 +55,18 @@ impl HTMLFormControlsCollectionMethods for HTMLFormControlsCollection { // https://html.spec.whatwg.org/multipage/#dom-htmlformcontrolscollection-nameditem fn NamedItem(&self, name: DOMString) -> Option<RadioNodeListOrElement> { // Step 1 - if name.is_empty() { return None; } + if name.is_empty() { + return None; + } let mut filter_map = self.collection.elements_iter().filter_map(|elem| { - if elem.get_string_attribute(&local_name!("name")) == name - || elem.get_string_attribute(&local_name!("id")) == name { + if elem.get_string_attribute(&local_name!("name")) == name || + elem.get_string_attribute(&local_name!("id")) == name + { Some(elem) - } else { None } + } else { + None + } }); if let Some(elem) = filter_map.next() { @@ -68,11 +80,14 @@ impl HTMLFormControlsCollectionMethods for HTMLFormControlsCollection { let list = once.chain(peekable.map(DomRoot::upcast)); let global = self.global(); let window = global.as_window(); - Some(RadioNodeListOrElement::RadioNodeList(RadioNodeList::new_simple_list(window, list))) + Some(RadioNodeListOrElement::RadioNodeList( + RadioNodeList::new_simple_list(window, list), + )) } // Step 3 - } else { None } - + } else { + None + } } // https://html.spec.whatwg.org/multipage/#dom-htmlformcontrolscollection-nameditem |