Make DOMString a newtype around String, rather than a typedef.

This should make it somewhat easier to experiment with alternative
representations in the future. To reduce churn, this commit leaves the String
field public, though.

Also, this will allow us to use the default String type to represent the IDL
USVString type, which explicitly forbids unpaired surrogates, ans as such is
a better match to the Rust String type.

1 files changed, 4 insertions, 3 deletions

diff --git a/components/script/devtools.rs b/components/script/devtools.rs
index ae7c1a14129..b12619b51b0 100644
--- a/components/script/devtools.rs
+++ b/components/script/devtools.rs
@@ -23,6 +23,7 @@ use script_task::get_page;
 use std::ffi::CStr;
 use std::rc::Rc;
 use std::str;
+use util::str::DOMString;
 use uuid::Uuid;
 
 #[allow(unsafe_code)]
@@ -39,7 +40,7 @@ pub fn handle_evaluate_js(global: &GlobalRef, eval: String, reply: IpcSender<Eva
         EvaluateJSReply::NumberValue(
             FromJSValConvertible::from_jsval(cx, rval.handle(), ()).unwrap())
     } else if rval.ptr.is_string() {
-        EvaluateJSReply::StringValue(jsstring_to_str(cx, rval.ptr.to_string()))
+        EvaluateJSReply::StringValue(jsstring_to_str(cx, rval.ptr.to_string()).0)
     } else if rval.ptr.is_null() {
         EvaluateJSReply::NullValue
     } else {
@@ -159,9 +160,9 @@ pub fn handle_modify_attribute(page: &Rc<Page>,
     for modification in modifications {
         match modification.newValue {
             Some(string) => {
-                let _ = elem.SetAttribute(modification.attributeName, string);
+                let _ = elem.SetAttribute(DOMString(modification.attributeName), DOMString(string));
             },
-            None => elem.RemoveAttribute(modification.attributeName),
+            None => elem.RemoveAttribute(DOMString(modification.attributeName)),
         }
     }
 }