diff options
author | Ms2ger <ms2ger@gmail.com> | 2015-01-01 12:20:52 +0100 |
---|---|---|
committer | Ms2ger <ms2ger@gmail.com> | 2015-01-01 20:36:43 +0100 |
commit | 1dad710063e601d3560b0cf89c602d16a0a48657 (patch) | |
tree | 400c86753feef6e0949cb2fabd5a1ee84f5812f3 /components/script/dom/htmlserializer.rs | |
parent | c9f26dfd599bd50deac9e120bd54c9dbdfe40ae0 (diff) | |
download | servo-1dad710063e601d3560b0cf89c602d16a0a48657.tar.gz servo-1dad710063e601d3560b0cf89c602d16a0a48657.zip |
Replace Root::deref() calls by Root::r() calls where possible.
This changes those calls that were already sound.
Diffstat (limited to 'components/script/dom/htmlserializer.rs')
-rw-r--r-- | components/script/dom/htmlserializer.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/components/script/dom/htmlserializer.rs b/components/script/dom/htmlserializer.rs index 97526ce5f4e..0ff300f97f1 100644 --- a/components/script/dom/htmlserializer.rs +++ b/components/script/dom/htmlserializer.rs @@ -71,8 +71,8 @@ fn serialize_comment(comment: JSRef<Comment>, html: &mut String) { fn serialize_text(text: JSRef<Text>, html: &mut String) { let text_node: JSRef<Node> = NodeCast::from_ref(text); match text_node.parent_node().map(|node| node.root()) { - Some(ref parent) if parent.is_element() => { - let elem: JSRef<Element> = ElementCast::to_ref(**parent).unwrap(); + Some(ref parent) if parent.r().is_element() => { + let elem: JSRef<Element> = ElementCast::to_ref(parent.r()).unwrap(); match elem.local_name().as_slice() { "style" | "script" | "xmp" | "iframe" | "noembed" | "noframes" | "plaintext" | @@ -105,7 +105,7 @@ fn serialize_elem(elem: JSRef<Element>, open_elements: &mut Vec<String>, html: & html.push_str(elem.local_name().as_slice()); for attr in elem.attrs().iter() { let attr = attr.root(); - serialize_attr(*attr, html); + serialize_attr(attr.r(), html); }; html.push('>'); @@ -113,8 +113,8 @@ fn serialize_elem(elem: JSRef<Element>, open_elements: &mut Vec<String>, html: & "pre" | "listing" | "textarea" if *elem.namespace() == ns!(HTML) => { let node: JSRef<Node> = NodeCast::from_ref(elem); match node.first_child().map(|child| child.root()) { - Some(ref child) if child.is_text() => { - let text: JSRef<CharacterData> = CharacterDataCast::to_ref(**child).unwrap(); + Some(ref child) if child.r().is_text() => { + let text: JSRef<CharacterData> = CharacterDataCast::to_ref(child.r()).unwrap(); if text.data().len() > 0 && text.data().as_slice().char_at(0) == '\n' { html.push('\x0A'); } |