Trait changes, and eliminate 'copy'

4 files changed, 6 insertions, 3 deletions

diff --git a/src/components/script/dom/bindings/element.rs b/src/components/script/dom/bindings/element.rs
index fa4e28534ec..e9336e3da2a 100644
--- a/src/components/script/dom/bindings/element.rs
+++ b/src/components/script/dom/bindings/element.rs
@@ -273,7 +273,7 @@ extern fn getTagName(cx: *JSContext, _argc: c_uint, vp: *mut JSVal) -> JSBool {
 
         let node = unwrap(obj);
         do node.with_imm_element |elem| {
-            let s = str(copy elem.tag_name);
+            let s = str(elem.tag_name.clone());
             *vp = domstring_to_jsval(cx, &s);            
         }
     }
diff --git a/src/components/script/dom/bindings/utils.rs b/src/components/script/dom/bindings/utils.rs
index 728c1eb112e..c30eea5f1db 100644
--- a/src/components/script/dom/bindings/utils.rs
+++ b/src/components/script/dom/bindings/utils.rs
@@ -392,6 +392,7 @@ pub struct JSNativeHolder {
     propertyHooks: *NativePropertyHooks
 }
 
+#[deriving(Clone)]
 pub enum ConstantVal {
     IntVal(i32),
     UintVal(u32),
@@ -401,6 +402,7 @@ pub enum ConstantVal {
     VoidVal
 }
 
+#[deriving(Clone)]
 pub struct ConstantSpec {
     name: *libc::c_char,
     value: ConstantVal
@@ -853,6 +855,7 @@ impl DerivedWrapper for AbstractNode<ScriptView> {
     }
 }
 
+#[deriving(ToStr)]
 pub enum Error {
     FailureUnknown
 }
diff --git a/src/components/script/dom/characterdata.rs b/src/components/script/dom/characterdata.rs
index d63fd75ec88..2d921fe07c5 100644
--- a/src/components/script/dom/characterdata.rs
+++ b/src/components/script/dom/characterdata.rs
@@ -23,7 +23,7 @@ impl CharacterData {
     }
     
     pub fn Data(&self) -> DOMString {
-        copy self.data
+        self.data.clone()
     }
 
     pub fn SetData(&mut self, arg: &DOMString, _rv: &mut ErrorResult) {
diff --git a/src/components/script/dom/event.rs b/src/components/script/dom/event.rs
index ca97d1bc364..78ccfa7e759 100644
--- a/src/components/script/dom/event.rs
+++ b/src/components/script/dom/event.rs
@@ -55,7 +55,7 @@ impl Event {
     }
 
     pub fn Type(&self) -> DOMString {
-        copy self.type_
+        self.type_.clone()
     }
 
     pub fn GetTarget(&self) -> Option<@mut EventTarget> {