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/htmlheadelement.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/htmlheadelement.rs')
-rw-r--r-- | components/script/dom/htmlheadelement.rs | 42 |
1 files changed, 26 insertions, 16 deletions
diff --git a/components/script/dom/htmlheadelement.rs b/components/script/dom/htmlheadelement.rs index 6d88bcb08b3..de0c06a08e6 100644 --- a/components/script/dom/htmlheadelement.rs +++ b/components/script/dom/htmlheadelement.rs @@ -18,25 +18,31 @@ use html5ever::{LocalName, Prefix}; #[dom_struct] pub struct HTMLHeadElement { - htmlelement: HTMLElement + htmlelement: HTMLElement, } impl HTMLHeadElement { - fn new_inherited(local_name: LocalName, - prefix: Option<Prefix>, - document: &Document) -> HTMLHeadElement { + fn new_inherited( + local_name: LocalName, + prefix: Option<Prefix>, + document: &Document, + ) -> HTMLHeadElement { HTMLHeadElement { - htmlelement: HTMLElement::new_inherited(local_name, prefix, document) + htmlelement: HTMLElement::new_inherited(local_name, prefix, document), } } #[allow(unrooted_must_root)] - pub fn new(local_name: LocalName, - prefix: Option<Prefix>, - document: &Document) -> DomRoot<HTMLHeadElement> { - Node::reflect_node(Box::new(HTMLHeadElement::new_inherited(local_name, prefix, document)), - document, - HTMLHeadElementBinding::Wrap) + pub fn new( + local_name: LocalName, + prefix: Option<Prefix>, + document: &Document, + ) -> DomRoot<HTMLHeadElement> { + Node::reflect_node( + Box::new(HTMLHeadElement::new_inherited(local_name, prefix, document)), + document, + HTMLHeadElementBinding::Wrap, + ) } /// <https://html.spec.whatwg.org/multipage/#meta-referrer> @@ -48,11 +54,15 @@ impl HTMLHeadElement { } let node = self.upcast::<Node>(); - let candidates = node.traverse_preorder() - .filter_map(DomRoot::downcast::<Element>) - .filter(|elem| elem.is::<HTMLMetaElement>()) - .filter(|elem| elem.get_string_attribute(&local_name!("name")) == "referrer") - .filter(|elem| elem.get_attribute(&ns!(), &local_name!("content")).is_some()); + let candidates = node + .traverse_preorder() + .filter_map(DomRoot::downcast::<Element>) + .filter(|elem| elem.is::<HTMLMetaElement>()) + .filter(|elem| elem.get_string_attribute(&local_name!("name")) == "referrer") + .filter(|elem| { + elem.get_attribute(&ns!(), &local_name!("content")) + .is_some() + }); for meta in candidates { if let Some(content) = meta.get_attribute(&ns!(), &local_name!("content")).r() { |