Make DOMString an alias for Option<~str>

Fixes #898.

1 files changed, 15 insertions, 15 deletions

diff --git a/src/components/script/dom/htmlobjectelement.rs b/src/components/script/dom/htmlobjectelement.rs
index 9246c631184..635d2dfa61c 100644
--- a/src/components/script/dom/htmlobjectelement.rs
+++ b/src/components/script/dom/htmlobjectelement.rs
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use dom::bindings::utils::{DOMString, null_string, ErrorResult};
+use dom::bindings::utils::{DOMString, ErrorResult};
 use dom::document::AbstractDocument;
 use dom::htmlelement::HTMLElement;
 use dom::node::{AbstractNode, ScriptView};
@@ -15,28 +15,28 @@ pub struct HTMLObjectElement {
 
 impl HTMLObjectElement {
     pub fn Data(&self) -> DOMString {
-        null_string
+        None
     }
 
     pub fn SetData(&mut self, _data: &DOMString, _rv: &mut ErrorResult) {
     }
 
     pub fn Type(&self) -> DOMString {
-        null_string
+        None
     }
 
     pub fn SetType(&mut self, _type: &DOMString, _rv: &mut ErrorResult) {
     }
 
     pub fn Name(&self) -> DOMString {
-        null_string
+        None
     }
 
     pub fn SetName(&mut self, _name: &DOMString, _rv: &mut ErrorResult) {
     }
 
     pub fn UseMap(&self) -> DOMString {
-        null_string
+        None
     }
 
     pub fn SetUseMap(&mut self, _use_map: &DOMString, _rv: &mut ErrorResult) {
@@ -47,14 +47,14 @@ impl HTMLObjectElement {
     }
 
     pub fn Width(&self) -> DOMString {
-        null_string
+        None
     }
 
     pub fn SetWidth(&mut self, _width: &DOMString, _rv: &mut ErrorResult) {
     }
 
     pub fn Height(&self) -> DOMString {
-        null_string
+        None
     }
 
     pub fn SetHeight(&mut self, _height: &DOMString, _rv: &mut ErrorResult) {
@@ -77,7 +77,7 @@ impl HTMLObjectElement {
     }
 
     pub fn ValidationMessage(&self) -> DOMString {
-        null_string
+        None
     }
 
     pub fn CheckValidity(&self) -> bool {
@@ -88,21 +88,21 @@ impl HTMLObjectElement {
     }
 
     pub fn Align(&self) -> DOMString {
-        null_string
+        None
     }
 
     pub fn SetAlign(&mut self, _align: &DOMString, _rv: &mut ErrorResult) {
     }
 
         pub fn Archive(&self) -> DOMString {
-        null_string
+        None
     }
 
     pub fn SetArchive(&mut self, _archive: &DOMString, _rv: &mut ErrorResult) {
     }
 
     pub fn Code(&self) -> DOMString {
-        null_string
+        None
     }
 
     pub fn SetCode(&mut self, _code: &DOMString, _rv: &mut ErrorResult) {
@@ -123,7 +123,7 @@ impl HTMLObjectElement {
     }
 
     pub fn Standby(&self) -> DOMString {
-        null_string
+        None
     }
 
     pub fn SetStandby(&mut self, _standby: &DOMString, _rv: &mut ErrorResult) {
@@ -137,21 +137,21 @@ impl HTMLObjectElement {
     }
 
     pub fn CodeBase(&self) -> DOMString {
-        null_string
+        None
     }
 
     pub fn SetCodeBase(&mut self, _codebase: &DOMString, _rv: &mut ErrorResult) {
     }
 
     pub fn CodeType(&self) -> DOMString {
-        null_string
+        None
     }
 
     pub fn SetCodeType(&mut self, _codetype: &DOMString, _rv: &mut ErrorResult) {
     }
 
     pub fn Border(&self) -> DOMString {
-        null_string
+        None
     }
 
     pub fn SetBorder(&mut self, _border: &DOMString, _rv: &mut ErrorResult) {