Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-22 14:53:49 +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

10
components/script/dom/range.rs
View file

@ -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)?;