diff options
author | Matt Brubeck <mbrubeck@limpet.net> | 2015-07-01 09:55:23 -0700 |
---|---|---|
committer | Matt Brubeck <mbrubeck@limpet.net> | 2015-07-01 10:04:53 -0700 |
commit | 13072c7b0c35f661e5c66fbef1951625201e3fc8 (patch) | |
tree | e400e4926cfcb603be254ff7456320967ca4192a /components/script/dom/bindings/utils.rs | |
parent | efa60d3a24529cc1b99822f2b1204b799bc78bb2 (diff) | |
download | servo-13072c7b0c35f661e5c66fbef1951625201e3fc8.tar.gz servo-13072c7b0c35f661e5c66fbef1951625201e3fc8.zip |
Remove string_cache dependency from util.
Move `namespace::from_domstring` from util to script::dom, because it is used
only in that crate.
Diffstat (limited to 'components/script/dom/bindings/utils.rs')
-rw-r--r-- | components/script/dom/bindings/utils.rs | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/components/script/dom/bindings/utils.rs b/components/script/dom/bindings/utils.rs index e2db66ac3de..9e5931c2740 100644 --- a/components/script/dom/bindings/utils.rs +++ b/components/script/dom/bindings/utils.rs @@ -16,7 +16,6 @@ use dom::bindings::js::Root; use dom::bindings::trace::trace_object; use dom::browsercontext; use dom::window; -use util::namespace; use util::str::DOMString; use libc; @@ -830,7 +829,7 @@ pub const DOM_CALLBACKS: DOMCallbacks = DOMCallbacks { pub fn validate_and_extract(namespace: Option<DOMString>, qualified_name: &str) -> Fallible<(Namespace, Option<Atom>, Atom)> { // Step 1. - let namespace = namespace::from_domstring(namespace); + let namespace = namespace_from_domstring(namespace); // Step 2. try!(validate_qualified_name(qualified_name)); @@ -966,3 +965,13 @@ pub fn xml_name_type(name: &str) -> XMLName { true => XMLName::Name } } + +/// Convert a possibly-null URL to a namespace. +/// +/// If the URL is None, returns the empty namespace. +pub fn namespace_from_domstring(url: Option<DOMString>) -> Namespace { + match url { + None => ns!(""), + Some(ref s) => Namespace(Atom::from_slice(s)), + } +} |