aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/bindings/utils.rs
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-07-01 07:54:15 -0600
committerbors-servo <metajack+bors@gmail.com>2015-07-01 07:54:15 -0600
commitfc1e427ff9bb0e9891053ec1eba292530ebbe91a (patch)
tree1e2d8ddacbab586dcfe2f147ca5b7caa5fafdf42 /components/script/dom/bindings/utils.rs
parente958d92be6c35234bcffce2d4e74ece585de02e4 (diff)
parent13072c7b0c35f661e5c66fbef1951625201e3fc8 (diff)
downloadservo-fc1e427ff9bb0e9891053ec1eba292530ebbe91a.tar.gz
servo-fc1e427ff9bb0e9891053ec1eba292530ebbe91a.zip
Auto merge of #6528 - mbrubeck:util_deps, r=Ms2ger
Reduce dependencies of the `util` crate Because almost all our main crates depend on util, we should keep its dependencies minimal to increase parallelism and reduce the amount of stuff rebuilt when upstream crates are changed. <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6528) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/bindings/utils.rs')
-rw-r--r--components/script/dom/bindings/utils.rs13
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)),
+ }
+}