aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/element.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/element.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/element.rs')
-rw-r--r--components/script/dom/element.rs18
1 files changed, 9 insertions, 9 deletions
diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs
index 91d7a8aa450..4b16db4699e 100644
--- a/components/script/dom/element.rs
+++ b/components/script/dom/element.rs
@@ -1365,7 +1365,7 @@ impl Element {
ScriptThread::enqueue_callback_reaction(self, reaction, None);
}
- assert!(attr.GetOwnerElement().deref() == Some(self));
+ assert!(attr.GetOwnerElement().as_deref() == Some(self));
self.will_mutate_attr(attr);
self.attrs.borrow_mut().push(Dom::from_ref(attr));
if attr.namespace() == &ns!() {
@@ -1680,12 +1680,12 @@ impl Element {
}
},
AdjacentPosition::AfterBegin => {
- Node::pre_insert(node, &self_node, self_node.GetFirstChild().deref()).map(Some)
+ Node::pre_insert(node, &self_node, self_node.GetFirstChild().as_deref()).map(Some)
},
AdjacentPosition::BeforeEnd => Node::pre_insert(node, &self_node, None).map(Some),
AdjacentPosition::AfterEnd => {
if let Some(parent) = self_node.GetParentNode() {
- Node::pre_insert(node, &parent, self_node.GetNextSibling().deref()).map(Some)
+ Node::pre_insert(node, &parent, self_node.GetNextSibling().as_deref()).map(Some)
} else {
Ok(None)
}
@@ -1725,7 +1725,7 @@ impl Element {
}
// Step 9
- if doc.GetBody().deref() == self.downcast::<HTMLElement>() &&
+ if doc.GetBody().as_deref() == self.downcast::<HTMLElement>() &&
doc.quirks_mode() == QuirksMode::Quirks &&
!self.potentially_scrollable()
{
@@ -2194,7 +2194,7 @@ impl ElementMethods for Element {
}
// Step 7
- if doc.GetBody().deref() == self.downcast::<HTMLElement>() &&
+ if doc.GetBody().as_deref() == self.downcast::<HTMLElement>() &&
doc.quirks_mode() == QuirksMode::Quirks &&
!self.potentially_scrollable()
{
@@ -2244,7 +2244,7 @@ impl ElementMethods for Element {
}
// Step 9
- if doc.GetBody().deref() == self.downcast::<HTMLElement>() &&
+ if doc.GetBody().as_deref() == self.downcast::<HTMLElement>() &&
doc.quirks_mode() == QuirksMode::Quirks &&
!self.potentially_scrollable()
{
@@ -2290,7 +2290,7 @@ impl ElementMethods for Element {
}
// Step 7
- if doc.GetBody().deref() == self.downcast::<HTMLElement>() &&
+ if doc.GetBody().as_deref() == self.downcast::<HTMLElement>() &&
doc.quirks_mode() == QuirksMode::Quirks &&
!self.potentially_scrollable()
{
@@ -2341,7 +2341,7 @@ impl ElementMethods for Element {
}
// Step 9
- if doc.GetBody().deref() == self.downcast::<HTMLElement>() &&
+ if doc.GetBody().as_deref() == self.downcast::<HTMLElement>() &&
doc.quirks_mode() == QuirksMode::Quirks &&
!self.potentially_scrollable()
{
@@ -2856,7 +2856,7 @@ impl VirtualMethods for Element {
}
let fullscreen = doc.GetFullscreenElement();
- if fullscreen.deref() == Some(self) {
+ if fullscreen.as_deref() == Some(self) {
doc.exit_fullscreen();
}
if let Some(ref value) = *self.id_attribute.borrow() {