aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/range.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2019-07-31 11:20:43 -0400
committerGitHub <noreply@github.com>2019-07-31 11:20:43 -0400
commit174bcc443435100da31b20db5ab684f4f3c8255b (patch)
treecb22eaf3b552b3fac4bd06b70e42fbf3d30e369c /components/script/dom/range.rs
parent87e7e3d429f2122ffa9ef016ba5659a3b21be91b (diff)
parentc38c964f1b1d2614f50863be0b896e1700b5fea8 (diff)
downloadservo-174bcc443435100da31b20db5ab684f4f3c8255b.tar.gz
servo-174bcc443435100da31b20db5ab684f4f3c8255b.zip
Auto merge of #23870 - servo:rustup, r=nox
Upgrade to rustc 1.38.0-nightly (dddb7fca0 2019-07-30) <!-- 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/23870) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/range.rs')
-rw-r--r--components/script/dom/range.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/components/script/dom/range.rs b/components/script/dom/range.rs
index de17427664e..64a26fa0ba9 100644
--- a/components/script/dom/range.rs
+++ b/components/script/dom/range.rs
@@ -756,7 +756,7 @@ impl RangeMethods for Range {
};
// Step 6.
- Node::ensure_pre_insertion_validity(node, &parent, reference_node.deref())?;
+ Node::ensure_pre_insertion_validity(node, &parent, reference_node.as_deref())?;
// Step 7.
let split_text;
@@ -764,14 +764,14 @@ impl RangeMethods for Range {
Some(text) => {
split_text = text.SplitText(start_offset)?;
let new_reference = DomRoot::upcast::<Node>(split_text);
- assert!(new_reference.GetParentNode().deref() == Some(&parent));
+ assert!(new_reference.GetParentNode().as_deref() == Some(&parent));
Some(new_reference)
},
_ => reference_node,
};
// Step 8.
- let reference_node = if Some(node) == reference_node.deref() {
+ let reference_node = if Some(node) == reference_node.as_deref() {
node.GetNextSibling()
} else {
reference_node
@@ -794,7 +794,7 @@ impl RangeMethods for Range {
};
// Step 12.
- Node::pre_insert(node, &parent, reference_node.deref())?;
+ Node::pre_insert(node, &parent, reference_node.as_deref())?;
// Step 13.
if self.Collapsed() {
@@ -989,7 +989,7 @@ impl RangeMethods for Range {
};
// Step 2.
- let element = Element::fragment_parsing_context(&owner_doc, element.deref());
+ let element = Element::fragment_parsing_context(&owner_doc, element.as_deref());
// Step 3.
let fragment_node = element.parse_fragment(fragment)?;