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

Consistently name enum members in dom::bindings::error::Error

Browse source 
Fixes #5521
This commit is contained in:
Eric Hegnes 2015-04-04 23:57:00 -04:00
parent b63fb0c0a7
commit e398725242
6 changed files with 27 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -26,7 +26,8 @@ use dom::bindings::codegen::InheritTypes::{HTMLTableSectionElementDerived, NodeC
use dom::bindings::codegen::InheritTypes::HTMLAnchorElementCast;
use dom::bindings::codegen::InheritTypes::HTMLFormElementDerived;
use dom::bindings::error::{ErrorResult, Fallible};
use dom::bindings::error::Error::{NamespaceError, InvalidCharacter, Syntax};
use dom::bindings::error::Error;
use dom::bindings::error::Error::{InvalidCharacter, Syntax};
use dom::bindings::js::{MutNullableJS, JS, JSRef, LayoutJS, Temporary, TemporaryPushable};
use dom::bindings::js::OptionalRootable;
use dom::bindings::trace::RootedVec;
@ -1020,7 +1021,7 @@ impl<'a> ElementMethods for JSRef<'a, Element> {
// Step 2.
InvalidXMLName => return Err(InvalidCharacter),
// Step 3.
Name => return Err(NamespaceError),
Name => return Err(Error::Namespace),
QName => {}
}
@ -1030,17 +1031,17 @@ impl<'a> ElementMethods for JSRef<'a, Element> {
if let Some(ref prefix_str) = prefix {
// Step 5.
if namespace == ns!("") {
return Err(NamespaceError);
return Err(Error::Namespace);
}
// Step 6.
if "xml" == *prefix_str && namespace != ns!(XML) {
return Err(NamespaceError);
return Err(Error::Namespace);
}
// Step 7b.
if "xmlns" == *prefix_str && namespace != ns!(XMLNS) {
return Err(NamespaceError);
return Err(Error::Namespace);
}
}
@ -1050,12 +1051,12 @@ impl<'a> ElementMethods for JSRef<'a, Element> {
// Step 7a.
if xmlns == name && namespace != ns!(XMLNS) {
return Err(NamespaceError);
return Err(Error::Namespace);
}
// Step 8.
if namespace == ns!(XMLNS) && xmlns != name && Some("xmlns") != prefix {
return Err(NamespaceError);
return Err(Error::Namespace);
}
// Step 9.