mirror of
https://github.com/servo/servo.git
synced 2025-08-06 06:00:15 +01:00
Update to string-cache 0.3
This commit is contained in:
parent
9fcc9d9d3f
commit
53b638c0e2
170 changed files with 1309 additions and 1050 deletions
|
@ -6,7 +6,7 @@
|
|||
|
||||
use dom::bindings::error::{Error, ErrorResult, Fallible};
|
||||
use dom::bindings::str::DOMString;
|
||||
use string_cache::{Atom, Namespace};
|
||||
use html5ever_atoms::{Prefix, LocalName, Namespace};
|
||||
|
||||
/// Validate a qualified name. See https://dom.spec.whatwg.org/#validate for details.
|
||||
pub fn validate_qualified_name(qualified_name: &str) -> ErrorResult {
|
||||
|
@ -27,7 +27,7 @@ pub fn validate_qualified_name(qualified_name: &str) -> ErrorResult {
|
|||
/// See https://dom.spec.whatwg.org/#validate-and-extract for details.
|
||||
pub fn validate_and_extract(namespace: Option<DOMString>,
|
||||
qualified_name: &str)
|
||||
-> Fallible<(Namespace, Option<Atom>, Atom)> {
|
||||
-> Fallible<(Namespace, Option<Prefix>, LocalName)> {
|
||||
// Step 1.
|
||||
let namespace = namespace_from_domstring(namespace);
|
||||
|
||||
|
@ -75,7 +75,7 @@ pub fn validate_and_extract(namespace: Option<DOMString>,
|
|||
},
|
||||
(ns, p) => {
|
||||
// Step 10.
|
||||
Ok((ns, p.map(Atom::from), Atom::from(local_name)))
|
||||
Ok((ns, p.map(Prefix::from), LocalName::from(local_name)))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -174,6 +174,6 @@ pub fn xml_name_type(name: &str) -> XMLName {
|
|||
pub fn namespace_from_domstring(url: Option<DOMString>) -> Namespace {
|
||||
match url {
|
||||
None => ns!(),
|
||||
Some(s) => Namespace(Atom::from(s)),
|
||||
Some(s) => Namespace::from(s),
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue