auto merge of #5208 : Ms2ger/servo/USVString, r=jdm

1 files changed, 5 insertions, 4 deletions

diff --git a/components/script/dom/location.rs b/components/script/dom/location.rs
index 13cc1a05c65..4f02a7952b7 100644
--- a/components/script/dom/location.rs
+++ b/components/script/dom/location.rs
@@ -6,6 +6,7 @@ use dom::bindings::codegen::Bindings::LocationBinding;
 use dom::bindings::codegen::Bindings::LocationBinding::LocationMethods;
 use dom::bindings::global::GlobalRef;
 use dom::bindings::js::{JS, JSRef, Temporary};
+use dom::bindings::str::USVString;
 use dom::bindings::utils::{Reflector, reflect_dom_object};
 use dom::urlhelper::UrlHelper;
 use dom::window::Window;
@@ -41,19 +42,19 @@ impl<'a> LocationMethods for JSRef<'a, Location> {
         self.window.root().r().load_url(url);
     }
 
-    fn Href(self) -> DOMString {
+    fn Href(self) -> USVString {
         UrlHelper::Href(&self.get_url())
     }
 
     fn Stringify(self) -> DOMString {
-        self.Href()
+        self.Href().0
     }
 
-    fn Search(self) -> DOMString {
+    fn Search(self) -> USVString {
         UrlHelper::Search(&self.get_url())
     }
 
-    fn Hash(self) -> DOMString {
+    fn Hash(self) -> USVString {
         UrlHelper::Hash(&self.get_url())
     }
 }