Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-22 23:03:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade to rustc 1.38.0-nightly (dddb7fca0 2019-07-30)

Browse source
This commit is contained in:
Simon Sapin 2019-07-31 13:34:01 +02:00
parent 87e7e3d429
commit c38c964f1b
38 changed files with 118 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

18
components/script/dom/element.rs
View file

@ -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() {