Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

Refactor Error enum usage to consistently be qualified

Browse source
This commit is contained in:
Anthony Urena 2015-10-06 05:43:52 -04:00
parent 94816bb3b4
commit ba86131cd5
19 changed files with 139 additions and 161 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,7 +11,6 @@ use dom::bindings::codegen::Bindings::RangeBinding::{self, RangeConstants};
use dom::bindings::codegen::Bindings::TextBinding::TextMethods;
use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods;
use dom::bindings::codegen::InheritTypes::{CharacterDataCast, NodeCast, TextCast, TextDerived};
use dom::bindings::error::Error::HierarchyRequest;
use dom::bindings::error::{Error, ErrorResult, Fallible};
use dom::bindings::global::GlobalRef;
use dom::bindings::js::{JS, Root, RootedReference};
@ -117,7 +116,7 @@ impl Range {
// Step 12.
if contained_children.iter().any(|n| n.is_doctype()) {
return Err(HierarchyRequest);
return Err(Error::HierarchyRequest);
}
Ok((first_contained_child, last_contained_child, contained_children))
@ -597,7 +596,7 @@ impl RangeMethods for Range {
match start_node.type_id() {
// Handled under step 2.
NodeTypeId::CharacterData(CharacterDataTypeId::Text) => (),
NodeTypeId::CharacterData(_) => return Err(HierarchyRequest),
NodeTypeId::CharacterData(_) => return Err(Error::HierarchyRequest),
_ => ()
}
@ -608,7 +607,7 @@ impl RangeMethods for Range {
let parent = match start_node.GetParentNode() {
Some(parent) => parent,
// Step 1.
None => return Err(HierarchyRequest)
None => return Err(Error::HierarchyRequest)
};
// Step 5.
(Some(Root::from_ref(start_node.r())), parent)